3649 files changed, 82584 insertions, 101627 deletions

diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index 1b4863046..2db1c5728 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -3382,11 +3382,11 @@ AI_Safari_Flee:
 	flee
 
 AI_FirstBattle:
-	if_hp_equal AI_TARGET, 20, BattleAIScript_82DE34D
-	if_hp_less_than AI_TARGET, 20, BattleAIScript_82DE34D
+	if_hp_equal AI_TARGET, 20, AI_FirstBattle_Flee
+	if_hp_less_than AI_TARGET, 20, AI_FirstBattle_Flee
 	end
 
-BattleAIScript_82DE34D:
+AI_FirstBattle_Flee:
 	flee
 
 AI_Ret:
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
index 8fc2939c6..1fbf2a2e1 100644
--- a/data/battle_frontier_2.s
+++ b/data/battle_frontier_2.s
@@ -1,5 +1,6 @@
 #include "constants/moves.h"
 #include "constants/species.h"
+#include "constants/trainers.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -1049,8 +1050,10 @@ gUnknown_08611D08:: @ 8611D08
 	.4byte gUnknown_085EE3C4
 
 	.align 1
-gUnknown_08611D30:: @ 8611D30
-	.2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000
+gFacilityToBrainTrainerId:: @ 8611D30
+	.2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER
+	.2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY
+	.2byte TRAINER_BRANDON
 
 	.align 2
 gUnknown_08611D40:: @ 8611D40
@@ -1454,43 +1457,43 @@ gUnknown_08612690:: @ 8612690
 	.4byte 0x00000400, 0x00000800
 
 gUnknown_08612698:: @ 8612698
-	step_94
-	step_right
-	step_95
+	store_lock_anim
+	walk_right
+	free_unlock_anim
 	step_end
 
 gUnknown_0861269C:: @ 861269C
-	step_94
-	step_down
-	step_95
+	store_lock_anim
+	walk_down
+	free_unlock_anim
 	step_end
 
 gUnknown_086126A0:: @ 86126A0
-	step_94
-	step_left
-	step_95
+	store_lock_anim
+	walk_left
+	free_unlock_anim
 	step_end
 
 gUnknown_086126A4:: @ 86126A4
-	step_94
-	step_up
-	step_95
+	store_lock_anim
+	walk_up
+	free_unlock_anim
 	step_end
 
 gUnknown_086126A8:: @ 86126A8
-	step_03
+	face_right
 	step_end
 
 gUnknown_086126AA:: @ 86126AA
-	step_00
+	face_down
 	step_end
 
 gUnknown_086126AC:: @ 86126AC
-	step_02
+	face_left
 	step_end
 
 gUnknown_086126AE:: @ 86126AE
-	step_01
+	face_up
 	step_end
 
 @ 86126B0
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 058833fa9..0487199b5 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2873,7 +2873,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
-	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
+	jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
 	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
 	jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
@@ -2899,7 +2899,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	printstring STRINGID_SWITCHINMON
-	atk62 BS_ATTACKER
+	hidepartystatussummary BS_ATTACKER
 	switchinanim BS_ATTACKER, 0x0
 	waitstate
 	switchineffects BS_ATTACKER
@@ -2910,7 +2910,7 @@ BattleScript_FaintedMonChooseAnother::
 	switchindataupdate BS_FAINTED
 	hpthresholds BS_FAINTED
 	printstring STRINGID_SWITCHINMON
-	atk62 BS_FAINTED
+	hidepartystatussummary BS_FAINTED
 	switchinanim BS_FAINTED, FALSE
 	waitstate
 	various7 BS_ATTACKER
@@ -2933,7 +2933,7 @@ BattleScript_82DA908::
 	switchindataupdate BS_FAINTED
 	hpthresholds BS_FAINTED
 	printstring STRINGID_SWITCHINMON
-	atk62 BS_FAINTED
+	hidepartystatussummary BS_FAINTED
 	switchinanim BS_FAINTED, FALSE
 	waitstate
 	switchineffects 5
@@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems::
 
 BattleScript_LocalBattleLost::
 	jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
-	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
+	jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText
 	jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
 	jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
 	jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd
@@ -3120,10 +3120,10 @@ BattleScript_PursuitSwitchDmgSetMultihit::
 	setmultihit 0x2
 BattleScript_PursuitSwitchDmgLoop::
 	jumpifnopursuitswitchdmg BattleScript_DoSwitchOut
-	atk5F
+	swapattackerwithtarget
 	trysetdestinybondtohappen
 	call BattleScript_PursuitDmgOnSwitchOut
-	atk5F
+	swapattackerwithtarget
 BattleScript_DoSwitchOut::
 	decrementmultihit BattleScript_PursuitSwitchDmgLoop
 	switchoutabilities BS_ATTACKER
@@ -3136,7 +3136,7 @@ BattleScript_DoSwitchOut::
 	switchindataupdate BS_ATTACKER
 	hpthresholds BS_ATTACKER
 	printstring STRINGID_SWITCHINMON
-	atk62 BS_ATTACKER
+	hidepartystatussummary BS_ATTACKER
 	switchinanim BS_ATTACKER, FALSE
 	waitstate
 	switchineffects BS_ATTACKER
@@ -3230,7 +3230,7 @@ BattleScript_DamagingWeatherContinues::
 	playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
 	setbyte gBattleCommunication, 0x0
 BattleScript_DamagingWeatherLoop::
-	copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
+	copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 0x1
 	weatherdamage
 	jumpifword CMP_EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
 	printfromtable gSandStormHailDmgStringIds
@@ -3710,12 +3710,12 @@ BattleScript_MagicCoatBounce::
 BattleScript_SnatchedMove::
 	attackstring
 	ppreduce
-	snatchsetbanks
+	snatchsetbattlers
 	playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
 	printstring STRINGID_PKMNSNATCHEDMOVE
 	waitmessage 0x40
 	orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
-	atk5F
+	swapattackerwithtarget
 	return
 
 BattleScript_EnduredMsg::
@@ -3991,7 +3991,7 @@ BattleScript_DrizzleActivates::
 	pause 0x20
 	printstring STRINGID_PKMNMADEITRAIN
 	waitstate
-	playanimation BS_BANK_0, B_ANIM_RAIN_CONTINUES, NULL
+	playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
 	call BattleScript_WeatherFormChanges
 	end3
 
@@ -4019,7 +4019,7 @@ BattleScript_SandstreamActivates::
 	pause 0x20
 	printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
 	waitstate
-	playanimation BS_BANK_0, B_ANIM_SANDSTORM_CONTINUES, NULL
+	playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
 	call BattleScript_WeatherFormChanges
 	end3
 
@@ -4085,7 +4085,7 @@ BattleScript_DroughtActivates::
 	pause 0x20
 	printstring STRINGID_PKMNSXINTENSIFIEDSUN
 	waitstate
-	playanimation BS_BANK_0, B_ANIM_SUN_CONTINUES, NULL
+	playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
 	call BattleScript_WeatherFormChanges
 	end3
 
@@ -4561,8 +4561,8 @@ BattleScript_82DB973::
 	end2
 
 BattleScript_82DB992::
-	various16 BS_BANK_0
-	various17 BS_BANK_0
+	various16 BS_BATTLER_0
+	various17 BS_BATTLER_0
 	various9 BS_ATTACKER
 	various15 BS_ATTACKER
 	printstring STRINGID_TIEDOPPONENTBYREFEREE
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 8020d7c5c..1fbaa9536 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -44,7 +44,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58
 	.4byte BattleScript_ActionWatchesCarefully
 	.4byte BattleScript_ActionGetNear
 	.4byte BattleScript_ActionThrowPokeblock
-	.4byte BattleScript_82DBEE3
+	.4byte BattleScript_ActionWallyThrow
 
 BattleScript_BallThrow::
 	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
@@ -176,17 +176,17 @@ BattleScript_RunByUsingItem::
 	setbyte gBattleOutcome, B_OUTCOME_RAN
 	finishturn
 
-BattleScript_ActionWatchesCarefully::
+BattleScript_ActionWatchesCarefully:
 	printstring STRINGID_PKMNWATCHINGCAREFULLY
 	waitmessage 0x40
 	end2
 
-BattleScript_ActionGetNear::
+BattleScript_ActionGetNear:
 	printfromtable gSafariGetNearStringIds
 	waitmessage 0x40
 	end2
 
-BattleScript_ActionThrowPokeblock::
+BattleScript_ActionThrowPokeblock:
 	printstring STRINGID_THREWPOKEBLOCKATPKMN
 	waitmessage 0x40
 	playanimation BS_ATTACKER, B_ANIM_x4, NULL
@@ -194,7 +194,7 @@ BattleScript_ActionThrowPokeblock::
 	waitmessage 0x40
 	end2
 
-BattleScript_82DBEE3::
+BattleScript_ActionWallyThrow:
 	printstring STRINGID_RETURNMON
 	waitmessage 0x40
 	returnatktoball
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/cable_car.s b/data/cable_car.s
index 32a265c97..c141e593c 100644
--- a/data/cable_car.s
+++ b/data/cable_car.s
@@ -1,4 +1,4 @@
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -80,14 +80,14 @@ gSpriteTemplate_85CDBCC:: @ 85CDBCC
 	spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58
 
 gCableCarPlayerGraphicsIDs:: @ 85CDBE4
-	.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	.byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	.byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 
 gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
-	.byte MAP_OBJ_GFX_HIKER
-	.byte MAP_OBJ_GFX_CAMPER
-	.byte MAP_OBJ_GFX_PICNICKER
-	.byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used
+	.byte EVENT_OBJ_GFX_HIKER
+	.byte EVENT_OBJ_GFX_CAMPER
+	.byte EVENT_OBJ_GFX_PICNICKER
+	.byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used
 
 	.align 1
 gMtChimneyHikerCoords:: @ 85CDBEA
diff --git a/data/data2b.s b/data/data2b.s
index 8d759b0b2..87ca0b881 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -235,7 +235,7 @@ gUnknown_082FF704:: @ 82FF704
 	.2byte 0x0003, 0x0000, 0xffff, 0x0000
 
 	.align 2
-gUnknown_082FF70C:: @ 82FF70C
+gPlayerMonSpriteAnimsTable:: @ 82FF70C
 	.4byte gUnknown_082FF6EC
 	.4byte gUnknown_082FF6F4
 	.4byte gUnknown_082FF6FC
@@ -4684,7 +4684,7 @@ gUnknown_0831AA00:: @ 831AA00
 	obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
 
 	.align 2
-gUnknown_0831AA08:: @ 831AA08
+gBattleBgTemplates:: @ 831AA08
 	.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
 
 	.align 2
@@ -4743,7 +4743,7 @@ gUnknown_0831AAE0:: @ 831AAE0
 	null_window_template
 
 	.align 2
-gUnknown_0831ABA0:: @ 831ABA0
+gBattleWindowTemplates:: @ 831ABA0
 	.4byte gUnknown_0831AA18
 	.4byte gUnknown_0831AAE0
 
@@ -4862,7 +4862,3 @@ gUnknown_0831ACC4:: @ 831ACC4
 	.align 2
 gUnknown_0831ACDC:: @ 831ACDC
 	.4byte gUnknown_0831ACC4
-
-	.align 2
-gUnknown_0831ACE0:: @ 831ACE0
-	.byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 841a9935c..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
@@ -946,7 +947,7 @@ EventScript_27142F:: @ 827142F
 	return
 
 Movement_27143A: @ 827143A
-	step_59
+	reveal_trainer
 	step_end
 
 EventScript_ShowTrainerIntroMsg:: @ 827143C
@@ -1523,8 +1524,8 @@ OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5
 	end
 
 OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0
-	step_4f
-	step_12
+	nurse_joy_bow
+	delay_4
 	step_end
 
 Std_ObtainItem:: @ 8271AD3
@@ -2329,13 +2330,13 @@ SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2
 	return
 
 SlateportCity_Harbor_Movement_2721F0: @ 82721F0
-	slow_step_right
-	slow_step_right
-	slow_step_right
-	step_right
-	step_right
-	step_right
-	step_right
+	walk_slow_right
+	walk_slow_right
+	walk_slow_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8
@@ -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
@@ -2371,7 +2372,7 @@ EventScript_27222B:: @ 827222B
 	return
 
 Movement_27224E: @ 827224E
-	step_up
+	walk_up
 	step_end
 
 BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250
@@ -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
 
@@ -2533,27 +2534,27 @@ Route119_EventScript_2723C1:: @ 82723C1
 FortreeCity_Movement_2723C7: @ 82723C7
 Route119_Movement_2723C7: @ 82723C7
 Route120_Movement_2723C7: @ 82723C7
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_14
-	step_54
-	step_14
-	step_55
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
 	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD
@@ -2652,7 +2653,7 @@ EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F
 	return
 
 SlateportCity_Movement_272596: @ 8272596
-	step_57
+	emote_question_mark
 	step_end
 
 AquaHideout_B2F_Movement_272598: @ 8272598
@@ -2697,7 +2698,7 @@ SeafloorCavern_Room9_Movement_272598: @ 8272598
 SlateportCity_Movement_272598: @ 8272598
 SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598
 SlateportCity_PokemonFanClub_Movement_272598: @ 8272598
-	step_56
+	emote_exclamation_mark
 	step_end
 
 BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A
@@ -2738,9 +2739,9 @@ SeafloorCavern_Room9_Movement_27259A: @ 827259A
 SlateportCity_Movement_27259A: @ 827259A
 SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A
 SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A
-	step_14
-	step_14
-	step_14
+	delay_16
+	delay_16
+	delay_16
 	step_end
 
 AquaHideout_B2F_Movement_27259E: @ 827259E
@@ -2784,11 +2785,11 @@ SeafloorCavern_Room9_Movement_27259E: @ 827259E
 SlateportCity_Movement_27259E: @ 827259E
 SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E
 SootopolisCity_Movement_27259E: @ 827259E
-	step_3e
+	face_player
 	step_end
 
 BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0
-	step_3f
+	face_away_player
 	step_end
 
 BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2
@@ -2825,7 +2826,7 @@ SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2
 SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2
 SootopolisCity_Movement_2725A2: @ 82725A2
 VerdanturfTown_Movement_2725A2: @ 82725A2
-	step_4e
+	face_original_direction
 	step_end
 
 AquaHideout_B2F_Movement_2725A4: @ 82725A4
@@ -2869,7 +2870,7 @@ SlateportCity_Movement_2725A4: @ 82725A4
 SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4
 SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4
 SootopolisCity_Movement_2725A4: @ 82725A4
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6
@@ -2916,7 +2917,7 @@ SlateportCity_Movement_2725A6: @ 82725A6
 SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6
 SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6
 VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6
-	step_26
+	walk_in_place_fastest_up
 	step_end
 
 BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8
@@ -2959,7 +2960,7 @@ SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8
 SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8
 SootopolisCity_Movement_2725A8: @ 82725A8
 VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA
@@ -3003,20 +3004,20 @@ SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA
 SouthernIsland_Exterior_Movement_2725AA: @ 82725AA
 VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA
 VictoryRoad_1F_Movement_2725AA: @ 82725AA
-	step_25
+	walk_in_place_fastest_down
 	step_end
 
 RustboroCity_Movement_2725AC: @ 82725AC
-	step_03
+	face_right
 	step_end
 
 RustboroCity_Movement_2725AE: @ 82725AE
-	step_02
+	face_left
 	step_end
 
 BattleFrontier_Mart_Movement_2725B0: @ 82725B0
 MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0
-	step_00
+	face_down
 	step_end
 
 MarineCave_End_Movement_2725B2: @ 82725B2
@@ -3025,51 +3026,51 @@ Route118_Movement_2725B2: @ 82725B2
 SkyPillar_Top_Movement_2725B2: @ 82725B2
 SlateportCity_Movement_2725B2: @ 82725B2
 TerraCave_End_Movement_2725B2: @ 82725B2
-	step_01
+	face_up
 	step_end
 
 BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4
 MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4
-	step_1d
+	walk_in_place_down
 	step_end
 
 BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6
 BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6
-	step_1f
+	walk_in_place_left
 	step_end
 
 Route121_Movement_2725B8: @ 82725B8
-	step_20
+	walk_in_place_right
 	step_end
 
 EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1
-	step_up
-	step_up
-	step_up
-	step_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6
-	step_14
-	step_14
+	delay_16
+	delay_16
 	step_end
 
 Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9
-	step_up
+	walk_up
 	step_end
 
 Movement_2725CB:: @ 82725CB
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 EventScript_2725CE:: @ 82725CE
@@ -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
@@ -4564,8 +4565,8 @@ SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB
 	end
 
 SecretBase_RedCave1_Movement_275BB4: @ 8275BB4
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 EventScript_275BB7:: @ 8275BB7
@@ -6025,7 +6026,7 @@ gUnknown_082A8337:: @ 82A8337
 	waitmovement 0
 	playse SE_RU_HYUU
 	delay 60
-	warphole UNDEFINED
+	warphole MAP_UNDEFINED
 	waitstate
 	end
 
@@ -6041,7 +6042,7 @@ gUnknown_082A8350:: @ 82A8350
 	end
 
 GraniteCave_B1F_Movement_2A8369: @ 82A8369
-	step_54
+	set_invisible
 	step_end
 
 LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B
@@ -6549,28 +6550,28 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE
 	end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8
-	step_03
-	step_13
+	face_right
+	delay_8
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB
-	step_02
-	step_13
+	face_left
+	delay_8
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE
-	step_00
+	face_down
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0
-	step_3e
+	face_player
 	step_end
 
 LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2
-	step_51
-	step_48
-	step_51
-	step_48
+	disable_jump_landing_ground_effect
+	jump_in_place_left
+	disable_jump_landing_ground_effect
+	jump_in_place_left
 	step_end
 
 LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7
@@ -10280,24 +10281,24 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E93:: @ 82B6E93
 	end
 
 BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94
-	step_18
+	walk_fast_right
 
 BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_54
-	step_31
-	step_31
-	step_31
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	set_invisible
+	slide_down
+	slide_down
+	slide_down
 	step_end
 
 gText_082B6EA5:: @ 82B6EA5
@@ -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
 
@@ -13480,7 +13481,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271
 
 BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A
 BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A
-	step_54
+	set_invisible
 	step_end
 
 LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C
@@ -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,12 +14697,12 @@ 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
 
 TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
-	step_54
+	set_invisible
 	step_end
 
 EventScript_2C83F0:: @ 82C83F0
diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s
index ef73c3263..f1b28d906 100644
--- a/data/field_effect_misc.s
+++ b/data/field_effect_misc.s
@@ -27,7 +27,7 @@ gSpriteImage_858DB78:: @ 858DB78
 
 	.align 2
 gFieldEffectObjectPalette7:: @ 858DC18
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
+	.incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"
 
     .align 2
 gSpriteImage_858DC38:: @ 858DC38
@@ -75,7 +75,7 @@ gSpriteImage_858E138:: @ 858E138
 
 	.align 2
 gFieldEffectObjectPalette8:: @ 858E1B8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal"
+	.incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"
 
     .align 2
 gSpriteImage_858E1D8:: @ 858E1D8
@@ -240,5 +240,5 @@ gSpriteAnimTable_858E87C:: @ 858E87C
 
     .align 2
 gUnknown_0858E880:: @ 858E880
-	spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 8dfbd6782..c0c74496f 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -38,7 +38,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_Unknown30
 	.4byte gFieldEffectScript_UseFly
 	.4byte gFieldEffectScript_FlyIn
-	.4byte gFieldEffectScript_ExclamationMarkIcon2
+	.4byte gFieldEffectScript_QuestionMarkIcon
 	.4byte gFieldEffectScript_FeetInFlowingWater
 	.4byte gFieldEffectScript_BikeTireTracks
 	.4byte gFieldEffectScript_SandDisguisePlaceholder
@@ -74,15 +74,15 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_Unknown66
 
 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
-	field_eff_callnative FldEff_ExclamationMarkIcon1
+	field_eff_callnative FldEff_ExclamationMarkIcon
 	field_eff_end
 
 gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
-	field_eff_callnative sub_80D3A6C
+	field_eff_callnative FldEff_UseCutOnGrass
 	field_eff_end
 
 gFieldEffectScript_UseCutOnTree:: @ 82DBAEC
-	field_eff_callnative sub_80D3ABC
+	field_eff_callnative FldEff_UseCutOnTree
 	field_eff_end
 
 gFieldEffectScript_Shadow:: @ 82DBAF2
@@ -206,8 +206,8 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9
 	field_eff_callnative FldEff_FlyIn
 	field_eff_end
 
-gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF
-	field_eff_callnative FldEff_ExclamationMarkIcon2
+gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
+	field_eff_callnative FldEff_QuestionMarkIcon
 	field_eff_end
 
 gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
@@ -308,7 +308,7 @@ gFieldEffectScript_Unknown57:: @ 82DBCB8
 	field_eff_end
 
 gFieldEffectScript_Unknown58:: @ 82DBCC2
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
 	field_eff_end
 
 gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
index 989d2add7..686d9396b 100644
--- a/data/field_ground_effect.s
+++ b/data/field_ground_effect.s
@@ -4,66 +4,3 @@
     .section .rodata
     .align 2, 0
 
-gUnknown_0850E5DC:: @ 850E5DC
-	.4byte 0x00000020, 0x00000010
-
-gUnknown_0850E5E4:: @ 850E5E4
-	.4byte MetatileBehavior_IsTallGrass
-	.4byte MetatileBehavior_IsLongGrass
-	.4byte MetatileBehavior_IsPuddle
-	.4byte MetatileBehavior_IsSurfableWaterOrUnderwater
-	.4byte MetatileBehavior_IsShallowFlowingWater
-	.4byte ShouldDoJumpLandingDustEffect
-
-gUnknown_0850E5FC:: @ 850E5FC
-	.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
-
-gUnknown_0850E614:: @ 850E614
-	.4byte MetatileBehavior_IsJumpSouth
-	.4byte MetatileBehavior_IsJumpNorth
-	.4byte MetatileBehavior_IsJumpWest
-	.4byte MetatileBehavior_IsJumpEast
-
-gUnknown_0850E624:: @ 850E624
-	.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
-
-gUnknown_0850E634:: @ 850E634
-	.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
-
-gUnknown_0850E644:: @ 850E644
-	.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
-
-gUnknown_0850E654:: @ 850E654
-	.4byte DoTracksGroundEffect_None
-	.4byte DoTracksGroundEffect_Footprints
-	.4byte DoTracksGroundEffect_BikeTireTracks
-
-gUnknown_0850E660:: @ 850E660
-	.byte 13, 0
-	.byte 24, 0
-
-gUnknown_0850E664:: @ 850E664
-	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
-
-gUnknown_0850E674:: @ 850E674
-	.4byte GroundEffect_SpawnOnTallGrass
-	.4byte GroundEffect_StepOnTallGrass
-	.4byte GroundEffect_SpawnOnLongGrass
-	.4byte GroundEffect_StepOnLongGrass
-	.4byte GroundEffect_WaterReflection
-	.4byte GroundEffect_IceReflection
-	.4byte GroundEffect_FlowingWater
-	.4byte GroundEffect_SandTracks
-	.4byte GroundEffect_DeepSandTracks
-	.4byte GroundEffect_Ripple
-	.4byte GroundEffect_StepOnPuddle
-	.4byte GroundEffect_SandHeap
-	.4byte GroundEffect_JumpOnTallGrass
-	.4byte GroundEffect_JumpOnLongGrass
-	.4byte GroundEffect_JumpOnShallowWater
-	.4byte GroundEffect_JumpOnWater
-	.4byte GroundEffect_JumpLandingDust
-	.4byte GroundEffect_ShortGrass
-	.4byte GroundEffect_HotSprings
-	.4byte GroundEffect_Seaweed
-
diff --git a/data/field_map_obj.s b/data/field_map_obj.s
deleted file mode 100644
index 844612a7c..000000000
--- a/data/field_map_obj.s
+++ /dev/null
@@ -1,1731 +0,0 @@
-#include "constants/map_objects.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_084975C4:: @ 84975C4
-	.byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_084975D4:: @ 84975D4
-	spr_template 0x0000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
-
-gUnknown_084975EC:: @ 84975EC
-	.4byte CameraObject_0
-	.4byte CameraObject_1
-	.4byte CameraObject_2
-
-@ 84975F8
-	.include "data/graphics/field_objects/field_object_graphics.inc"
-
-gUnknown_08505438:: @ 8505438
-	.4byte FieldObjectCB_NoMovement1
-	.4byte FieldObjectCB_LookRandomDirections
-	.4byte FieldObjectCB_GoRandomDirections
-	.4byte FieldObjectCB_RandomlyGoNorthOrSouth
-	.4byte FieldObjectCB_RandomlyGoNorthOrSouth
-	.4byte FieldObjectCB_RandomlyGoEastOrWest
-	.4byte FieldObjectCB_RandomlyGoEastOrWest
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_FaceFixedDirection
-	.4byte FieldObjectCB_NoMovement2
-	.4byte FieldObjectCB_BerryTree
-	.4byte FieldObjectCB_RandomlyLookNorthOrSouth
-	.4byte FieldObjectCB_RandomlyLookEastOrWest
-	.4byte FieldObjectCB_RandomlyLookNorthOrWest
-	.4byte FieldObjectCB_RandomlyLookNorthOrEast
-	.4byte FieldObjectCB_RandomlyLookSouthOrWest
-	.4byte FieldObjectCB_RandomlyLookSouthOrEast
-	.4byte FieldObjectCB_RandomlyLookNorthOrSouthOrWest
-	.4byte FieldObjectCB_RandomlyLookNorthOrSouthOrEast
-	.4byte FieldObjectCB_RandomlyLookNorthOrEastOrWest
-	.4byte FieldObjectCB_RandomlyLookSouthOrEastOrWest
-	.4byte FieldObjectCB_LookAroundCounterclockwise
-	.4byte FieldObjectCB_LookAroundClockwise
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_AlternatelyGoInOppositeDirections
-	.4byte FieldObjectCB_GoInDirectionSequence1
-	.4byte FieldObjectCB_GoInDirectionSequence2
-	.4byte FieldObjectCB_GoInDirectionSequence3
-	.4byte FieldObjectCB_GoInDirectionSequence4
-	.4byte FieldObjectCB_GoInDirectionSequence5
-	.4byte FieldObjectCB_GoInDirectionSequence6
-	.4byte FieldObjectCB_GoInDirectionSequence7
-	.4byte FieldObjectCB_GoInDirectionSequence8
-	.4byte FieldObjectCB_GoInDirectionSequence9
-	.4byte FieldObjectCB_GoInDirectionSequence10
-	.4byte FieldObjectCB_GoInDirectionSequence11
-	.4byte FieldObjectCB_GoInDirectionSequence12
-	.4byte FieldObjectCB_GoInDirectionSequence13
-	.4byte FieldObjectCB_GoInDirectionSequence14
-	.4byte FieldObjectCB_GoInDirectionSequence15
-	.4byte FieldObjectCB_GoInDirectionSequence16
-	.4byte FieldObjectCB_GoInDirectionSequence17
-	.4byte FieldObjectCB_GoInDirectionSequence18
-	.4byte FieldObjectCB_GoInDirectionSequence19
-	.4byte FieldObjectCB_GoInDirectionSequence20
-	.4byte FieldObjectCB_GoInDirectionSequence21
-	.4byte FieldObjectCB_GoInDirectionSequence22
-	.4byte FieldObjectCB_GoInDirectionSequence23
-	.4byte FieldObjectCB_GoInDirectionSequence24
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_CopyPlayer1
-	.4byte FieldObjectCB_TreeDisguise
-	.4byte FieldObjectCB_MountainDisguise
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_CopyPlayer2
-	.4byte FieldObjectCB_Hidden1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace1
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace2
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_WalkInPlace3
-	.4byte FieldObjectCB_Hidden2
-	.4byte FieldObjectCB_WalkInPlace4
-	.4byte FieldObjectCB_WalkInPlace4
-	.4byte FieldObjectCB_WalkInPlace4
-	.4byte FieldObjectCB_WalkInPlace4
-
-gUnknown_0850557C:: @ 850557C
-	.byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-	.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_085055CD:: @ 85055CD
-	.byte 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x01, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x04, 0x01
-	.byte 0x03, 0x02, 0x03, 0x01, 0x04, 0x03, 0x02, 0x04, 0x01, 0x04, 0x02, 0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01
-	.byte 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x01, 0x02, 0x03, 0x04
-
-	.align 2, 0
-@ 8505620
-	.include "data/graphics/field_objects/field_object_graphics_info_pointers.inc"
-
-@ 85059F8
-	.include "data/graphics/field_objects/field_effect_object_template_pointers.inc"
-
-@ 8505A8C
-	.include "data/graphics/field_objects/field_object_pic_tables.inc"
-
-@ 85089FC
-	.include "data/graphics/field_objects/field_object_anims.inc"
-
-gUnknown_085094AC:: @ 85094AC
-	.4byte gFieldObjectImageAnimTable_QuintyPlump
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Standard
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Nurse
-	.byte 1, 3, 0, 2
-	.4byte gFieldObjectImageAnimTable_Fishing
-	.byte 1, 3, 0, 2
-	.4byte NULL
-	.byte 0, 0, 0, 0
-
-@ 85094EC
-	.include "data/graphics/field_objects/field_object_oam.inc"
-
-@ 8509954
-	.include "data/graphics/field_objects/field_object_graphics_info.inc"
-
-gUnknown_0850BBC8:: @ 850BBC8
-	.align 2, 0
-	.4byte gFieldObjectPalette0
-	.2byte 4355
-	.align 2, 0
-	.4byte gFieldObjectPalette1
-	.2byte 4356
-	.align 2, 0
-	.4byte gFieldObjectPalette2
-	.2byte 4357
-	.align 2, 0
-	.4byte gFieldObjectPalette3
-	.2byte 4358
-	.align 2, 0
-	.4byte gFieldObjectPalette4
-	.2byte 4359
-	.align 2, 0
-	.4byte gFieldObjectPalette5
-	.2byte 4360
-	.align 2, 0
-	.4byte gFieldObjectPalette6
-	.2byte 4361
-	.align 2, 0
-	.4byte gFieldObjectPalette7
-	.2byte 4362
-	.align 2, 0
-	.4byte gFieldObjectPalette8
-	.2byte 4352
-	.align 2, 0
-	.4byte gFieldObjectPalette9
-	.2byte 4353
-	.align 2, 0
-	.4byte gFieldObjectPalette10
-	.2byte 4354
-	.align 2, 0
-	.4byte gFieldObjectPalette11
-	.2byte 4373
-	.align 2, 0
-	.4byte gFieldObjectPalette12
-	.2byte 4363
-	.align 2, 0
-	.4byte gFieldObjectPalette13
-	.2byte 4364
-	.align 2, 0
-	.4byte gFieldObjectPalette14
-	.2byte 4365
-	.align 2, 0
-	.4byte gFieldObjectPalette15
-	.2byte 4366
-	.align 2, 0
-	.4byte gFieldObjectPalette16
-	.2byte 4367
-	.align 2, 0
-	.4byte gFieldObjectPalette17
-	.2byte 4368
-	.align 2, 0
-	.4byte gFieldObjectPalette18
-	.2byte 4369
-	.align 2, 0
-	.4byte gFieldObjectPalette19
-	.2byte 4370
-	.align 2, 0
-	.4byte gFieldObjectPalette20
-	.2byte 4371
-	.align 2, 0
-	.4byte gFieldObjectPalette21
-	.2byte 4372
-	.align 2, 0
-	.4byte gFieldObjectPalette22
-	.2byte 4374
-	.align 2, 0
-	.4byte gFieldObjectPalette23
-	.2byte 4375
-	.align 2, 0
-	.4byte gFieldObjectPalette24
-	.2byte 4376
-	.align 2, 0
-	.4byte gFieldObjectPalette25
-	.2byte 4377
-	.align 2, 0
-	.4byte gFieldObjectPalette26
-	.2byte 4379
-	.align 2, 0
-	.4byte gFieldObjectPalette27
-	.2byte 4380
-	.align 2, 0
-	.4byte gFieldObjectPalette28
-	.2byte 4381
-	.align 2, 0
-	.4byte gFieldObjectPalette29
-	.2byte 4382
-	.align 2, 0
-	.4byte gFieldObjectPalette30
-	.2byte 4383
-	.align 2, 0
-	.4byte gFieldObjectPalette31
-	.2byte 4384
-	.align 2, 0
-	.4byte gFieldObjectPalette32
-	.2byte 4385
-	.align 2, 0
-	.4byte gFieldObjectPalette33
-	.2byte 4386
-	.align 2, 0
-	.4byte gFieldObjectPalette34
-	.2byte 4387
-	.align 2, 0
-	.4byte NULL
-	.2byte 0
-	.align 2, 0
-
-Unknown_0850BCE8:: @ 0850BCE8
-.2byte 0x1101, 0x1101, 0x1101, 0x1101
-
-Unknown_0850BCF0:: @ 0850BCF0
-.2byte 0x1111, 0x1111, 0x1111, 0x1111
-
-Unknown_0850BCF8:: @ 0850BCF8
-.2byte 0x1115, 0x1115, 0x1115, 0x1115
-
-gUnknown_0850BD00:: @ 850BD00
-	.2byte 4352, 0
-	.4byte Unknown_0850BCE8
-	.2byte 4368, 0
-	.4byte Unknown_0850BCF0
-	.2byte 4373, 0
-	.4byte Unknown_0850BCF8
-	.2byte 4607, 0
-	.4byte NULL
-
-Unknown_0850BD20:: @ 0850BD20
-.2byte 0x110c, 0x110c, 0x110c, 0x110c
-
-Unknown_0850BD28:: @ 0x0850bd28
-.2byte 0x110d, 0x110d, 0x110d, 0x110d
-
-Unknown_0850BD30:: @ 0x0850bd30
-.2byte 0x110e, 0x110e, 0x110e, 0x110e
-
-Unknown_0850BD38:: @ 0x0850bd38
-.2byte 0x1112, 0x1112, 0x1112, 0x1112
-
-Unknown_0850BD40:: @ 0x0850bd40
-.2byte 0x1113, 0x1113, 0x1113, 0x1113
-
-Unknown_0850BD48:: @ 0x0850bd48
-.2byte 0x1114, 0x1114, 0x1114, 0x1114
-
-Unknown_0850BD50:: @ 0x0850bd50
-.2byte 0x111b, 0x111b, 0x111b, 0x111b
-
-Unknown_0850BD58:: @ 0x0850bd58
-.2byte 0x1117, 0x1117, 0x1117, 0x1117
-
-Unknown_0850BD60:: @ 0x0850bd60
-.2byte 0x1119, 0x1119, 0x1119, 0x1119
-
-Unknown_0850BD68:: @ 0x0850bd68
-.2byte 0x1109, 0x1109, 0x1109, 0x1109
-
-Unknown_0850BD70:: @ 0x0850bd70
-.2byte 0x111d, 0x111d, 0x111d, 0x111d
-
-gUnknown_0850BD78:: @ 850BD78
-	.2byte 4352, 0
-	.4byte Unknown_0850BCE8
-	.2byte 4368, 0
-	.4byte Unknown_0850BCF0
-	.2byte 4363, 0
-	.4byte Unknown_0850BD20
-	.2byte 4365, 0
-	.4byte Unknown_0850BD28
-	.2byte 4366, 0
-	.4byte Unknown_0850BD30
-	.2byte 4370, 0
-	.4byte Unknown_0850BD38
-	.2byte 4371, 0
-	.4byte Unknown_0850BD40
-	.2byte 4372, 0
-	.4byte Unknown_0850BD48
-	.2byte 4374, 0
-	.4byte Unknown_0850BD58
-	.2byte 4376, 0
-	.4byte Unknown_0850BD60
-	.2byte 4357, 0
-	.4byte Unknown_0850BD68
-	.2byte 4379, 0
-	.4byte Unknown_0850BD50
-	.2byte 4381, 0
-	.4byte Unknown_0850BD70
-	.2byte 4607, 0
-	.4byte NULL
-
-gUnknown_0850BDE8:: @ 850BDE8
-	.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-gUnknown_0850BDFC::
-	.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-gUnknown_0850BE10::
-	.2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-gUnknown_0850BE24::
-	.2byte  0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a
-
-gUnknown_0850BE38:: @ 850BE38
-	.4byte gUnknown_0850BDE8
-	.4byte gUnknown_0850BDFC
-	.4byte gUnknown_0850BE10
-	.4byte gUnknown_0850BE24
-
-@ 850BE48
-	.include "data/graphics/field_objects/berry_tree_graphics_tables.inc"
-
-@ 850C9C0
-	.include "data/graphics/field_objects/field_effect_objects.inc"
-
-	.align 2, 0
-	.4byte gFieldObjectPalette2
-	.2byte 4113
-
-	.align 2, 0
-gUnknown_0850D6DC:: @ 850D6DC
-	.2byte 0x0020, 0x0040, 0x0060, 0x0080, 0x0020, 0x0040, 0x0080, 0x00c0
-
-gUnknown_0850D6EC:: @ 850D6EC
-	.2byte 0x0020, 0x0030, 0x0040, 0x0050
-
-gUnknown_0850D6F4:: @ 850D6F4
-	.4byte sub_808F44C
-	.4byte sub_808F460
-	.4byte sub_808F48C
-	.4byte sub_808F4C8
-	.4byte sub_808F4E8
-	.4byte sub_808F534
-	.4byte sub_808F564
-
-gUnknown_0850D710:: @ 850D710
-	.byte 0x01, 0x02, 0x03, 0x04
-
-gUnknown_0850D714:: @ 850D714
-	.4byte GetRegularRunningPastFacingDirection
-	.4byte GetNorthSouthRunningPastFacingDirection
-	.4byte GetEastWestRunningPastFacingDirection
-	.4byte GetNorthEastRunningPastFacingDirection
-	.4byte GetNorthWestRunningPastFacingDirection
-	.4byte GetSouthEastRunningPastFacingDirection
-	.4byte GetSouthWestRunningPastFacingDirection
-	.4byte GetNonEastRunningPastFacingDirection
-	.4byte GetNonWestRunningPastFacingDirection
-	.4byte GetNonSouthRunningPastFacingDirection
-	.4byte GetNonNorthRunningPastFacingDirection
-
-gUnknown_0850D740:: @ 850D740
-	.4byte sub_808F988
-	.4byte sub_808F99C
-	.4byte sub_808F9C8
-	.4byte sub_808FA0C
-	.4byte sub_808FA3C
-
-gUnknown_0850D754:: @ 850D754
-	.4byte sub_808FAC8
-	.4byte sub_808FADC
-	.4byte sub_808FB08
-	.4byte sub_808FB44
-	.4byte sub_808FB64
-	.4byte sub_808FBB0
-	.4byte sub_808FBE0
-
-gUnknown_0850D770:: @ 850D770
-	.byte 0x01, 0x02, 0x00, 0x00
-
-gUnknown_0850D774:: @ 850D774
-	.4byte sub_808FC4C
-	.4byte sub_808FC60
-	.4byte sub_808FC8C
-	.4byte sub_808FCC8
-	.4byte sub_808FCE8
-	.4byte sub_808FD34
-	.4byte sub_808FD64
-
-gUnknown_0850D790:: @ 850D790
-	.byte 0x03, 0x04, 0x00, 0x00
-
-gUnknown_0850D794:: @ 850D794
-	.4byte sub_808FDD0
-	.4byte sub_808FDFC
-	.4byte sub_808FE1C
-
-gUnknown_0850D7A0:: @ 850D7A0
-	.4byte do_berry_tree_growth_sparkle_1
-	.4byte sub_808FF48
-	.4byte do_berry_tree_growth_sparkle_2
-	.4byte sub_808FFB4
-	.4byte sub_8090004
-
-gUnknown_0850D7B4:: @ 850D7B4
-	.4byte sub_8090094
-	.4byte sub_80900A8
-	.4byte sub_80900D4
-	.4byte sub_8090118
-	.4byte sub_8090148
-
-gUnknown_0850D7C8:: @ 850D7C8
-	.4byte sub_80901D4
-	.4byte sub_80901E8
-	.4byte sub_8090214
-	.4byte sub_8090258
-	.4byte sub_8090288
-
-gUnknown_0850D7DC:: @ 850D7DC
-	.4byte sub_8090314
-	.4byte sub_8090328
-	.4byte sub_8090354
-	.4byte sub_8090398
-	.4byte sub_80903C8
-
-gUnknown_0850D7F0:: @ 850D7F0
-	.byte 0x02, 0x03, 0x00, 0x00
-
-gUnknown_0850D7F4:: @ 850D7F4
-	.4byte sub_8090454
-	.4byte sub_8090468
-	.4byte sub_8090494
-	.4byte sub_80904D8
-	.4byte sub_8090508
-
-gUnknown_0850D808:: @ 850D808
-	.byte 0x02, 0x04, 0x00, 0x00
-
-gUnknown_0850D80C:: @ 850D80C
-	.4byte sub_8090594
-	.4byte sub_80905A8
-	.4byte sub_80905D4
-	.4byte sub_8090618
-	.4byte sub_8090648
-
-gUnknown_0850D820:: @ 850D820
-	.byte 0x01, 0x03, 0x00, 0x00
-
-gUnknown_0850D824:: @ 850D824
-	.4byte sub_80906D4
-	.4byte sub_80906E8
-	.4byte sub_8090714
-	.4byte sub_8090758
-	.4byte sub_8090788
-
-gUnknown_0850D838:: @ 850D838
-	.byte 0x01, 0x04, 0x00, 0x00
-
-gUnknown_0850D83C:: @ 850D83C
-	.4byte sub_8090814
-	.4byte sub_8090828
-	.4byte sub_8090854
-	.4byte sub_8090898
-	.4byte sub_80908C8
-
-gUnknown_0850D850:: @ 850D850
-	.byte 0x02, 0x01, 0x03, 0x01
-
-gUnknown_0850D854:: @ 850D854
-	.4byte sub_8090954
-	.4byte sub_8090968
-	.4byte sub_8090994
-	.4byte sub_80909D8
-	.4byte sub_8090A08
-
-gUnknown_0850D868:: @ 850D868
-	.byte 0x01, 0x02, 0x04, 0x01
-
-gUnknown_0850D86C:: @ 850D86C
-	.4byte sub_8090A94
-	.4byte sub_8090AA8
-	.4byte sub_8090AD4
-	.4byte sub_8090B18
-	.4byte sub_8090B48
-
-gUnknown_0850D880:: @ 850D880
-	.byte 0x02, 0x03, 0x04, 0x02
-
-gUnknown_0850D884:: @ 850D884
-	.4byte sub_8090BD4
-	.4byte sub_8090BE8
-	.4byte sub_8090C14
-	.4byte sub_8090C58
-	.4byte sub_8090C88
-
-gUnknown_0850D898:: @ 850D898
-	.byte 0x03, 0x04, 0x01, 0x01
-
-gUnknown_0850D89C:: @ 850D89C
-	.4byte sub_8090D14
-	.4byte sub_8090D40
-	.4byte sub_8090D64
-	.4byte sub_8090D90
-
-gUnknown_0850D8AC:: @ 850D8AC
-	.byte 0x01, 0x04, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00
-
-gUnknown_0850D8B4:: @ 850D8B4
-	.4byte sub_8090E18
-	.4byte sub_8090E44
-	.4byte sub_8090E68
-	.4byte sub_8090E94
-
-gUnknown_0850D8C4:: @ 850D8C4
-	.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
-
-gUnknown_0850D8CC:: @ 850D8CC
-	.4byte sub_8090F1C
-	.4byte sub_8090F30
-	.4byte sub_8090F68
-	.4byte sub_8091020
-
-gUnknown_0850D8DC:: @ 850D8DC
-	.4byte sub_8091048
-	.4byte sub_809117C
-	.4byte sub_8091110
-
-gUnknown_0850D8E8:: @ 850D8E8
-	.byte 0x02, 0x04, 0x03, 0x01
-
-gUnknown_0850D8EC:: @ 850D8EC
-	.4byte sub_8091048
-	.4byte sub_8091208
-	.4byte sub_8091110
-
-gUnknown_0850D8F8:: @ 850D8F8
-	.byte 0x04, 0x03, 0x01, 0x02
-
-gUnknown_0850D8FC:: @ 850D8FC
-	.4byte sub_8091048
-	.4byte sub_8091294
-	.4byte sub_8091110
-
-gUnknown_0850D908:: @ 850D908
-	.byte 0x01, 0x02, 0x04, 0x03
-
-gUnknown_0850D90C:: @ 850D90C
-	.4byte sub_8091048
-	.4byte sub_8091320
-	.4byte sub_8091110
-
-gUnknown_0850D918:: @ 850D918
-	.byte 0x03, 0x01, 0x02, 0x04
-
-gUnknown_0850D91C:: @ 850D91C
-	.4byte sub_8091048
-	.4byte sub_80913AC
-	.4byte sub_8091110
-
-gUnknown_0850D928:: @ 850D928
-	.byte 0x02, 0x03, 0x04, 0x01
-
-gUnknown_0850D92C:: @ 850D92C
-	.4byte sub_8091048
-	.4byte sub_8091438
-	.4byte sub_8091110
-
-gUnknown_0850D938:: @ 850D938
-	.byte 0x03, 0x04, 0x01, 0x02
-
-gUnknown_0850D93C:: @ 850D93C
-	.4byte sub_8091048
-	.4byte sub_80914C4
-	.4byte sub_8091110
-
-gUnknown_0850D948:: @ 850D948
-	.4byte sub_8091048
-	.4byte sub_8091550
-	.4byte sub_8091110
-
-gUnknown_0850D954:: @ 850D954
-	.byte 0x04, 0x01, 0x02, 0x03
-
-gUnknown_0850D958:: @ 850D958
-	.4byte sub_8091048
-	.4byte sub_80915DC
-	.4byte sub_8091110
-
-gUnknown_0850D964:: @ 850D964
-	.byte 0x03, 0x02, 0x01, 0x04
-
-gUnknown_0850D968:: @ 850D968
-	.4byte sub_8091048
-	.4byte sub_8091668
-	.4byte sub_8091110
-
-gUnknown_0850D974:: @ 850D974
-	.byte 0x02, 0x01, 0x04, 0x03
-
-gUnknown_0850D978:: @ 850D978
-	.4byte sub_8091048
-	.4byte sub_80916F4
-	.4byte sub_8091110
-
-gUnknown_0850D984:: @ 850D984
-	.byte 0x04, 0x03, 0x02, 0x01
-
-gUnknown_0850D988:: @ 850D988
-	.4byte sub_8091048
-	.4byte sub_8091780
-	.4byte sub_8091110
-
-gUnknown_0850D994:: @ 850D994
-	.byte 0x01, 0x04, 0x03, 0x02
-
-gUnknown_0850D998:: @ 850D998
-	.4byte sub_8091048
-	.4byte sub_809180C
-	.4byte sub_8091110
-
-gUnknown_0850D9A4:: @ 850D9A4
-	.byte 0x04, 0x02, 0x01, 0x03
-
-gUnknown_0850D9A8:: @ 850D9A8
-	.4byte sub_8091048
-	.4byte sub_8091898
-	.4byte sub_8091110
-
-gUnknown_0850D9B4:: @ 850D9B4
-	.byte 0x02, 0x01, 0x03, 0x04
-
-gUnknown_0850D9B8:: @ 850D9B8
-	.4byte sub_8091048
-	.4byte sub_8091924
-	.4byte sub_8091110
-
-gUnknown_0850D9C4:: @ 850D9C4
-	.byte 0x03, 0x04, 0x02, 0x01
-
-gUnknown_0850D9C8:: @ 850D9C8
-	.4byte sub_8091048
-	.4byte sub_80919B0
-	.4byte sub_8091110
-
-gUnknown_0850D9D4:: @ 850D9D4
-	.byte 0x01, 0x03, 0x04, 0x02
-
-gUnknown_0850D9D8:: @ 850D9D8
-	.4byte sub_8091048
-	.4byte sub_8091A3C
-	.4byte sub_8091110
-
-gUnknown_0850D9E4:: @ 850D9E4
-	.byte 0x02, 0x03, 0x01, 0x04
-
-gUnknown_0850D9E8:: @ 850D9E8
-	.4byte sub_8091048
-	.4byte sub_8091AC8
-	.4byte sub_8091110
-
-gUnknown_0850D9F4:: @ 850D9F4
-	.byte 0x01, 0x04, 0x02, 0x03
-
-gUnknown_0850D9F8:: @ 850D9F8
-	.4byte sub_8091048
-	.4byte sub_8091B54
-	.4byte sub_8091110
-
-gUnknown_0850DA04:: @ 850DA04
-	.byte 0x03, 0x01, 0x04, 0x02
-
-gUnknown_0850DA08:: @ 850DA08
-	.4byte sub_8091048
-	.4byte sub_8091BE0
-	.4byte sub_8091110
-
-gUnknown_0850DA14:: @ 850DA14
-	.byte 0x04, 0x02, 0x03, 0x01
-
-gUnknown_0850DA18:: @ 850DA18
-	.4byte sub_8091048
-	.4byte sub_8091C6C
-	.4byte sub_8091110
-
-gUnknown_0850DA24:: @ 850DA24
-	.byte 0x02, 0x04, 0x01, 0x03
-
-gUnknown_0850DA28:: @ 850DA28
-	.4byte sub_8091048
-	.4byte sub_8091CF8
-	.4byte sub_8091110
-
-gUnknown_0850DA34:: @ 850DA34
-	.byte 0x01, 0x03, 0x02, 0x04
-
-gUnknown_0850DA38:: @ 850DA38
-	.4byte sub_8091048
-	.4byte sub_8091D84
-	.4byte sub_8091110
-
-gUnknown_0850DA44:: @ 850DA44
-	.byte 0x03, 0x02, 0x04, 0x01
-
-gUnknown_0850DA48:: @ 850DA48
-	.4byte sub_8091048
-	.4byte sub_8091E10
-	.4byte sub_8091110
-
-gUnknown_0850DA54:: @ 850DA54
-	.byte 0x04, 0x01, 0x03, 0x02
-
-gUnknown_0850DA58:: @ 850DA58
-	.4byte mss_npc_reset_oampriv3_1_unk2_unk3
-	.4byte sub_8091EC0
-	.4byte sub_8091F20
-
-gUnknown_0850DA64:: @ 850DA64
-	.4byte sub_8091F48
-	.4byte sub_8091F4C
-	.4byte sub_8091F94
-	.4byte sub_80920A4
-	.4byte sub_809215C
-	.4byte sub_8092214
-	.4byte cph_IM_DIFFERENT
-	.4byte sub_8092314
-	.4byte oac_hopping
-	.4byte sub_8091F48
-	.4byte sub_8091F48
-
-gUnknown_0850DA90:: @ 850DA90
-	.4byte mss_npc_reset_oampriv3_1_unk2_unk3
-	.4byte mss_08062EA4
-	.4byte sub_8091F20
-
-gUnknown_0850DA9C:: @ 850DA9C
-	.4byte sub_80926AC
-
-gUnknown_0850DAA0:: @ 850DAA0
-	.4byte sub_8092718
-	.4byte sub_80926B8
-
-gUnknown_0850DAA8:: @ 850DAA8
-	.4byte sub_8092788
-	.4byte sub_80926B8
-
-gUnknown_0850DAB0:: @ 850DAB0
-	.4byte sub_80927F8
-	.4byte sub_80926B8
-
-gUnknown_0850DAB8:: @ 850DAB8
-	.4byte sub_8092868
-	.4byte sub_80926B8
-
-gUnknown_0850DAC0:: @ 850DAC0
-	.4byte sub_80928D8
-	.4byte sub_809290C
-	.4byte sub_809292C
-
-gUnknown_0850DACC:: @ 850DACC
-	.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
-
-gUnknown_0850DAD5:: @ 850DAD5
-	.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
-
-gUnknown_0850DADE:: @ 850DADE
-	.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
-
-gUnknown_0850DAE7:: @ 850DAE7
-	.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d
-
-gUnknown_0850DAF0:: @ 850DAF0
-	.byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11
-
-gUnknown_0850DAF9:: @ 850DAF9
-	.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
-
-gUnknown_0850DB02:: @ 850DB02
-	.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
-
-gUnknown_0850DB0B:: @ 850DB0B
-	.byte 0x18, 0x18, 0x19, 0x1a, 0x1b, 0x18, 0x18, 0x19, 0x19
-
-gUnknown_0850DB14:: @ 850DB14
-	.byte 0x1c, 0x1c, 0x1d, 0x1e, 0x1f, 0x1c, 0x1c, 0x1d, 0x1d
-
-gUnknown_0850DB1D:: @ 850DB1D
-	.byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21
-
-gUnknown_0850DB26:: @ 850DB26
-	.byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25
-
-gUnknown_0850DB2F:: @ 850DB2F
-	.byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01
-
-gUnknown_0850DB38:: @ 850DB38
-	.byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05
-
-gUnknown_0850DB41:: @ 850DB41
-	.byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09
-
-gUnknown_0850DB4A:: @ 850DB4A
-	.byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15
-
-gUnknown_0850DB53:: @ 850DB53
-	.byte 0x08, 0x08, 0x07, 0x09, 0x0a, 0x08, 0x08, 0x07, 0x07
-
-	.align 2, 0
-gUnknown_0850DB5C:: @ 850DB5C
-	.4byte MetatileBehavior_IsSouthBlocked
-	.4byte MetatileBehavior_IsNorthBlocked
-	.4byte MetatileBehavior_IsWestBlocked
-	.4byte MetatileBehavior_IsEastBlocked
-
-gUnknown_0850DB6C:: @ 850DB6C
-	.4byte MetatileBehavior_IsNorthBlocked
-	.4byte MetatileBehavior_IsSouthBlocked
-	.4byte MetatileBehavior_IsEastBlocked
-	.4byte MetatileBehavior_IsWestBlocked
-
-gUnknown_0850DB7C:: @ 850DB7C
-	.2byte 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0xffff, 0xffff, 0x0000, 0x0001, 0x0000, 0xffff, 0x0001, 0x0001, 0x0001, 0xffff, 0xffff
-	.2byte 0x0001, 0xffff
-
-gUnknown_0850DBA0:: @ 850DBA0
-	.byte 0x00, 0x00, 0x01, 0x02, 0x03
-
-gUnknown_0850DBA5:: @ 850DBA5
-	.byte 0x04, 0x04, 0x05, 0x06, 0x07
-
-gUnknown_0850DBAA:: @ 850DBAA
-	.byte 0x08, 0x08, 0x09, 0x0a, 0x0b
-
-gUnknown_0850DBAF:: @ 850DBAF
-	.byte 0x15, 0x15, 0x16, 0x17, 0x18
-
-gUnknown_0850DBB4:: @ 850DBB4
-	.byte 0x29, 0x29, 0x2a, 0x2b, 0x2c
-
-gUnknown_0850DBB9:: @ 850DBB9
-	.byte 0x2d, 0x2d, 0x2e, 0x2f, 0x30
-
-gUnknown_0850DBBE:: @ 850DBBE
-	.byte 0x31, 0x31, 0x32, 0x33, 0x34
-
-gUnknown_0850DBC3:: @ 850DBC3
-	.byte 0x35, 0x35, 0x36, 0x37, 0x38
-
-gUnknown_0850DBC8:: @ 850DBC8
-	.byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f
-
-gUnknown_0850DBCD:: @ 850DBCD
-	.byte 0x46, 0x46, 0x47, 0x48, 0x49
-
-gUnknown_0850DBD2:: @ 850DBD2
-	.byte 0x4b, 0x4b, 0x4a, 0x4d, 0x4c
-
-gUnknown_0850DBD7:: @ 850DBD7
-	.byte 0x42, 0x42, 0x43, 0x44, 0x45
-
-gUnknown_0850DBDC:: @ 850DBDC
-	.byte 0x3a, 0x3a, 0x3b, 0x3c, 0x3d
-
-gUnknown_0850DBE1:: @ 850DBE1
-	.byte 0x19, 0x19, 0x1a, 0x1b, 0x1c
-
-gUnknown_0850DBE6:: @ 850DBE6
-	.byte 0x1d, 0x1d, 0x1e, 0x1f, 0x20
-
-gUnknown_0850DBEB:: @ 850DBEB
-	.byte 0x21, 0x21, 0x22, 0x23, 0x24
-
-gUnknown_0850DBF0:: @ 850DBF0
-	.byte 0x25, 0x25, 0x26, 0x27, 0x28
-
-gUnknown_0850DBF5:: @ 850DBF5
-	.byte 0x64, 0x64, 0x65, 0x66, 0x67
-
-gUnknown_0850DBFA:: @ 850DBFA
-	.byte 0x68, 0x68, 0x69, 0x6a, 0x6b
-
-gUnknown_0850DBFF:: @ 850DBFF
-	.byte 0x6c, 0x6c, 0x6d, 0x6e, 0x6f
-
-gUnknown_0850DC04:: @ 850DC04
-	.byte 0x70, 0x70, 0x71, 0x72, 0x73
-
-gUnknown_0850DC09:: @ 850DC09
-	.byte 0x74, 0x74, 0x75, 0x76, 0x77
-
-gUnknown_0850DC0E:: @ 850DC0E
-	.byte 0x78, 0x78, 0x79, 0x7a, 0x7b
-
-gUnknown_0850DC13:: @ 850DC13
-	.byte 0x7c, 0x7c, 0x7d, 0x7e, 0x7f
-
-gUnknown_0850DC18:: @ 850DC18
-	.byte 0x80, 0x80, 0x81, 0x82, 0x83
-
-gUnknown_0850DC1D:: @ 850DC1D
-	.byte 0x84, 0x84, 0x85, 0x86, 0x87
-
-gUnknown_0850DC22:: @ 850DC22
-	.byte 0x88, 0x88, 0x89, 0x8a, 0x8b
-
-gUnknown_0850DC27:: @ 850DC27
-	.byte 0x02, 0x01, 0x04, 0x03, 0x08, 0x07, 0x06, 0x05
-
-gUnknown_0850DC2F:: @ 850DC2F
-	.byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x02, 0x01, 0x04, 0x03, 0x01, 0x02
-
-gUnknown_0850DC3F:: @ 850DC3F
-	.byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00
-
-	.align 2, 0
-gUnknown_0850DC50:: @ 850DC50
-.4byte gUnknown_0850DEC8
-.4byte gUnknown_0850DED0
-.4byte gUnknown_0850DED8
-.4byte gUnknown_0850DEE0
-.4byte gUnknown_0850DF2C
-.4byte gUnknown_0850DF38
-.4byte gUnknown_0850DF44
-.4byte gUnknown_0850DF50
-.4byte gUnknown_0850DF8C
-.4byte gUnknown_0850DF98
-.4byte gUnknown_0850DFA4
-.4byte gUnknown_0850DFB0
-.4byte gUnknown_0850DFC8
-.4byte gUnknown_0850DFD4
-.4byte gUnknown_0850DFE0
-.4byte gUnknown_0850DFEC
-.4byte gUnknown_0850DFF8
-.4byte gUnknown_0850E004
-.4byte gUnknown_0850E010
-.4byte gUnknown_0850E01C
-.4byte gUnknown_0850E028
-.4byte gUnknown_0850E034
-.4byte gUnknown_0850E040
-.4byte gUnknown_0850E04C
-.4byte gUnknown_0850E058
-.4byte gUnknown_0850E064
-.4byte gUnknown_0850E070
-.4byte gUnknown_0850E07C
-.4byte gUnknown_0850E088
-.4byte gUnknown_0850E094
-.4byte gUnknown_0850E0A0
-.4byte gUnknown_0850E0AC
-.4byte gUnknown_0850E0B8
-.4byte gUnknown_0850E0C4
-.4byte gUnknown_0850E0D0
-.4byte gUnknown_0850E0DC
-.4byte gUnknown_0850E0E8
-.4byte gUnknown_0850E0F4
-.4byte gUnknown_0850E100
-.4byte gUnknown_0850E10C
-.4byte gUnknown_0850E118
-.4byte gUnknown_0850E124
-.4byte gUnknown_0850E130
-.4byte gUnknown_0850E13C
-.4byte gUnknown_0850E148
-.4byte gUnknown_0850E154
-.4byte gUnknown_0850E160
-.4byte gUnknown_0850E16C
-.4byte gUnknown_0850E178
-.4byte gUnknown_0850E184
-.4byte gUnknown_0850E190
-.4byte gUnknown_0850E19C
-.4byte gUnknown_0850E1A8
-.4byte gUnknown_0850E1B4
-.4byte gUnknown_0850E1C0
-.4byte gUnknown_0850E1CC
-.4byte gUnknown_0850E1D8
-.4byte gUnknown_0850E1E4
-.4byte gUnknown_0850E1F0
-.4byte gUnknown_0850E1FC
-.4byte gUnknown_0850E208
-.4byte gUnknown_0850E214
-.4byte gUnknown_0850E220
-.4byte gUnknown_0850E228
-.4byte gUnknown_0850E230
-.4byte gUnknown_0850E238
-.4byte gUnknown_0850E240
-.4byte gUnknown_0850E24C
-.4byte gUnknown_0850E258
-.4byte gUnknown_0850E264
-.4byte gUnknown_0850E270
-.4byte gUnknown_0850E27C
-.4byte gUnknown_0850E288
-.4byte gUnknown_0850E294
-.4byte gUnknown_0850E2A0
-.4byte gUnknown_0850E2AC
-.4byte gUnknown_0850E2B8
-.4byte gUnknown_0850E2C4
-.4byte gUnknown_0850E2D0
-.4byte gUnknown_0850E2D8
-.4byte gUnknown_0850E2E4
-.4byte gUnknown_0850E2EC
-.4byte gUnknown_0850E2F4
-.4byte gUnknown_0850E2FC
-.4byte gUnknown_0850E304
-.4byte gUnknown_0850E30C
-.4byte gUnknown_0850E314
-.4byte gUnknown_0850E31C
-.4byte gUnknown_0850E324
-.4byte gUnknown_0850E32C
-.4byte gUnknown_0850E338
-.4byte gUnknown_0850E348
-.4byte gUnknown_0850E358
-.4byte gUnknown_0850E360
-.4byte gUnknown_0850E368
-.4byte gUnknown_0850E370
-.4byte gUnknown_0850E378
-.4byte gUnknown_0850E380
-.4byte gUnknown_0850E388
-.4byte gUnknown_0850E394
-.4byte gUnknown_0850E3B8
-.4byte gUnknown_0850E3C0
-.4byte gUnknown_0850E3C8
-.4byte gUnknown_0850E3D0
-.4byte gUnknown_0850E3D8
-.4byte gUnknown_0850E3E4
-.4byte gUnknown_0850E3F0
-.4byte gUnknown_0850E3FC
-.4byte gUnknown_0850E408
-.4byte gUnknown_0850E414
-.4byte gUnknown_0850E420
-.4byte gUnknown_0850E42C
-.4byte gUnknown_0850E474
-.4byte gUnknown_0850E480
-.4byte gUnknown_0850E48C
-.4byte gUnknown_0850E498
-.4byte gUnknown_0850E4A4
-.4byte gUnknown_0850E4B0
-.4byte gUnknown_0850E4BC
-.4byte gUnknown_0850E4C8
-.4byte gUnknown_0850E4D4
-.4byte gUnknown_0850E4E0
-.4byte gUnknown_0850E4EC
-.4byte gUnknown_0850E4F8
-.4byte gUnknown_0850E504
-.4byte gUnknown_0850E510
-.4byte gUnknown_0850E51C
-.4byte gUnknown_0850E528
-.4byte gUnknown_0850E534
-.4byte gUnknown_0850E540
-.4byte gUnknown_0850E54C
-.4byte gUnknown_0850E558
-.4byte gUnknown_0850E564
-.4byte gUnknown_0850E570
-.4byte gUnknown_0850E57C
-.4byte gUnknown_0850E588
-.4byte gUnknown_0850E594
-.4byte gUnknown_0850E5A0
-.4byte gUnknown_0850E5AC
-.4byte gUnknown_0850E5B8
-.4byte gUnknown_0850DF5C
-.4byte gUnknown_0850DF68
-.4byte gUnknown_0850DF74
-.4byte gUnknown_0850DF80
-.4byte gUnknown_0850DEFC
-.4byte gUnknown_0850DF08
-.4byte gUnknown_0850DF14
-.4byte gUnknown_0850DF20
-.4byte gUnknown_0850E854
-.4byte gUnknown_0850E85C
-.4byte gUnknown_0850E3A0
-.4byte gUnknown_0850E3AC
-.4byte gUnknown_0850E5C4
-.4byte gUnknown_0850E5CC
-.4byte gUnknown_0850E5D4
-.4byte gUnknown_0850E468
-.4byte gUnknown_0850E864
-.4byte gUnknown_0850E870
-
-gUnknown_0850DEC8:: @ 850DEC8
-	.4byte sub_8093950
-	.4byte sub_80964BC
-
-gUnknown_0850DED0::
-	.4byte sub_8093960
-	.4byte sub_80964BC
-
-gUnknown_0850DED8::
-	.4byte sub_8093970
-	.4byte sub_80964BC
-
-gUnknown_0850DEE0::
-	.4byte sub_8093980
-	.4byte sub_80964BC
-
-gUnknown_0850DEE8:: @ 850DEE8
-	.4byte get_go_image_anim_num
-	.4byte get_go_fast_image_anim_num
-	.4byte get_go_fast_image_anim_num
-	.4byte get_go_faster_image_anim_num
-	.4byte get_go_fastest_image_anim_num
-
-gUnknown_0850DEFC::
-	.4byte sub_8093BC4
-	.4byte sub_8093BC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF08::
-	.4byte sub_8093C04
-	.4byte sub_8093C04_2
-	.4byte sub_80964BC
-gUnknown_0850DF14::
-	.4byte sub_8093C44
-	.4byte sub_8093C44_2
-	.4byte sub_80964BC
-gUnknown_0850DF20::
-	.4byte sub_8093C84
-	.4byte sub_8093C84_2
-	.4byte sub_80964BC
-gUnknown_0850DF2C::
-	.4byte sub_8093CC4
-	.4byte sub_8093CC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF38::
-	.4byte sub_8093D04
-	.4byte sub_8093D04_2
-	.4byte sub_80964BC
-gUnknown_0850DF44::
-	.4byte sub_8093D44
-	.4byte sub_8093D44_2
-	.4byte sub_80964BC
-gUnknown_0850DF50::
-	.4byte sub_8093D84
-	.4byte sub_8093D84_2
-	.4byte sub_80964BC
-gUnknown_0850DF5C::
-	.4byte sub_8093DC4
-	.4byte sub_8093DC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF68::
-	.4byte sub_8093E04
-	.4byte sub_8093E04_2
-	.4byte sub_80964BC
-gUnknown_0850DF74::
-	.4byte sub_8093E44
-	.4byte sub_8093E44_2
-	.4byte sub_80964BC
-gUnknown_0850DF80::
-	.4byte sub_8093E84
-	.4byte sub_8093E84_2
-	.4byte sub_80964BC
-gUnknown_0850DF8C::
-	.4byte sub_8093EC4
-	.4byte sub_8093EC4_2
-	.4byte sub_80964BC
-gUnknown_0850DF98::
-	.4byte sub_8093F04
-	.4byte sub_8093F04_2
-	.4byte sub_80964BC
-gUnknown_0850DFA4::
-	.4byte sub_8093F44
-	.4byte sub_8093F44_2
-	.4byte sub_80964BC
-gUnknown_0850DFB0::
-	.4byte sub_8093F84
-	.4byte sub_8093F84_2
-	.4byte sub_80964BC
-
-gUnknown_0850DFBC:: @ 850DFBC
-	.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00
-
-gUnknown_0850DFC2:: @ 850DFC2
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
-
-gUnknown_0850DFC8:: @ 850DFC8
-	.4byte sub_8094230
-	.4byte sub_8094230_2
-	.4byte sub_80964BC
-gUnknown_0850DFD4::
-	.4byte sub_8094288
-	.4byte sub_8094288_2
-	.4byte sub_80964BC
-gUnknown_0850DFE0::
-	.4byte sub_80942E0
-	.4byte sub_80942E0_2
-	.4byte sub_80964BC
-gUnknown_0850DFEC::
-	.4byte sub_8094338
-	.4byte sub_8094338_2
-	.4byte sub_80964BC
-gUnknown_0850DFF8::
-	.4byte sub_80943B4
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E004::
-	.4byte sub_80943D4
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E010::
-	.4byte sub_80943F4
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E01C::
-	.4byte sub_8094414
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E028::
-	.4byte sub_8094434
-	.4byte sub_8094398
-	.4byte sub_80964B8
-gUnknown_0850E034::
-	.4byte sub_8094454
-	.4byte sub_8094454_2
-	.4byte sub_80964BC
-gUnknown_0850E040::
-	.4byte sub_8094494
-	.4byte sub_8094494_2
-	.4byte sub_80964BC
-gUnknown_0850E04C::
-	.4byte sub_80944D4
-	.4byte sub_80944D4_2
-	.4byte sub_80964BC
-gUnknown_0850E058::
-	.4byte sub_8094514
-	.4byte sub_8094514_2
-	.4byte sub_80964BC
-gUnknown_0850E064::
-	.4byte sub_8094600
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E070::
-	.4byte sub_8094638
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E07C::
-	.4byte sub_8094670
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E088::
-	.4byte sub_80946A8
-	.4byte sub_80945C4
-	.4byte sub_80964BC
-gUnknown_0850E094::
-	.4byte sub_80946E0
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0A0::
-	.4byte sub_8094718
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0AC::
-	.4byte sub_8094750
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0B8::
-	.4byte sub_8094788
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0C4::
-	.4byte sub_80947C0
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0D0::
-	.4byte sub_80947F8
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0DC::
-	.4byte sub_8094830
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0E8::
-	.4byte sub_8094868
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E0F4::
-	.4byte sub_80948A0
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E100::
-	.4byte sub_80948D8
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E10C::
-	.4byte sub_8094910
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E118::
-	.4byte sub_8094948
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E124::
-	.4byte sub_8094980
-	.4byte sub_8094980_2
-	.4byte sub_80964BC
-gUnknown_0850E130::
-	.4byte sub_80949C0
-	.4byte sub_80949C0_2
-	.4byte sub_80964BC
-gUnknown_0850E13C::
-	.4byte sub_8094A00
-	.4byte sub_8094A00_2
-	.4byte sub_80964BC
-gUnknown_0850E148::
-	.4byte sub_8094A40
-	.4byte sub_8094A40_2
-	.4byte sub_80964BC
-gUnknown_0850E154::
-	.4byte sub_8094A80
-	.4byte sub_8094A80_2
-	.4byte sub_80964BC
-gUnknown_0850E160::
-	.4byte sub_8094AC0
-	.4byte sub_8094AC0_2
-	.4byte sub_80964BC
-gUnknown_0850E16C::
-	.4byte sub_8094B00
-	.4byte sub_8094B00_2
-	.4byte sub_80964BC
-gUnknown_0850E178::
-	.4byte sub_8094B40
-	.4byte sub_8094B40_2
-	.4byte sub_80964BC
-gUnknown_0850E184::
-	.4byte sub_8094B80
-	.4byte sub_8094B80_2
-	.4byte sub_80964BC
-gUnknown_0850E190::
-	.4byte sub_8094BC0
-	.4byte sub_8094BC0_2
-	.4byte sub_80964BC
-gUnknown_0850E19C::
-	.4byte sub_8094C00
-	.4byte sub_8094C00_2
-	.4byte sub_80964BC
-gUnknown_0850E1A8::
-	.4byte sub_8094C40
-	.4byte sub_8094C40_2
-	.4byte sub_80964BC
-gUnknown_0850E1B4::
-	.4byte sub_8094C80
-	.4byte sub_8094C80_2
-	.4byte sub_80964BC
-gUnknown_0850E1C0::
-	.4byte sub_8094CC0
-	.4byte sub_8094CC0_2
-	.4byte sub_80964BC
-gUnknown_0850E1CC::
-	.4byte sub_8094D00
-	.4byte sub_8094D00_2
-	.4byte sub_80964BC
-gUnknown_0850E1D8::
-	.4byte sub_8094D40
-	.4byte sub_8094D40_2
-	.4byte sub_80964BC
-gUnknown_0850E1E4::
-	.4byte sub_8094DAC
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E1F0::
-	.4byte sub_8094E18
-	.4byte sub_8094E18_2
-	.4byte sub_80964BC
-gUnknown_0850E1FC::
-	.4byte sub_8094E60
-	.4byte sub_8094E60_2
-	.4byte sub_80964BC
-gUnknown_0850E208::
-	.4byte sub_8094EB8
-	.4byte sub_8094EB8_2
-	.4byte sub_80964BC
-gUnknown_0850E214::
-	.4byte sub_8094710
-	.4byte sub_8094710_2
-	.4byte sub_80964BC
-gUnknown_0850E220::
-	.4byte sub_8094F38
-	.4byte sub_80964BC
-gUnknown_0850E228::
-	.4byte sub_8094F94
-	.4byte sub_80964BC
-gUnknown_0850E230::
-	.4byte sub_8094FF8
-	.4byte sub_80964BC
-gUnknown_0850E238::
-	.4byte sub_8095008
-	.4byte sub_80964BC
-gUnknown_0850E240::
-	.4byte sub_8095018
-	.4byte sub_8095018_2
-	.4byte sub_80964BC
-gUnknown_0850E24C::
-	.4byte sub_8095070
-	.4byte sub_8095070_2
-	.4byte sub_80964BC
-gUnknown_0850E258::
-	.4byte sub_80950C8
-	.4byte sub_80950C8_2
-	.4byte sub_80964BC
-gUnknown_0850E264::
-	.4byte sub_8095120
-	.4byte sub_8095120_2
-	.4byte sub_80964BC
-gUnknown_0850E270::
-	.4byte sub_8095178
-	.4byte sub_8095178_2
-	.4byte sub_80964BC
-gUnknown_0850E27C::
-	.4byte sub_80951D0
-	.4byte sub_80951D0_2
-	.4byte sub_80964BC
-gUnknown_0850E288::
-	.4byte sub_8095228
-	.4byte sub_8095228_2
-	.4byte sub_80964BC
-gUnknown_0850E294::
-	.4byte sub_8095280
-	.4byte sub_8095280_2
-	.4byte sub_80964BC
-gUnknown_0850E2A0::
-	.4byte sub_80952D8
-	.4byte sub_80952D8_2
-	.4byte sub_80964BC
-gUnknown_0850E2AC::
-	.4byte sub_8095330
-	.4byte sub_8095330_2
-	.4byte sub_80964BC
-gUnknown_0850E2B8::
-	.4byte sub_8095388
-	.4byte sub_8095388_2
-	.4byte sub_80964BC
-gUnknown_0850E2C4::
-	.4byte sub_80953E0
-	.4byte sub_80953E0_2
-	.4byte sub_80964BC
-gUnknown_0850E2D0::
-	.4byte sub_8095438
-	.4byte sub_80964BC
-gUnknown_0850E2D8::
-	.4byte sub_8095450
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E2E4::
-	.4byte sub_8095460
-	.4byte sub_80964B8
-gUnknown_0850E2EC::
-	.4byte sub_8095470
-	.4byte sub_80964B8
-gUnknown_0850E2F4::
-	.4byte sub_8095480
-	.4byte sub_80964B8
-gUnknown_0850E2FC::
-	.4byte sub_8095490
-	.4byte sub_80964B8
-gUnknown_0850E304::
-	.4byte sub_80954BC
-	.4byte sub_80964B8
-gUnknown_0850E30C::
-	.4byte sub_80954CC
-	.4byte sub_80964B8
-gUnknown_0850E314::
-	.4byte do_exclamation_mark_bubble_1
-	.4byte sub_80964B8
-gUnknown_0850E31C::
-	.4byte do_exclamation_mark_bubble_2
-	.4byte sub_80964B8
-gUnknown_0850E324::
-	.4byte do_heart_bubble
-	.4byte sub_80964B8
-gUnknown_0850E32C::
-	.4byte sub_8095548
-	.4byte sub_809558C
-	.4byte sub_80964B8
-gUnknown_0850E338::
-	.4byte sub_80955AC
-	.4byte sub_80955C8
-	.4byte sub_80955EC
-	.4byte sub_80964B8
-gUnknown_0850E348::
-	.4byte sub_8095628
-	.4byte sub_8095644
-	.4byte sub_8095668
-	.4byte sub_80964B8
-gUnknown_0850E358::
-	.4byte sub_80956A4
-	.4byte sub_80964B8
-gUnknown_0850E360::
-	.4byte sub_80956B4
-	.4byte sub_80964B8
-gUnknown_0850E368::
-	.4byte sub_80956C4
-	.4byte sub_80964B8
-gUnknown_0850E370::
-	.4byte sub_80956F4
-	.4byte sub_80964B8
-gUnknown_0850E378::
-	.4byte sub_8095724
-	.4byte sub_80964B8
-gUnknown_0850E380::
-	.4byte sub_8095730
-	.4byte sub_80964B8
-gUnknown_0850E388::
-	.4byte sub_8095740
-	.4byte sub_8095740_2
-	.4byte sub_80964BC
-gUnknown_0850E394::
-	.4byte sub_80957A0
-	.4byte sub_80957A0_2
-	.4byte sub_80964BC
-gUnknown_0850E3A0::
-	.4byte sub_8095800
-	.4byte sub_8095800_2
-	.4byte sub_80964BC
-gUnknown_0850E3AC::
-	.4byte sub_8095860
-	.4byte sub_8095860_2
-	.4byte sub_80964BC
-gUnknown_0850E3B8::
-	.4byte sub_8095900
-	.4byte sub_80964BC
-gUnknown_0850E3C0::
-	.4byte sub_8095910
-	.4byte sub_80964BC
-gUnknown_0850E3C8::
-	.4byte sub_8095920
-	.4byte sub_80964BC
-gUnknown_0850E3D0::
-	.4byte sub_8095930
-	.4byte sub_80964BC
-gUnknown_0850E3D8::
-	.4byte sub_8095940
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E3E4::
-	.4byte sub_8095964
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E3F0::
-	.4byte sub_8095988
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E3FC::
-	.4byte sub_80959AC
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E408::
-	.4byte sub_80959D0
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E414::
-	.4byte sub_80959F4
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E420::
-	.4byte sub_8095A18
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E42C::
-	.4byte sub_8095A3C
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095A60
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095A84
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095AA8
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-	.4byte sub_8095ACC
-	.4byte sub_8094DC4
-	.4byte sub_80964BC
-gUnknown_0850E468::
-	.4byte sub_8095B44
-	.4byte sub_8095B64
-	.4byte sub_80964BC
-gUnknown_0850E474::
-	.4byte sub_8095BC8
-	.4byte sub_8095BC8_2
-	.4byte sub_80964BC
-gUnknown_0850E480::
-	.4byte sub_8095C20
-	.4byte sub_8095C20_2
-	.4byte sub_80964BC
-gUnknown_0850E48C::
-	.4byte sub_8095C78
-	.4byte sub_8095C78_2
-	.4byte sub_80964BC
-gUnknown_0850E498::
-	.4byte sub_8095CD0
-	.4byte sub_8095CD0_2
-	.4byte sub_80964BC
-gUnknown_0850E4A4::
-	.4byte sub_8095D28
-	.4byte sub_8095D28_2
-	.4byte sub_80964BC
-gUnknown_0850E4B0::
-	.4byte sub_8095D80
-	.4byte sub_8095D80_2
-	.4byte sub_80964BC
-gUnknown_0850E4BC::
-	.4byte sub_8095DD8
-	.4byte sub_8095DD8_2
-	.4byte sub_80964BC
-gUnknown_0850E4C8::
-	.4byte sub_8095E30
-	.4byte sub_8095E30_2
-	.4byte sub_80964BC
-gUnknown_0850E4D4::
-	.4byte sub_8095E88
-	.4byte sub_8095E88_2
-	.4byte sub_80964BC
-gUnknown_0850E4E0::
-	.4byte sub_8095EE0
-	.4byte sub_8095EE0_2
-	.4byte sub_80964BC
-gUnknown_0850E4EC::
-	.4byte sub_8095F38
-	.4byte sub_8095F38_2
-	.4byte sub_80964BC
-gUnknown_0850E4F8::
-	.4byte sub_8095F90
-	.4byte sub_8095F90_2
-	.4byte sub_80964BC
-gUnknown_0850E504::
-	.4byte sub_8095FE8
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E510::
-	.4byte sub_8096020
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E51C::
-	.4byte sub_8096058
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E528::
-	.4byte sub_8096090
-	.4byte sub_809459C
-	.4byte sub_80964BC
-gUnknown_0850E534::
-	.4byte sub_8096100
-	.4byte sub_8096100_2
-	.4byte sub_80964BC
-gUnknown_0850E540::
-	.4byte sub_8096140
-	.4byte sub_8096140_2
-	.4byte sub_80964BC
-gUnknown_0850E54C::
-	.4byte sub_8096180
-	.4byte sub_8096180_2
-	.4byte sub_80964BC
-gUnknown_0850E558::
-	.4byte sub_80961C0
-	.4byte sub_80961C0_2
-	.4byte sub_80964BC
-gUnknown_0850E564::
-	.4byte sub_8096230
-	.4byte sub_8096230_2
-	.4byte sub_80964BC
-gUnknown_0850E570::
-	.4byte sub_8096270
-	.4byte sub_8096270_2
-	.4byte sub_80964BC
-gUnknown_0850E57C::
-	.4byte sub_80962B0
-	.4byte sub_80962B0_2
-	.4byte sub_80964BC
-gUnknown_0850E588::
-	.4byte sub_80962F0
-	.4byte sub_80962F0_2
-	.4byte sub_80964BC
-gUnknown_0850E594::
-	.4byte sub_8096368
-	.4byte sub_8096368_2
-	.4byte sub_80964BC
-gUnknown_0850E5A0::
-	.4byte sub_80963A8
-	.4byte sub_80963A8_2
-	.4byte sub_80964BC
-gUnknown_0850E5AC::
-	.4byte sub_80963E8
-	.4byte sub_80963E8_2
-	.4byte sub_80964BC
-gUnknown_0850E5B8::
-	.4byte sub_8096428
-	.4byte sub_8096428_2
-	.4byte sub_80964BC
-gUnknown_0850E5C4::
-	.4byte sub_8096468
-	.4byte sub_80964B8
-gUnknown_0850E5CC::
-	.4byte sub_809647C
-	.4byte sub_80964B8
-gUnknown_0850E5D4::
-	.4byte sub_8096494
-	.4byte sub_80964B8
-
diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s
deleted file mode 100644
index ee5a09c37..000000000
--- a/data/fldeff_cut.s
+++ /dev/null
@@ -1,32 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0857C608:: @ 857C608
-	.byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
-	.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00
-	
-gUnknown_0857C648:: @ 857C648
-	.2byte 0
-	.2byte 0
-	.2byte 0x1401
-	.2byte 0
-
-gUnknown_0857C650:: @ 857C650	
-	obj_image_anim_frame 0, 0x1E
-	obj_image_anim_jump 0
-	
-gUnknown_0857C658:: @ 857C658	
-	.4byte gUnknown_0857C650
-	
-gUnknown_0857C65C:: @ 857C65C
-	obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32
-
-	.align 2
-gFieldEffectObjectPaletteInfo6:: @ 857C664
-	obj_pal gFieldEffectObjectPalette6, 0x1000
-
-gUnknown_0857C66C:: @ 857C66C
-	spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8
diff --git a/data/graphics.s b/data/graphics.s
index 8527e570d..fdfa76343 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -2895,19 +2895,19 @@ gUnknown_08D85620:: @ 8D85620
 	@ dome anim pals
 
 	.align 2
-gUnknown_08D85640:: @ 8D85640
+gTilesetAnims_BattleDomePals0_0:: @ 8D85640
 	.incbin "graphics/battle_frontier/dome_anim1.gbapal"
 
 	.align 2
-gUnknown_08D85660:: @ 8D85660
+gTilesetAnims_BattleDomePals0_1:: @ 8D85660
 	.incbin "graphics/battle_frontier/dome_anim2.gbapal"
 
 	.align 2
-gUnknown_08D85680:: @ 8D85680
+gTilesetAnims_BattleDomePals0_2:: @ 8D85680
 	.incbin "graphics/battle_frontier/dome_anim3.gbapal"
 
 	.align 2
-gUnknown_08D856A0:: @ 8D856A0
+gTilesetAnims_BattleDomePals0_3:: @ 8D856A0
 	.incbin "graphics/battle_frontier/dome_anim4.gbapal"
 
 	@ 8D856C0
diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.inc b/data/graphics/field_objects/berry_tree_graphics_tables.inc
deleted file mode 100644
index 8d716d759..000000000
--- a/data/graphics/field_objects/berry_tree_graphics_tables.inc
+++ /dev/null
@@ -1,635 +0,0 @@
-	.align 2
-gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PechaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Pecha:: @ 850BE90
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_WepearBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Wepear:: @ 850BF30
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_IapapaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_CheriBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_FigyBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Figy:: @ 850C020
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_MagoBerryTree:: @ 850C028
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_MagoBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Mago:: @ 850C070
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_LumBerryTree:: @ 850C078
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LumBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Lum:: @ 850C0C0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_RazzBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Razz:: @ 850C110
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_GrepaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Grepa:: @ 850C160
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_RabutaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_NomelBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Nomel:: @ 850C200
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LeppaBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Leppa:: @ 850C250
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LiechiBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_HondewBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0
-	berry_tree_palette_slot_table 5
-
-	.align 2
-gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_AguavBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Aguav:: @ 850C340
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_WikiBerryTree:: @ 850C348
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_WikiBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Wiki:: @ 850C390
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_PomegBerryTree:: @ 850C398
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PomegBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_RawstBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Rawst:: @ 850C430
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_SpelonBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Spelon:: @ 850C480
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_ChestoBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_OranBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Oran:: @ 850C520
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_PersimBerryTree:: @ 850C528
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PersimBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Persim:: @ 850C570
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_SitrusBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_AspearBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Aspear:: @ 850C610
-	berry_tree_palette_slot_table 3
-
-	.align 2
-gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_PamtreBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Pamtre:: @ 850C660
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_CornnBerryTree:: @ 850C668
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_CornnBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_LansatBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Lansat:: @ 850C700
-	berry_tree_palette_slot_table 2
-
-	.align 2
-gFieldObjectPicTable_DurinBerryTree:: @ 850C708
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_DurinBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Durin:: @ 850C750
-	berry_tree_palette_slot_table 4
-
-	.align 2
-gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
-	obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
-	obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
-	obj_tiles gFieldObjectPic_TamatoBerryTree_0, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_1, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_2, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_3, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100
-	obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100
-
-	.align 2
-gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
-	berry_tree_palette_slot_table 2
-
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-
-gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
-	.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
-
-	.align 2
-gBerryTreePicTablePointers:: @ 850C7B0
-	.4byte gFieldObjectPicTable_CheriBerryTree  @ Cheri
-	.4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
-	.4byte gFieldObjectPicTable_PechaBerryTree  @ Pecha
-	.4byte gFieldObjectPicTable_RawstBerryTree  @ Rawst
-	.4byte gFieldObjectPicTable_AspearBerryTree @ Aspear
-	.4byte gFieldObjectPicTable_LeppaBerryTree  @ Leppa
-	.4byte gFieldObjectPicTable_OranBerryTree   @ Oran
-	.4byte gFieldObjectPicTable_PersimBerryTree @ Persim
-	.4byte gFieldObjectPicTable_LumBerryTree    @ Lum
-	.4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus
-	.4byte gFieldObjectPicTable_FigyBerryTree   @ Figy
-	.4byte gFieldObjectPicTable_WikiBerryTree   @ Wiki
-	.4byte gFieldObjectPicTable_MagoBerryTree   @ Mago
-	.4byte gFieldObjectPicTable_AguavBerryTree  @ Aguav
-	.4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa
-	.4byte gFieldObjectPicTable_RazzBerryTree   @ Razz
-	.4byte gFieldObjectPicTable_RazzBerryTree   @ Bluk
-	.4byte gFieldObjectPicTable_MagoBerryTree   @ Nanab
-	.4byte gFieldObjectPicTable_WepearBerryTree @ Wepear
-	.4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap
-	.4byte gFieldObjectPicTable_PomegBerryTree  @ Pomeg
-	.4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy
-	.4byte gFieldObjectPicTable_WepearBerryTree @ Qualot
-	.4byte gFieldObjectPicTable_HondewBerryTree @ Hondew
-	.4byte gFieldObjectPicTable_GrepaBerryTree  @ Grepa
-	.4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato
-	.4byte gFieldObjectPicTable_CornnBerryTree  @ Cornn
-	.4byte gFieldObjectPicTable_PomegBerryTree  @ Magost
-	.4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta
-	.4byte gFieldObjectPicTable_NomelBerryTree  @ Nomel
-	.4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon
-	.4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre
-	.4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel
-	.4byte gFieldObjectPicTable_DurinBerryTree  @ Durin
-	.4byte gFieldObjectPicTable_HondewBerryTree @ Belue
-	.4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi
-	.4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon
-	.4byte gFieldObjectPicTable_AguavBerryTree  @ Salac
-	.4byte gFieldObjectPicTable_PomegBerryTree  @ Petaya
-	.4byte gFieldObjectPicTable_GrepaBerryTree  @ Apicot
-	.4byte gFieldObjectPicTable_LansatBerryTree @ Lansat
-	.4byte gFieldObjectPicTable_CornnBerryTree  @ Starf
-	.4byte gFieldObjectPicTable_DurinBerryTree  @ Enigma
-
-	.align 2
-gBerryTreePaletteSlotTablePointers:: @ 850C85C
-	.4byte gBerryTreePaletteSlotTable_Cheri  @ Cheri
-	.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
-	.4byte gBerryTreePaletteSlotTable_Pecha  @ Pecha
-	.4byte gBerryTreePaletteSlotTable_Rawst  @ Rawst
-	.4byte gBerryTreePaletteSlotTable_Aspear @ Aspear
-	.4byte gBerryTreePaletteSlotTable_Leppa  @ Leppa
-	.4byte gBerryTreePaletteSlotTable_Oran   @ Oran
-	.4byte gBerryTreePaletteSlotTable_Persim @ Persim
-	.4byte gBerryTreePaletteSlotTable_Lum    @ Lum
-	.4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus
-	.4byte gBerryTreePaletteSlotTable_Figy   @ Figy
-	.4byte gBerryTreePaletteSlotTable_Wiki   @ Wiki
-	.4byte gBerryTreePaletteSlotTable_Mago   @ Mago
-	.4byte gBerryTreePaletteSlotTable_Aguav  @ Aguav
-	.4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa
-	.4byte gBerryTreePaletteSlotTable_Razz   @ Razz
-	.4byte gBerryTreePaletteSlotTable_Razz   @ Bluk
-	.4byte gBerryTreePaletteSlotTable_Mago   @ Nanab
-	.4byte gBerryTreePaletteSlotTable_Wepear @ Wepear
-	.4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap
-	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Pomeg
-	.4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy
-	.4byte gBerryTreePaletteSlotTable_Wepear @ Qualot
-	.4byte gBerryTreePaletteSlotTable_Hondew @ Hondew
-	.4byte gBerryTreePaletteSlotTable_Grepa  @ Grepa
-	.4byte gBerryTreePaletteSlotTable_Tamato @ Tamato
-	.4byte gBerryTreePaletteSlotTable_Cornn  @ Cornn
-	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Magost
-	.4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta
-	.4byte gBerryTreePaletteSlotTable_Nomel  @ Nomel
-	.4byte gBerryTreePaletteSlotTable_Spelon @ Spelon
-	.4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre
-	.4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel
-	.4byte gBerryTreePaletteSlotTable_Durin  @ Durin
-	.4byte gBerryTreePaletteSlotTable_Hondew @ Belue
-	.4byte gBerryTreePaletteSlotTable_Liechi @ Liechi
-	.4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon
-	.4byte gBerryTreePaletteSlotTable_Aguav  @ Salac
-	.4byte gBerryTreePaletteSlotTable_Pomeg  @ Petaya
-	.4byte gBerryTreePaletteSlotTable_Grepa  @ Apicot
-	.4byte gBerryTreePaletteSlotTable_Lansat @ Lansat
-	.4byte gBerryTreePaletteSlotTable_Cornn  @ Starf
-	.4byte gBerryTreePaletteSlotTable_Durin  @ Enigma
-
-	.align 2
-gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf
-	.4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma
-
-@ extras
-	.4byte gBerryTreeFieldObjectGraphicsIdTable
-	.4byte gBerryTreeFieldObjectGraphicsIdTable
-	.4byte gBerryTreeFieldObjectGraphicsIdTable
diff --git a/data/graphics/field_objects/field_effect_object_template_pointers.inc b/data/graphics/field_objects/field_effect_object_template_pointers.inc
deleted file mode 100644
index 846cdf6c2..000000000
--- a/data/graphics/field_objects/field_effect_object_template_pointers.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-	.align 2
-gFieldEffectObjectTemplatePointers:: @ 85059F8
-	.4byte gFieldEffectObjectTemplate_ShadowSmall
-	.4byte gFieldEffectObjectTemplate_ShadowMedium
-	.4byte gFieldEffectObjectTemplate_ShadowLarge
-	.4byte gFieldEffectObjectTemplate_ShadowExtraLarge
-	.4byte gFieldEffectObjectTemplate_TallGrass
-	.4byte gFieldEffectObjectTemplate_Ripple
-	.4byte gFieldEffectObjectTemplate_Ash
-	.4byte gFieldEffectObjectTemplate_SurfBlob
-	.4byte gFieldEffectObjectTemplate_Arrow
-	.4byte gFieldEffectObjectTemplate_GroundImpactDust
-	.4byte gFieldEffectObjectTemplate_BikeHopTallGrass
-	.4byte gFieldEffectObjectTemplate_SandFootprints
-	.4byte gFieldEffectObjectTemplate_BikeHopBigSplash
-	.4byte gFieldEffectObjectTemplate_Splash
-	.4byte gFieldEffectObjectTemplate_BikeHopSmallSplash
-	.4byte gFieldEffectObjectTemplate_LongGrass
-	.4byte gFieldEffectObjectTemplate_Unknown16
-	.4byte gFieldEffectObjectTemplate_Unknown17
-	.4byte gFieldEffectObjectTemplate_Unknown18
-	.4byte gFieldEffectObjectTemplate_Unknown19
-	.4byte gFieldEffectObjectTemplate_Unknown20
-	.4byte gFieldEffectObjectTemplate_Unknown21
-	.4byte gFieldEffectObjectTemplate_BerryTreeGrowthSparkle
-	.4byte gFieldEffectObjectTemplate_DeepSandFootprints
-	.4byte gFieldEffectObjectTemplate_TreeDisguise
-	.4byte gFieldEffectObjectTemplate_MountainDisguise
-	.4byte gFieldEffectObjectTemplate_Bird
-	.4byte gFieldEffectObjectTemplate_BikeTireTracks
-	.4byte gFieldEffectObjectTemplate_SandDisguisePlaceholder
-	.4byte gFieldEffectObjectTemplate_Unknown29
-	.4byte gFieldEffectObjectTemplate_ShortGrass
-	.4byte gFieldEffectObjectTemplate_HotSpringsWater
-	.4byte gFieldEffectObjectTemplate_JumpOutOfAsh
-	.4byte gFieldEffectObjectTemplate_Unknown33
-	.4byte gFieldEffectObjectTemplate_Bubbles
-	.4byte gFieldEffectObjectTemplate_Unknown35
-	.4byte gFieldEffectObjectTemplate_Rayquaza
diff --git a/data/graphics/field_objects/field_effect_objects.inc b/data/graphics/field_objects/field_effect_objects.inc
deleted file mode 100644
index 2c1ce3c4c..000000000
--- a/data/graphics/field_objects/field_effect_objects.inc
+++ /dev/null
@@ -1,1208 +0,0 @@
-
-	.align 2
-gFieldEffectObjectPaletteInfo0:: @ 850C9C0
-	obj_pal gFieldEffectObjectPalette0, 0x1004
-
-	.align 2
-gFieldEffectObjectPaletteInfo1:: @ 850C9C8
-	obj_pal gFieldEffectObjectPalette1, 0x1005
-
-	.align 2
-gFieldEffectObjectImageAnim_850C9D0:: @ 850C9D0
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Shadow:: @ 850C9D8
-	.4byte gFieldEffectObjectImageAnim_850C9D0
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowSmall:: @ 850C9DC
-	obj_tiles gFieldEffectObjectPic_ShadowSmall, 0x20
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowMedium:: @ 850C9E4
-	obj_tiles gFieldEffectObjectPic_ShadowMedium, 0x40
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowLarge:: @ 850C9EC
-	obj_tiles gFieldEffectObjectPic_ShadowLarge, 0x80
-
-	.align 2
-gFieldEffectObjectPicTable_ShadowExtraLarge:: @ 850C9F4
-	obj_tiles gFieldEffectObjectPic_ShadowExtraLarge, 0x400
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowSmall:: @ 850C9FC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_8x8
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowSmall
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowMedium:: @ 850CA14
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowMedium
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowLarge:: @ 850CA2C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x8
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowLarge
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectTemplate_ShadowExtraLarge:: @ 850CA44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_64x32
-	.4byte gFieldEffectObjectImageAnimTable_Shadow
-	.4byte gFieldEffectObjectPicTable_ShadowExtraLarge
-	.4byte gDummySpriteAffineAnimTable
-	.4byte oamc_shadow
-
-	.align 2
-gFieldEffectObjectPicTable_TallGrass:: @ 850CA5C
-	obj_tiles gFieldEffectObjectPic_TallGrass_0, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_1, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_2, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_3, 0x80
-	obj_tiles gFieldEffectObjectPic_TallGrass_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CA84:: @ 850CA84
-	obj_image_anim_frame 1, 10
-	obj_image_anim_frame 2, 10
-	obj_image_anim_frame 3, 10
-	obj_image_anim_frame 4, 10
-	obj_image_anim_frame 0, 10
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_TallGrass:: @ 850CA9C
-	.4byte gFieldEffectObjectImageAnim_850CA84
-
-	.align 2
-gFieldEffectObjectTemplate_TallGrass:: @ 850CAA0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_TallGrass
-	.4byte gFieldEffectObjectPicTable_TallGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte unc_grass_normal
-
-	.align 2
-gFieldEffectObjectPicTable_Ripple:: @ 850CAB8
-	obj_tiles gFieldEffectObjectPic_Ripple_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Ripple_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CAE0:: @ 850CAE0
-	obj_image_anim_frame 0, 12
-	obj_image_anim_frame 1, 9
-	obj_image_anim_frame 2, 9
-	obj_image_anim_frame 3, 9
-	obj_image_anim_frame 0, 9
-	obj_image_anim_frame 1, 9
-	obj_image_anim_frame 2, 11
-	obj_image_anim_frame 4, 11
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Ripple:: @ 850CB04
-	.4byte gFieldEffectObjectImageAnim_850CAE0
-
-	.align 2
-gFieldEffectObjectTemplate_Ripple:: @ 850CB08
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Ripple
-	.4byte gFieldEffectObjectPicTable_Ripple
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Ash:: @ 850CB20
-	obj_tiles gFieldEffectObjectPic_Ash_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Ash_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CB48:: @ 850CB48
-	obj_image_anim_frame 0, 12
-	obj_image_anim_frame 1, 12
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 12
-	obj_image_anim_frame 4, 12
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Ash:: @ 850CB60
-	.4byte gFieldEffectObjectImageAnim_850CB48
-
-	.align 2
-gFieldEffectObjectTemplate_Ash:: @ 850CB64
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Ash
-	.4byte gFieldEffectObjectPicTable_Ash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155460
-
-	.align 2
-gFieldEffectObjectPicTable_SurfBlob:: @ 850CB7C
-	obj_tiles gFieldEffectObjectPic_SurfBlob_0, 0x200
-	obj_tiles gFieldEffectObjectPic_SurfBlob_1, 0x200
-	obj_tiles gFieldEffectObjectPic_SurfBlob_2, 0x200
-
-	.align 2
-gFieldEffectObjectImageAnim_850CB94:: @ 850CB94
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CB9C:: @ 850CB9C
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CBA4:: @ 850CBA4
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CBAC:: @ 850CBAC
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_SurfBlob:: @ 850CBB4
-	.4byte gFieldEffectObjectImageAnim_850CB94
-	.4byte gFieldEffectObjectImageAnim_850CB9C
-	.4byte gFieldEffectObjectImageAnim_850CBA4
-	.4byte gFieldEffectObjectImageAnim_850CBAC
-
-	.align 2
-gFieldEffectObjectTemplate_SurfBlob:: @ 850CBC4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldEffectObjectImageAnimTable_SurfBlob
-	.4byte gFieldEffectObjectPicTable_SurfBlob
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155658
-
-	.align 2
-gFieldEffectObjectPicTable_Arrow:: @ 850CBDC
-	obj_tiles gFieldEffectObjectPic_Arrow_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_4, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_5, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_6, 0x80
-	obj_tiles gFieldEffectObjectPic_Arrow_7, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC1C:: @ 850CC1C
-	obj_image_anim_frame 3, 32
-	obj_image_anim_frame 7, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC28:: @ 850CC28
-	obj_image_anim_frame 0, 32
-	obj_image_anim_frame 4, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC34:: @ 850CC34
-	obj_image_anim_frame 1, 32
-	obj_image_anim_frame 5, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC40:: @ 850CC40
-	obj_image_anim_frame 2, 32
-	obj_image_anim_frame 6, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Arrow:: @ 850CC4C
-	.4byte gFieldEffectObjectImageAnim_850CC1C
-	.4byte gFieldEffectObjectImageAnim_850CC28
-	.4byte gFieldEffectObjectImageAnim_850CC34
-	.4byte gFieldEffectObjectImageAnim_850CC40
-
-	.align 2
-gFieldEffectObjectTemplate_Arrow:: @ 850CC5C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Arrow
-	.4byte gFieldEffectObjectPicTable_Arrow
-	.4byte gDummySpriteAffineAnimTable
-	.4byte SpriteCallbackDummy
-
-	.align 2
-gFieldEffectObjectPicTable_GroundImpactDust:: @ 850CC74
-	obj_tiles gFieldEffectObjectPic_GroundImpactDust_0, 0x40
-	obj_tiles gFieldEffectObjectPic_GroundImpactDust_1, 0x40
-	obj_tiles gFieldEffectObjectPic_GroundImpactDust_2, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CC8C:: @ 850CC8C
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_GroundImpactDust:: @ 850CC9C
-	.4byte gFieldEffectObjectImageAnim_850CC8C
-
-	.align 2
-gFieldEffectObjectTemplate_GroundImpactDust:: @ 850CCA0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_GroundImpactDust
-	.4byte gFieldEffectObjectPicTable_GroundImpactDust
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_BikeHopTallGrass:: @ 850CCB8
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_0, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_1, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_2, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_3, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CCD8:: @ 850CCD8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeHopTallGrass:: @ 850CCEC
-	.4byte gFieldEffectObjectImageAnim_850CCD8
-
-	.align 2
-gFieldEffectObjectTemplate_BikeHopTallGrass:: @ 850CCF0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_BikeHopTallGrass
-	.4byte gFieldEffectObjectPicTable_BikeHopTallGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_SandFootprints:: @ 850CD08
-	obj_tiles gFieldEffectObjectPic_SandFootprints_0, 0x80
-	obj_tiles gFieldEffectObjectPic_SandFootprints_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD18:: @ 850CD18
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD20:: @ 850CD20
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD28:: @ 850CD28
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD30:: @ 850CD30
-	obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_SandFootprints:: @ 850CD38
-	.4byte gFieldEffectObjectImageAnim_850CD18
-	.4byte gFieldEffectObjectImageAnim_850CD18
-	.4byte gFieldEffectObjectImageAnim_850CD20
-	.4byte gFieldEffectObjectImageAnim_850CD28
-	.4byte gFieldEffectObjectImageAnim_850CD30
-
-	.align 2
-gFieldEffectObjectTemplate_SandFootprints:: @ 850CD4C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_SandFootprints
-	.4byte gFieldEffectObjectPicTable_SandFootprints
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154C60
-
-	.align 2
-gFieldEffectObjectPicTable_DeepSandFootprints:: @ 850CD64
-	obj_tiles gFieldEffectObjectPic_DeepSandFootprints_0, 0x80
-	obj_tiles gFieldEffectObjectPic_DeepSandFootprints_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD74:: @ 850CD74
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD7C:: @ 850CD7C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD84:: @ 850CD84
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CD8C:: @ 850CD8C
-	obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_DeepSandFootprints:: @ 850CD94
-	.4byte gFieldEffectObjectImageAnim_850CD74
-	.4byte gFieldEffectObjectImageAnim_850CD74
-	.4byte gFieldEffectObjectImageAnim_850CD7C
-	.4byte gFieldEffectObjectImageAnim_850CD84
-	.4byte gFieldEffectObjectImageAnim_850CD8C
-
-	.align 2
-gFieldEffectObjectTemplate_DeepSandFootprints:: @ 850CDA8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_DeepSandFootprints
-	.4byte gFieldEffectObjectPicTable_DeepSandFootprints
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154C60
-
-	.align 2
-gFieldEffectObjectPicTable_BikeTireTracks:: @ 850CDC0
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_0, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_1, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_2, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeTireTracks_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDE0:: @ 850CDE0
-	obj_image_anim_frame 2, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDE8:: @ 850CDE8
-	obj_image_anim_frame 2, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDF0:: @ 850CDF0
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CDF8:: @ 850CDF8
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE00:: @ 850CE00
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE08:: @ 850CE08
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE10:: @ 850CE10
-	obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE18:: @ 850CE18
-	obj_image_anim_frame 3, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeTireTracks:: @ 850CE20
-	.4byte gFieldEffectObjectImageAnim_850CDE0
-	.4byte gFieldEffectObjectImageAnim_850CDE0
-	.4byte gFieldEffectObjectImageAnim_850CDE8
-	.4byte gFieldEffectObjectImageAnim_850CDF0
-	.4byte gFieldEffectObjectImageAnim_850CDF8
-	.4byte gFieldEffectObjectImageAnim_850CE00
-	.4byte gFieldEffectObjectImageAnim_850CE08
-	.4byte gFieldEffectObjectImageAnim_850CE10
-	.4byte gFieldEffectObjectImageAnim_850CE18
-
-	.align 2
-gFieldEffectObjectTemplate_BikeTireTracks:: @ 850CE44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_BikeTireTracks
-	.4byte gFieldEffectObjectPicTable_BikeTireTracks
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154C60
-
-	.align 2
-gFieldEffectObjectPicTable_BikeHopBigSplash:: @ 850CE5C
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_0, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_1, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_2, 0x80
-	obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CE7C:: @ 850CE7C
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeHopBigSplash:: @ 850CE90
-	.4byte gFieldEffectObjectImageAnim_850CE7C
-
-	.align 2
-gFieldEffectObjectTemplate_BikeHopBigSplash:: @ 850CE94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_BikeHopBigSplash
-	.4byte gFieldEffectObjectPicTable_BikeHopBigSplash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_Splash:: @ 850CEAC
-	obj_tiles gFieldEffectObjectPic_Splash_0, 0x40
-	obj_tiles gFieldEffectObjectPic_Splash_1, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CEBC:: @ 850CEBC
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850CEC8:: @ 850CEC8
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Splash:: @ 850CEEC
-	.4byte gFieldEffectObjectImageAnim_850CEBC
-	.4byte gFieldEffectObjectImageAnim_850CEC8
-
-	.align 2
-gFieldEffectObjectTemplate_Splash:: @ 850CEF4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_Splash
-	.4byte gFieldEffectObjectPicTable_Splash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154D90
-
-	.align 2
-gFieldEffectObjectPicTable_BikeHopSmallSplash:: @ 850CF0C
-	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_0, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_1, 0x40
-	obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_2, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850CF24:: @ 850CF24
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BikeHopSmallSplash:: @ 850CF34
-	.4byte gFieldEffectObjectImageAnim_850CF24
-
-	.align 2
-gFieldEffectObjectTemplate_BikeHopSmallSplash:: @ 850CF38
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_BikeHopSmallSplash
-	.4byte gFieldEffectObjectPicTable_BikeHopSmallSplash
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_LongGrass:: @ 850CF50
-	obj_tiles gFieldEffectObjectPic_LongGrass_0, 0x80
-	obj_tiles gFieldEffectObjectPic_LongGrass_1, 0x80
-	obj_tiles gFieldEffectObjectPic_LongGrass_2, 0x80
-	obj_tiles gFieldEffectObjectPic_LongGrass_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CF70:: @ 850CF70
-	obj_image_anim_frame 1, 3
-	obj_image_anim_frame 2, 3
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_LongGrass:: @ 850CF90
-	.4byte gFieldEffectObjectImageAnim_850CF70
-
-	.align 2
-gFieldEffectObjectTemplate_LongGrass:: @ 850CF94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_LongGrass
-	.4byte gFieldEffectObjectPicTable_LongGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte unc_grass_tall
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown16:: @ 850CFAC
-	obj_tiles gFieldEffectObjectPic_Unknown16_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_4, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850CFDC:: @ 850CFDC
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 5, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown16:: @ 850CFF8
-	.4byte gFieldEffectObjectImageAnim_850CFDC
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown16:: @ 850CFFC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown16
-	.4byte gFieldEffectObjectPicTable_Unknown16
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8156194
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown17:: @ 850D014
-	obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_4, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_5, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_6, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown17_7, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D05C:: @ 850D05C
-	obj_image_anim_frame 0, 10
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 7, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_jump 7
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown17:: @ 850D084
-	.4byte gFieldEffectObjectImageAnim_850D05C
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown17:: @ 850D088
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown17
-	.4byte gFieldEffectObjectPicTable_Unknown17
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown18:: @ 850D0A0
-	obj_tiles gFieldEffectObjectPic_Unknown18_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown18_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown18_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown18_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D0C0:: @ 850D0C0
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown18:: @ 850D0DC
-	.4byte gFieldEffectObjectImageAnim_850D0C0
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown18:: @ 850D0E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown18
-	.4byte gFieldEffectObjectPicTable_Unknown18
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown19:: @ 850D0F8
-	obj_tiles gFieldEffectObjectPic_Unknown19_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown19_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown19_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown19_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D118:: @ 850D118
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown19:: @ 850D12C
-	.4byte gFieldEffectObjectImageAnim_850D118
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown19:: @ 850D130
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown19
-	.4byte gFieldEffectObjectPicTable_Unknown19
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown29:: @ 850D148
-	obj_tiles gFieldEffectObjectPic_Unknown29_0, 0x40
-	obj_tiles gFieldEffectObjectPic_Unknown29_1, 0x40
-	obj_tiles gFieldEffectObjectPic_Unknown29_2, 0x40
-
-	.align 2
-gFieldEffectObjectImageAnim_850D160:: @ 850D160
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown29:: @ 850D170
-	.4byte gFieldEffectObjectImageAnim_850D160
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown29:: @ 850D174
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x8
-	.4byte gFieldEffectObjectImageAnimTable_Unknown29
-	.4byte gFieldEffectObjectPicTable_Unknown29
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81559BC
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown20:: @ 850D18C
-	obj_tiles gFieldEffectObjectPic_Unknown20_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown20_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown20_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown20_3, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D1AC:: @ 850D1AC
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown20:: @ 850D1C8
-	.4byte gFieldEffectObjectImageAnim_850D1AC
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown20:: @ 850D1CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown20
-	.4byte gFieldEffectObjectPicTable_Unknown20
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectRotScalAnim_850D1E4:: @ 850D1E4
-	obj_rot_scal_anim_frame 0xFF00, 0x100, -128, 0
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gFieldEffectObjectRotScalAnim_850D234:: @ 850D234
-	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x1, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gFieldEffectObjectRotScalAnimTable_Unknown21:: @ 850D284
-	.4byte gFieldEffectObjectRotScalAnim_850D1E4
-	.4byte gFieldEffectObjectRotScalAnim_850D234
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown21:: @ 850D28C
-	.2byte 0x0 @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gDummyOamData
-	.4byte gDummySpriteAnimTable
-	.4byte NULL
-	.4byte gFieldEffectObjectRotScalAnimTable_Unknown21
-	.4byte SpriteCallbackDummy
-
-	.align 2
-gFieldEffectObjectPicTable_BerryTreeGrowthSparkle:: @ 850D2A4
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_0, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_1, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_2, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_3, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_4, 0x80
-	obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_5, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D2D4:: @ 850D2D4
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 5, 8
-	obj_image_anim_loop 0
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_loop 3
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 5, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle:: @ 850D328
-	.4byte gFieldEffectObjectImageAnim_850D2D4
-
-	.align 2
-gFieldEffectObjectTemplate_BerryTreeGrowthSparkle:: @ 850D32C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle
-	.4byte gFieldEffectObjectPicTable_BerryTreeGrowthSparkle
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_81561D0
-
-	.align 2
-gFieldEffectObjectPicTable_TreeDisguise:: @ 850D344
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_0, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_1, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_2, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_3, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_4, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_5, 0x100
-	obj_tiles gFieldEffectObjectPic_TreeDisguise_6, 0x100
-
-	.align 2
-gFieldEffectObjectImageAnim_850D37C:: @ 850D37C
-	obj_image_anim_frame 0, 16
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850D384:: @ 850D384
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_TreeDisguise:: @ 850D3A4
-	.4byte gFieldEffectObjectImageAnim_850D37C
-	.4byte gFieldEffectObjectImageAnim_850D384
-
-	.align 2
-gFieldEffectObjectTemplate_TreeDisguise:: @ 850D3AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_TreeDisguise
-	.4byte gFieldEffectObjectPicTable_TreeDisguise
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155C88
-
-	.align 2
-gFieldEffectObjectPicTable_MountainDisguise:: @ 850D3C4
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_0, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_1, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_2, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_3, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_4, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_5, 0x100
-	obj_tiles gFieldEffectObjectPic_MountainDisguise_6, 0x100
-
-	.align 2
-gFieldEffectObjectImageAnim_850D3FC:: @ 850D3FC
-	obj_image_anim_frame 0, 16
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnim_850D404:: @ 850D404
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_MountainDisguise:: @ 850D424
-	.4byte gFieldEffectObjectImageAnim_850D3FC
-	.4byte gFieldEffectObjectImageAnim_850D404
-
-	.align 2
-gFieldEffectObjectTemplate_MountainDisguise:: @ 850D42C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_MountainDisguise
-	.4byte gFieldEffectObjectPicTable_MountainDisguise
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155C88
-
-	.align 2
-gFieldEffectObjectPicTable_SandDisguisePlaceholder:: @ 850D444
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_0, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_1, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_2, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_3, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_4, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_5, 0x100
-	obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_6, 0x100
-
-	.align 2
-gFieldEffectObjectTemplate_SandDisguisePlaceholder:: @ 850D47C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_TreeDisguise
-	.4byte gFieldEffectObjectPicTable_SandDisguisePlaceholder
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155C88
-
-	.align 2
-gFieldEffectObjectPicTable_Bird:: @ 850D494
-	obj_tiles gFieldEffectObjectPic_Bird, 0x200
-
-	.align 2
-gFieldEffectObjectImageAnim_850D49C:: @ 850D49C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Bird:: @ 850D4A4
-	.4byte gFieldEffectObjectImageAnim_850D49C
-
-	.align 2
-gFieldEffectObjectTemplate_Bird:: @ 850D4A8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldEffectObjectImageAnimTable_Bird
-	.4byte gFieldEffectObjectPicTable_Bird
-	.4byte gDummySpriteAffineAnimTable
-	.4byte SpriteCallbackDummy
-
-	.align 2
-gFieldEffectObjectPicTable_ShortGrass:: @ 850D4C0
-	obj_tiles gFieldEffectObjectPic_ShortGrass_0, 0x80
-	obj_tiles gFieldEffectObjectPic_ShortGrass_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D4D0:: @ 850D4D0
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_ShortGrass:: @ 850D4DC
-	.4byte gFieldEffectObjectImageAnim_850D4D0
-
-	.align 2
-gFieldEffectObjectTemplate_ShortGrass:: @ 850D4E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_ShortGrass
-	.4byte gFieldEffectObjectPicTable_ShortGrass
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8154A10
-
-	.align 2
-gFieldEffectObjectPicTable_HotSpringsWater:: @ 850D4F8
-	obj_tiles gFieldEffectObjectPic_HotSpringsWater, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D500:: @ 850D500
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_HotSpringsWater:: @ 850D508
-	.4byte gFieldEffectObjectImageAnim_850D500
-
-	.align 2
-gFieldEffectObjectTemplate_HotSpringsWater:: @ 850D50C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1005 @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_HotSpringsWater
-	.4byte gFieldEffectObjectPicTable_HotSpringsWater
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155158
-
-	.align 2
-gFieldEffectObjectPicTable_JumpOutOfAsh:: @ 850D524
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_0, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_1, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_2, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_3, 0x80
-	obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D54C:: @ 850D54C
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_JumpOutOfAsh:: @ 850D564
-	.4byte gFieldEffectObjectImageAnim_850D54C
-
-	.align 2
-gFieldEffectObjectTemplate_JumpOutOfAsh:: @ 850D568
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x100D @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_JumpOutOfAsh
-	.4byte gFieldEffectObjectPicTable_JumpOutOfAsh
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_80B7CAC
-
-	.align 2
-gFieldEffectObjectPaletteInfo2:: @ 850D580
-	obj_pal gFieldEffectObjectPalette2, 0x100D
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown33:: @ 850D588
-	obj_tiles gFieldEffectObjectPic_Unknown33_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_1, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_2, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_3, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown33_4, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D5B0:: @ 850D5B0
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown33:: @ 850D5C8
-	.4byte gFieldEffectObjectImageAnim_850D5B0
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown33:: @ 850D5CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x100D @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown33
-	.4byte gFieldEffectObjectPicTable_Unknown33
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_80B7A58
-
-	.align 2
-gFieldEffectObjectPicTable_Bubbles:: @ 850D5E4
-	obj_tiles gFieldEffectObjectPic_Bubbles_0, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_1, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_2, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_3, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_4, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_5, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_6, 0x100
-	obj_tiles gFieldEffectObjectPic_Bubbles_7, 0x100
-
-	.align 2
-gFieldEffectObjectImageAnim_850D624:: @ 850D624
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 7, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Bubbles:: @ 850D648
-	.4byte gFieldEffectObjectImageAnim_850D624
-
-	.align 2
-gFieldEffectObjectTemplate_Bubbles:: @ 850D64C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1004 @ palette tag
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldEffectObjectImageAnimTable_Bubbles
-	.4byte gFieldEffectObjectPicTable_Bubbles
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155AEC
-
-	.align 2
-gFieldEffectObjectPicTable_Unknown35:: @ 850D664
-	obj_tiles gFieldEffectObjectPic_Unknown35_0, 0x80
-	obj_tiles gFieldEffectObjectPic_Unknown35_1, 0x80
-
-	.align 2
-gFieldEffectObjectImageAnim_850D674:: @ 850D674
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 1, 5
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Unknown35:: @ 850D684
-	.4byte gFieldEffectObjectImageAnim_850D674
-
-	.align 2
-gFieldEffectObjectTemplate_Unknown35:: @ 850D688
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x100F @ palette tag
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldEffectObjectImageAnimTable_Unknown35
-	.4byte gFieldEffectObjectPicTable_Unknown35
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155E50
-
-	.align 2
-gFieldEffectObjectPaletteInfo3:: @ 850D6A0
-	obj_pal gFieldEffectObjectPalette3, 0x100F
-
-	.align 2
-gFieldEffectObjectImageAnim_850D6A8:: @ 850D6A8
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gFieldEffectObjectImageAnimTable_Rayquaza:: @ 850D6B0
-	.4byte gFieldEffectObjectImageAnim_850D6A8
-
-	.align 2
-gFieldEffectObjectPicTable_Rayquaza:: @ 850D6B4
-	obj_tiles gFieldObjectPic_Rayquaza_0, 0x200
-
-	.align 2
-gFieldEffectObjectTemplate_Rayquaza:: @ 850D6BC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0xFFFF @ palette tag
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldEffectObjectImageAnimTable_Rayquaza
-	.4byte gFieldEffectObjectPicTable_Rayquaza
-	.4byte gDummySpriteAffineAnimTable
-	.4byte sub_8155F80
diff --git a/data/graphics/field_objects/field_object_anims.inc b/data/graphics/field_objects/field_object_anims.inc
deleted file mode 100644
index d75df6d9d..000000000
--- a/data/graphics/field_objects/field_object_anims.inc
+++ /dev/null
@@ -1,1029 +0,0 @@
-	.align 2
-gFieldObjectImageAnim_StayStill:: @ 85089FC
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceSouth:: @ 8508A10
-	obj_image_anim_frame 0, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceNorth:: @ 8508A18
-	obj_image_anim_frame 1, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceWest:: @ 8508A20
-	obj_image_anim_frame 2, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpFaceEast:: @ 8508A28
-	obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoSouth:: @ 8508A30
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoNorth:: @ 8508A44
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoWest:: @ 8508A58
-	obj_image_anim_frame 5, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 6, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoEast:: @ 8508A6C
-	obj_image_anim_frame 5, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastSouth:: @ 8508A80
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastNorth:: @ 8508A94
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastWest:: @ 8508AA8
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastEast:: @ 8508ABC
-	obj_image_anim_frame 5, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterSouth:: @ 8508AD0
-	obj_image_anim_frame 3, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 3, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterNorth:: @ 8508AE4
-	obj_image_anim_frame 4, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 4, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterWest:: @ 8508AF8
-	obj_image_anim_frame 5, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 6, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFasterEast:: @ 8508B0C
-	obj_image_anim_frame 5, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestSouth:: @ 8508B20
-	obj_image_anim_frame 3, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestNorth:: @ 8508B34
-	obj_image_anim_frame 4, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestWest:: @ 8508B48
-	obj_image_anim_frame 5, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 6, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_QuintyPlumpGoFastestEast:: @ 8508B5C
-	obj_image_anim_frame 5, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 6, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceSouth:: @ 8508B70
-	obj_image_anim_frame 0, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceNorth:: @ 8508B78
-	obj_image_anim_frame 1, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceWest:: @ 8508B80
-	obj_image_anim_frame 2, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FaceEast:: @ 8508B88
-	obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoSouth:: @ 8508B90
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoNorth:: @ 8508BA4
-	obj_image_anim_frame 5, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 6, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoWest:: @ 8508BB8
-	obj_image_anim_frame 7, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 8, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoEast:: @ 8508BCC
-	obj_image_anim_frame 7, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastSouth:: @ 8508BE0
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastNorth:: @ 8508BF4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastWest:: @ 8508C08
-	obj_image_anim_frame 7, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastEast:: @ 8508C1C
-	obj_image_anim_frame 7, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterSouth:: @ 8508C30
-	obj_image_anim_frame 3, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 4, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterNorth:: @ 8508C44
-	obj_image_anim_frame 5, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 6, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterWest:: @ 8508C58
-	obj_image_anim_frame 7, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 8, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFasterEast:: @ 8508C6C
-	obj_image_anim_frame 7, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestSouth:: @ 8508C80
-	obj_image_anim_frame 3, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 4, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestNorth:: @ 8508C94
-	obj_image_anim_frame 5, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_frame 6, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestWest:: @ 8508CA8
-	obj_image_anim_frame 7, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 8, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GoFastestEast:: @ 8508CBC
-	obj_image_anim_frame 7, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunSouth:: @ 8508CD0
-	obj_image_anim_frame 12, 5
-	obj_image_anim_frame 9, 3
-	obj_image_anim_frame 13, 5
-	obj_image_anim_frame 9, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunNorth:: @ 8508CE4
-	obj_image_anim_frame 14, 5
-	obj_image_anim_frame 10, 3
-	obj_image_anim_frame 15, 5
-	obj_image_anim_frame 10, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunWest:: @ 8508CF8
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 11, 3
-	obj_image_anim_frame 17, 5
-	obj_image_anim_frame 11, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_RunEast:: @ 8508D0C
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 17, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_FieldMove:: @ 8508D20
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 4, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobSouth:: @ 8508D38
-	obj_image_anim_frame 9, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobNorth:: @ 8508D40
-	obj_image_anim_frame 10, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobWest:: @ 8508D48
-	obj_image_anim_frame 11, 32
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_GetOnOffSurfBlobEast:: @ 8508D50
-	obj_image_anim_frame 11, 32, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelSouth:: @ 8508D58
-	obj_image_anim_frame 9, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelNorth:: @ 8508D64
-	obj_image_anim_frame 13, 4
-	obj_image_anim_frame 14, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelWest:: @ 8508D70
-	obj_image_anim_frame 17, 4
-	obj_image_anim_frame 18, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyBackWheelEast:: @ 8508D7C
-	obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth:: @ 8508D88
-	obj_image_anim_frame 11, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth:: @ 8508D94
-	obj_image_anim_frame 15, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelWest:: @ 8508DA0
-	obj_image_anim_frame 19, 4
-	obj_image_anim_frame 20, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BunnyHoppyFrontWheelEast:: @ 8508DAC
-	obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 20, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelSouth:: @ 8508DB8
-	obj_image_anim_frame 9, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelNorth:: @ 8508DC4
-	obj_image_anim_frame 13, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelWest:: @ 8508DD0
-	obj_image_anim_frame 17, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieBackWheelEast:: @ 8508DDC
-	obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelSouth:: @ 8508DE8
-	obj_image_anim_frame 11, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelNorth:: @ 8508DF4
-	obj_image_anim_frame 15, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelWest:: @ 8508E00
-	obj_image_anim_frame 19, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_StandingWheelieFrontWheelEast:: @ 8508E0C
-	obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieSouth:: @ 8508E18
-	obj_image_anim_frame 21, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_frame 22, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieNorth:: @ 8508E2C
-	obj_image_anim_frame 23, 4
-	obj_image_anim_frame 14, 4
-	obj_image_anim_frame 24, 4
-	obj_image_anim_frame 14, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieWest:: @ 8508E40
-	obj_image_anim_frame 25, 4
-	obj_image_anim_frame 18, 4
-	obj_image_anim_frame 26, 4
-	obj_image_anim_frame 18, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_MovingWheelieEast:: @ 8508E54
-	obj_image_anim_frame 25, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 26, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage0:: @ 8508E68
-	obj_image_anim_frame 0, 32
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage1:: @ 8508E70
-	obj_image_anim_frame 1, 32
-	obj_image_anim_frame 2, 32
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage2:: @ 8508E7C
-	obj_image_anim_frame 3, 48
-	obj_image_anim_frame 4, 48
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage3:: @ 8508E88
-	obj_image_anim_frame 5, 32
-	obj_image_anim_frame 5, 32
-	obj_image_anim_frame 6, 32
-	obj_image_anim_frame 6, 32
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_BerryTreeStage4:: @ 8508E9C
-	obj_image_anim_frame 7, 48
-	obj_image_anim_frame 7, 48
-	obj_image_anim_frame 8, 48
-	obj_image_anim_frame 8, 48
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_NurseBow:: @ 8508EB0
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 9, 32
-	obj_image_anim_frame 0, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_RockBreak:: @ 8508EC0
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 1, 8
-	obj_image_anim_frame 2, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TreeCut:: @ 8508ED4
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 1, 6
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodSouth:: @ 8508EE8
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 9, 4
-	obj_image_anim_frame 10, 4
-	obj_image_anim_frame 11, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodNorth:: @ 8508EFC
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 5, 4
-	obj_image_anim_frame 6, 4
-	obj_image_anim_frame 7, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodWest:: @ 8508F10
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 3, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_TakeOutRodEast:: @ 8508F24
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodSouth:: @ 8508F38
-	obj_image_anim_frame 11, 4
-	obj_image_anim_frame 10, 6
-	obj_image_anim_frame 9, 6
-	obj_image_anim_frame 8, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodNorth:: @ 8508F4C
-	obj_image_anim_frame 7, 4
-	obj_image_anim_frame 6, 6
-	obj_image_anim_frame 5, 6
-	obj_image_anim_frame 4, 6
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodWest:: @ 8508F60
-	obj_image_anim_frame 3, 4
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_PutAwayRodEast:: @ 8508F74
-	obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonSouth:: @ 8508F88
-	obj_image_anim_frame 10, 6
-	obj_image_anim_frame 11, 6
-	obj_image_anim_loop 1
-	obj_image_anim_frame 11, 30
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonNorth:: @ 8508F9C
-	obj_image_anim_frame 6, 6
-	obj_image_anim_frame 7, 6
-	obj_image_anim_loop 1
-	obj_image_anim_frame 7, 30
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonWest:: @ 8508FB0
-	obj_image_anim_frame 2, 6
-	obj_image_anim_frame 3, 6
-	obj_image_anim_loop 1
-	obj_image_anim_frame 3, 30
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HookedPokemonEast:: @ 8508FC4
-	obj_image_anim_frame 2, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 3, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_loop 1
-	obj_image_anim_frame 3, 30, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectRotScalAnim_8508FD8:: @ 8508FD8
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_loop 7
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gFieldObjectRotScalAnim_8509008:: @ 8509008
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_loop 15
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_loop 15
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gFieldObjectRotScalAnim_8509040:: @ 8509040
-	obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectRotScalAnim_8509050:: @ 8509050
-	obj_rot_scal_anim_frame 0x100, 0x100, 10, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectRotScalAnim_8509060:: @ 8509060
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 1
-	obj_rot_scal_anim_loop 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectRotScalAnim_8509078:: @ 8509078
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 1
-	obj_rot_scal_anim_loop 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gFieldObjectImageAnim_HoOhFlapWings:: @ 8509090
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 3, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_HoOhStayStill:: @ 85090A4
-	obj_image_anim_frame 3, 16
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnimTable_Inanimate:: @ 85090AC
-	.4byte gFieldObjectImageAnim_StayStill
-
-	.align 2
-gFieldObjectImageAnimTable_QuintyPlump:: @ 85090B0
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpFaceEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFasterEast
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestSouth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestNorth
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestWest
-	.4byte gFieldObjectImageAnim_QuintyPlumpGoFastestEast
-
-	.align 2
-gFieldObjectImageAnimTable_Standard:: @ 8509100
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-
-	.align 2
-gFieldObjectImageAnimTable_HoOh:: @ 8509150
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_HoOhFlapWings
-	.4byte gFieldObjectImageAnim_HoOhStayStill
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-
-	.align 2
-gFieldObjectImageAnimTable_Groudon3:: @ 85091A0
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-
-	.align 2
-gFieldObjectImageAnim_85091F0:: @ 85091F0
-	obj_image_anim_frame 1, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_85091F8:: @ 85091F8
-	obj_image_anim_frame 4, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509200:: @ 8509200
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509208:: @ 8509208
-	obj_image_anim_frame 2, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509210:: @ 8509210
-	obj_image_anim_frame 3, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509218:: @ 8509218
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509220:: @ 8509220
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509228:: @ 8509228
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnim_8509230:: @ 8509230
-	obj_image_anim_frame 3, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gFieldObjectImageAnimTable_Rayquaza2:: @ 8509238
-	.4byte gFieldObjectImageAnim_8509218
-	.4byte gFieldObjectImageAnim_8509220
-	.4byte gFieldObjectImageAnim_8509228
-	.4byte gFieldObjectImageAnim_8509230
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_8509208
-	.4byte gFieldObjectImageAnim_8509210
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_85091F0
-	.4byte gFieldObjectImageAnim_8509210
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_8509208
-	.4byte gFieldObjectImageAnim_8509210
-	.4byte gFieldObjectImageAnim_8509200
-	.4byte gFieldObjectImageAnim_85091F8
-	.4byte gFieldObjectImageAnim_8509208
-	.4byte gFieldObjectImageAnim_8509210
-
-	.align 2
-gFieldObjectImageAnimTable_BrendanMayNormal:: @ 8509288
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_RunSouth
-	.4byte gFieldObjectImageAnim_RunNorth
-	.4byte gFieldObjectImageAnim_RunWest
-	.4byte gFieldObjectImageAnim_RunEast
-
-	.align 2
-gFieldObjectImageAnimTable_AcroBike:: @ 85092E8
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelSouth
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelNorth
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelWest
-	.4byte gFieldObjectImageAnim_BunnyHoppyBackWheelEast
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelWest
-	.4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelEast
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelSouth
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelNorth
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelWest
-	.4byte gFieldObjectImageAnim_StandingWheelieBackWheelEast
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelSouth
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelNorth
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelWest
-	.4byte gFieldObjectImageAnim_StandingWheelieFrontWheelEast
-	.4byte gFieldObjectImageAnim_MovingWheelieSouth
-	.4byte gFieldObjectImageAnim_MovingWheelieNorth
-	.4byte gFieldObjectImageAnim_MovingWheelieWest
-	.4byte gFieldObjectImageAnim_MovingWheelieEast
-
-	.align 2
-gFieldObjectImageAnimTable_Surfing:: @ 8509388
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobSouth
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobNorth
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobWest
-	.4byte gFieldObjectImageAnim_GetOnOffSurfBlobEast
-
-	.align 2
-gFieldObjectImageAnimTable_Nurse:: @ 85093E8
-	.4byte gFieldObjectImageAnim_FaceSouth
-	.4byte gFieldObjectImageAnim_FaceNorth
-	.4byte gFieldObjectImageAnim_FaceWest
-	.4byte gFieldObjectImageAnim_FaceEast
-	.4byte gFieldObjectImageAnim_GoSouth
-	.4byte gFieldObjectImageAnim_GoNorth
-	.4byte gFieldObjectImageAnim_GoWest
-	.4byte gFieldObjectImageAnim_GoEast
-	.4byte gFieldObjectImageAnim_GoFastSouth
-	.4byte gFieldObjectImageAnim_GoFastNorth
-	.4byte gFieldObjectImageAnim_GoFastWest
-	.4byte gFieldObjectImageAnim_GoFastEast
-	.4byte gFieldObjectImageAnim_GoFasterSouth
-	.4byte gFieldObjectImageAnim_GoFasterNorth
-	.4byte gFieldObjectImageAnim_GoFasterWest
-	.4byte gFieldObjectImageAnim_GoFasterEast
-	.4byte gFieldObjectImageAnim_GoFastestSouth
-	.4byte gFieldObjectImageAnim_GoFastestNorth
-	.4byte gFieldObjectImageAnim_GoFastestWest
-	.4byte gFieldObjectImageAnim_GoFastestEast
-	.4byte gFieldObjectImageAnim_NurseBow
-
-	.align 2
-gFieldObjectImageAnimTable_FieldMove:: @ 850943C
-	.4byte gFieldObjectImageAnim_FieldMove
-
-	.align 2
-gFieldObjectImageAnimTable_BerryTree:: @ 8509440
-	.4byte gFieldObjectImageAnim_BerryTreeStage0
-	.4byte gFieldObjectImageAnim_BerryTreeStage1
-	.4byte gFieldObjectImageAnim_BerryTreeStage2
-	.4byte gFieldObjectImageAnim_BerryTreeStage3
-	.4byte gFieldObjectImageAnim_BerryTreeStage4
-
-	.align 2
-gFieldObjectImageAnimTable_BreakableRock:: @ 8509454
-	.4byte gFieldObjectImageAnim_StayStill
-	.4byte gFieldObjectImageAnim_RockBreak
-
-	.align 2
-gFieldObjectImageAnimTable_CuttableTree:: @ 850945C
-	.4byte gFieldObjectImageAnim_StayStill
-	.4byte gFieldObjectImageAnim_TreeCut
-
-	.align 2
-gFieldObjectImageAnimTable_Fishing:: @ 8509464
-	.4byte gFieldObjectImageAnim_TakeOutRodSouth
-	.4byte gFieldObjectImageAnim_TakeOutRodNorth
-	.4byte gFieldObjectImageAnim_TakeOutRodWest
-	.4byte gFieldObjectImageAnim_TakeOutRodEast
-	.4byte gFieldObjectImageAnim_PutAwayRodSouth
-	.4byte gFieldObjectImageAnim_PutAwayRodNorth
-	.4byte gFieldObjectImageAnim_PutAwayRodWest
-	.4byte gFieldObjectImageAnim_PutAwayRodEast
-	.4byte gFieldObjectImageAnim_HookedPokemonSouth
-	.4byte gFieldObjectImageAnim_HookedPokemonNorth
-	.4byte gFieldObjectImageAnim_HookedPokemonWest
-	.4byte gFieldObjectImageAnim_HookedPokemonEast
-
-	.align 2
-gFieldObjectRotScalAnimTable_KyogreGroudon:: @ 8509494
-	.4byte gFieldObjectRotScalAnim_8508FD8
-	.4byte gFieldObjectRotScalAnim_8509008
-	.4byte gFieldObjectRotScalAnim_8509050
-	.4byte gFieldObjectRotScalAnim_8509040
-	.4byte gFieldObjectRotScalAnim_8509078
-	.4byte gFieldObjectRotScalAnim_8509060
diff --git a/data/graphics/field_objects/field_object_graphics.inc b/data/graphics/field_objects/field_object_graphics.inc
deleted file mode 100644
index 59333b9a4..000000000
--- a/data/graphics/field_objects/field_object_graphics.inc
+++ /dev/null
@@ -1,6530 +0,0 @@
-	.align 2
-gFieldObjectPic_BrendanNormal_0:: @ 84975F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/00.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_1:: @ 84976F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/01.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_2:: @ 84977F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/02.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_3:: @ 84978F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/03.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_4:: @ 84979F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/04.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_5:: @ 8497AF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/05.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_6:: @ 8497BF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/06.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_7:: @ 8497CF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/07.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_8:: @ 8497DF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/08.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_9:: @ 8497EF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/09.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_10:: @ 8497FF8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/10.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_11:: @ 84980F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/11.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_12:: @ 84981F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/12.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_13:: @ 84982F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/13.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_14:: @ 84983F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/14.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_15:: @ 84984F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/15.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_16:: @ 84985F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/16.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanNormal_17:: @ 84986F8
-	.incbin "graphics/map_objects/pics/people/brendan/normal/17.4bpp"
-
-	.align 2
-gFieldObjectPalette8:: @ 84987F8
-	.incbin "graphics/map_objects/palettes/field_object_palette_08.gbapal"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_0:: @ 8498818
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/00.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_1:: @ 8498918
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/01.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_2:: @ 8498A18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/02.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_3:: @ 8498B18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/03.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_4:: @ 8498C18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/04.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_5:: @ 8498D18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/05.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_6:: @ 8498E18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/06.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_7:: @ 8498F18
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/07.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_8:: @ 8499018
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/08.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_9:: @ 8499118
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/09.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_10:: @ 8499218
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/10.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_11:: @ 8499318
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/11.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_12:: @ 8499418
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/12.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_13:: @ 8499518
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/13.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_14:: @ 8499618
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/14.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_15:: @ 8499718
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/15.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_16:: @ 8499818
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/16.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireBrendan_17:: @ 8499918
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/17.4bpp"
-
-	.align 2
-gFieldObjectPalette33:: @ 8499A18
-	.incbin "graphics/map_objects/palettes/field_object_palette_33.gbapal"
-
-	.space 0x1E0
-
-	.align 2
-gFieldObjectPalette9:: @ 8499C18
-	.incbin "graphics/map_objects/palettes/field_object_palette_09.gbapal"
-
-	.align 2
-gFieldObjectPalette10:: @ 8499C38
-	.incbin "graphics/map_objects/palettes/field_object_palette_10.gbapal"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_0:: @ 8499C58
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_1:: @ 8499E58
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_2:: @ 849A058
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_3:: @ 849A258
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFieldMove_4:: @ 849A458
-	.incbin "graphics/map_objects/pics/people/brendan/field_move/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_0:: @ 849A658
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_3:: @ 849A858
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_1:: @ 849AA58
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_4:: @ 849AC58
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_2:: @ 849AE58
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanSurfing_5:: @ 849B058
-	.incbin "graphics/map_objects/pics/people/brendan/surfing/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_0:: @ 849B258
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_1:: @ 849B458
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_2:: @ 849B658
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_3:: @ 849B858
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_4:: @ 849BA58
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_5:: @ 849BC58
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_6:: @ 849BE58
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_7:: @ 849C058
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanMachBike_8:: @ 849C258
-	.incbin "graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_0:: @ 849C458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_1:: @ 849C658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_2:: @ 849C858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_3:: @ 849CA58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_4:: @ 849CC58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_5:: @ 849CE58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_6:: @ 849D058
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_7:: @ 849D258
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_8:: @ 849D458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_9:: @ 849D658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_10:: @ 849D858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_11:: @ 849DA58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_12:: @ 849DC58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_13:: @ 849DE58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_14:: @ 849E058
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_15:: @ 849E258
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_16:: @ 849E458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_17:: @ 849E658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_18:: @ 849E858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_19:: @ 849EA58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_20:: @ 849EC58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_21:: @ 849EE58
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_22:: @ 849F058
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_23:: @ 849F258
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_24:: @ 849F458
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_25:: @ 849F658
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanAcroBike_26:: @ 849F858
-	.incbin "graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_0:: @ 849FA58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/00.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_1:: @ 849FC58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/01.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_2:: @ 849FE58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/02.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_3:: @ 84A0058
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/03.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_4:: @ 84A0258
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/04.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_5:: @ 84A0458
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/05.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_6:: @ 84A0658
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/06.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_7:: @ 84A0858
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/07.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_8:: @ 84A0A58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/08.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_9:: @ 84A0C58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/09.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_10:: @ 84A0E58
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/10.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanFishing_11:: @ 84A1058
-	.incbin "graphics/map_objects/pics/people/brendan/fishing/11.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_0:: @ 84A1258
-	.incbin "graphics/map_objects/pics/people/brendan/watering/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_3:: @ 84A1458
-	.incbin "graphics/map_objects/pics/people/brendan/watering/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_1:: @ 84A1658
-	.incbin "graphics/map_objects/pics/people/brendan/watering/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_4:: @ 84A1858
-	.incbin "graphics/map_objects/pics/people/brendan/watering/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_2:: @ 84A1A58
-	.incbin "graphics/map_objects/pics/people/brendan/watering/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanWatering_5:: @ 84A1C58
-	.incbin "graphics/map_objects/pics/people/brendan/watering/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanDecorating:: @ 84A1E58
-	.incbin "graphics/map_objects/pics/people/brendan/decorating.4bpp"
-
-	.align 2
-gFieldObjectPic_MayDecorating:: @ 84A1F58
-	.incbin "graphics/map_objects/pics/people/may/decorating.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_0:: @ 84A2058
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_1:: @ 84A2258
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_2:: @ 84A2458
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BrendanUnderwater_3:: @ 84A2658
-	.incbin "graphics/map_objects/pics/people/brendan/underwater/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_0:: @ 84A2858
-	.incbin "graphics/map_objects/pics/people/may/underwater/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_1:: @ 84A2A58
-	.incbin "graphics/map_objects/pics/people/may/underwater/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_2:: @ 84A2C58
-	.incbin "graphics/map_objects/pics/people/may/underwater/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayUnderwater_3:: @ 84A2E58
-	.incbin "graphics/map_objects/pics/people/may/underwater/3.4bpp"
-
-	.align 2
-gFieldObjectPalette11:: @ 84A3058
-	.incbin "graphics/map_objects/palettes/field_object_palette_11.gbapal"
-
-	.align 2
-gFieldObjectPic_MayNormal_0:: @ 84A3078
-	.incbin "graphics/map_objects/pics/people/may/normal/00.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_1:: @ 84A3178
-	.incbin "graphics/map_objects/pics/people/may/normal/01.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_2:: @ 84A3278
-	.incbin "graphics/map_objects/pics/people/may/normal/02.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_3:: @ 84A3378
-	.incbin "graphics/map_objects/pics/people/may/normal/03.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_4:: @ 84A3478
-	.incbin "graphics/map_objects/pics/people/may/normal/04.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_5:: @ 84A3578
-	.incbin "graphics/map_objects/pics/people/may/normal/05.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_6:: @ 84A3678
-	.incbin "graphics/map_objects/pics/people/may/normal/06.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_7:: @ 84A3778
-	.incbin "graphics/map_objects/pics/people/may/normal/07.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_8:: @ 84A3878
-	.incbin "graphics/map_objects/pics/people/may/normal/08.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_9:: @ 84A3978
-	.incbin "graphics/map_objects/pics/people/may/normal/09.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_10:: @ 84A3A78
-	.incbin "graphics/map_objects/pics/people/may/normal/10.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_11:: @ 84A3B78
-	.incbin "graphics/map_objects/pics/people/may/normal/11.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_12:: @ 84A3C78
-	.incbin "graphics/map_objects/pics/people/may/normal/12.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_13:: @ 84A3D78
-	.incbin "graphics/map_objects/pics/people/may/normal/13.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_14:: @ 84A3E78
-	.incbin "graphics/map_objects/pics/people/may/normal/14.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_15:: @ 84A3F78
-	.incbin "graphics/map_objects/pics/people/may/normal/15.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_16:: @ 84A4078
-	.incbin "graphics/map_objects/pics/people/may/normal/16.4bpp"
-
-	.align 2
-gFieldObjectPic_MayNormal_17:: @ 84A4178
-	.incbin "graphics/map_objects/pics/people/may/normal/17.4bpp"
-
-	.align 2
-gFieldObjectPalette17:: @ 84A4278
-	.incbin "graphics/map_objects/palettes/field_object_palette_17.gbapal"
-
-	.align 2
-gFieldObjectPalette18:: @ 84A4298
-	.incbin "graphics/map_objects/palettes/field_object_palette_18.gbapal"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_0:: @ 84A42B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/00.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_1:: @ 84A43B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/01.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_2:: @ 84A44B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/02.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_3:: @ 84A45B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/03.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_4:: @ 84A46B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/04.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_5:: @ 84A47B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/05.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_6:: @ 84A48B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/06.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_7:: @ 84A49B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/07.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_8:: @ 84A4AB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/08.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_9:: @ 84A4BB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/09.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_10:: @ 84A4CB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/10.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_11:: @ 84A4DB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/11.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_12:: @ 84A4EB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/12.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_13:: @ 84A4FB8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/13.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_14:: @ 84A50B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/14.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_15:: @ 84A51B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/15.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_16:: @ 84A52B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/16.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireMay_17:: @ 84A53B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_may/17.4bpp"
-
-	.align 2
-gFieldObjectPalette34:: @ 84A54B8
-	.incbin "graphics/map_objects/palettes/field_object_palette_34.gbapal"
-
-	.align 2
-gUnusedFieldObjectPalette:: @ 84A54D8
-	.incbin "graphics/map_objects/palettes/unused_palette.gbapal"
-
-	.space 0x1C0
-
-	.align 2
-gFieldObjectPic_MayMachBike_0:: @ 84A56B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_1:: @ 84A58B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_2:: @ 84A5AB8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_3:: @ 84A5CB8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_4:: @ 84A5EB8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_5:: @ 84A60B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_6:: @ 84A62B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_7:: @ 84A64B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MayMachBike_8:: @ 84A66B8
-	.incbin "graphics/map_objects/pics/people/may/mach_bike/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_0:: @ 84A68B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/00.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_1:: @ 84A6AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/01.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_2:: @ 84A6CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/02.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_3:: @ 84A6EB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/03.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_4:: @ 84A70B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/04.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_5:: @ 84A72B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/05.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_6:: @ 84A74B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/06.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_7:: @ 84A76B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/07.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_8:: @ 84A78B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/08.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_9:: @ 84A7AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/09.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_10:: @ 84A7CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/10.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_11:: @ 84A7EB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/11.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_12:: @ 84A80B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/12.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_13:: @ 84A82B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/13.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_14:: @ 84A84B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/14.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_15:: @ 84A86B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/15.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_16:: @ 84A88B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/16.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_17:: @ 84A8AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/17.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_18:: @ 84A8CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/18.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_19:: @ 84A8EB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/19.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_20:: @ 84A90B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/20.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_21:: @ 84A92B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/21.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_22:: @ 84A94B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/22.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_23:: @ 84A96B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/23.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_24:: @ 84A98B8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/24.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_25:: @ 84A9AB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/25.4bpp"
-
-	.align 2
-gFieldObjectPic_MayAcroBike_26:: @ 84A9CB8
-	.incbin "graphics/map_objects/pics/people/may/acro_bike/26.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_0:: @ 84A9EB8
-	.incbin "graphics/map_objects/pics/people/may/surfing/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_3:: @ 84AA0B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_1:: @ 84AA2B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_4:: @ 84AA4B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_2:: @ 84AA6B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MaySurfing_5:: @ 84AA8B8
-	.incbin "graphics/map_objects/pics/people/may/surfing/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_0:: @ 84AAAB8
-	.incbin "graphics/map_objects/pics/people/may/field_move/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_1:: @ 84AACB8
-	.incbin "graphics/map_objects/pics/people/may/field_move/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_2:: @ 84AAEB8
-	.incbin "graphics/map_objects/pics/people/may/field_move/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_3:: @ 84AB0B8
-	.incbin "graphics/map_objects/pics/people/may/field_move/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFieldMove_4:: @ 84AB2B8
-	.incbin "graphics/map_objects/pics/people/may/field_move/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_0:: @ 84AB4B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/00.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_1:: @ 84AB6B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/01.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_2:: @ 84AB8B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/02.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_3:: @ 84ABAB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/03.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_4:: @ 84ABCB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/04.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_5:: @ 84ABEB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/05.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_6:: @ 84AC0B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/06.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_7:: @ 84AC2B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/07.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_8:: @ 84AC4B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/08.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_9:: @ 84AC6B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/09.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_10:: @ 84AC8B8
-	.incbin "graphics/map_objects/pics/people/may/fishing/10.4bpp"
-
-	.align 2
-gFieldObjectPic_MayFishing_11:: @ 84ACAB8
-	.incbin "graphics/map_objects/pics/people/may/fishing/11.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_0:: @ 84ACCB8
-	.incbin "graphics/map_objects/pics/people/may/watering/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_3:: @ 84ACEB8
-	.incbin "graphics/map_objects/pics/people/may/watering/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_1:: @ 84AD0B8
-	.incbin "graphics/map_objects/pics/people/may/watering/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_4:: @ 84AD2B8
-	.incbin "graphics/map_objects/pics/people/may/watering/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_2:: @ 84AD4B8
-	.incbin "graphics/map_objects/pics/people/may/watering/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MayWatering_5:: @ 84AD6B8
-	.incbin "graphics/map_objects/pics/people/may/watering/5.4bpp"
-
-	.align 2
-gFieldObjectPalette0:: @ 84AD8B8
-	.incbin "graphics/map_objects/palettes/field_object_palette_00.gbapal"
-
-	.align 2
-gFieldObjectPalette1:: @ 84AD8D8
-	.incbin "graphics/map_objects/palettes/field_object_palette_01.gbapal"
-
-	.align 2
-gFieldObjectPalette2:: @ 84AD8F8
-	.incbin "graphics/map_objects/palettes/field_object_palette_02.gbapal"
-
-	.align 2
-gFieldObjectPalette3:: @ 84AD918
-	.incbin "graphics/map_objects/palettes/field_object_palette_03.gbapal"
-
-	.align 2
-gFieldObjectPalette4:: @ 84AD938
-	.incbin "graphics/map_objects/palettes/field_object_palette_04.gbapal"
-
-	.align 2
-gFieldObjectPalette5:: @ 84AD958
-	.incbin "graphics/map_objects/palettes/field_object_palette_05.gbapal"
-
-	.align 2
-gFieldObjectPalette6:: @ 84AD978
-	.incbin "graphics/map_objects/palettes/field_object_palette_06.gbapal"
-
-	.align 2
-gFieldObjectPalette7:: @ 84AD998
-	.incbin "graphics/map_objects/palettes/field_object_palette_07.gbapal"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_0:: @ 84AD9B8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_1:: @ 84ADA38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_2:: @ 84ADAB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_3:: @ 84ADB38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_4:: @ 84ADBB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_5:: @ 84ADC38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_6:: @ 84ADCB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_7:: @ 84ADD38
-	.incbin "graphics/map_objects/pics/people/little_boy_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy1_8:: @ 84ADDB8
-	.incbin "graphics/map_objects/pics/people/little_boy_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_0:: @ 84ADE38
-	.incbin "graphics/map_objects/pics/people/little_girl_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_1:: @ 84ADF38
-	.incbin "graphics/map_objects/pics/people/little_girl_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_2:: @ 84AE038
-	.incbin "graphics/map_objects/pics/people/little_girl_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_3:: @ 84AE138
-	.incbin "graphics/map_objects/pics/people/little_girl_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_4:: @ 84AE238
-	.incbin "graphics/map_objects/pics/people/little_girl_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_5:: @ 84AE338
-	.incbin "graphics/map_objects/pics/people/little_girl_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_6:: @ 84AE438
-	.incbin "graphics/map_objects/pics/people/little_girl_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_7:: @ 84AE538
-	.incbin "graphics/map_objects/pics/people/little_girl_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl1_8:: @ 84AE638
-	.incbin "graphics/map_objects/pics/people/little_girl_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_0:: @ 84AE738
-	.incbin "graphics/map_objects/pics/people/boy_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_1:: @ 84AE838
-	.incbin "graphics/map_objects/pics/people/boy_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_2:: @ 84AE938
-	.incbin "graphics/map_objects/pics/people/boy_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_3:: @ 84AEA38
-	.incbin "graphics/map_objects/pics/people/boy_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_4:: @ 84AEB38
-	.incbin "graphics/map_objects/pics/people/boy_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_5:: @ 84AEC38
-	.incbin "graphics/map_objects/pics/people/boy_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_6:: @ 84AED38
-	.incbin "graphics/map_objects/pics/people/boy_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_7:: @ 84AEE38
-	.incbin "graphics/map_objects/pics/people/boy_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy1_8:: @ 84AEF38
-	.incbin "graphics/map_objects/pics/people/boy_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_0:: @ 84AF038
-	.incbin "graphics/map_objects/pics/people/girl_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_1:: @ 84AF138
-	.incbin "graphics/map_objects/pics/people/girl_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_2:: @ 84AF238
-	.incbin "graphics/map_objects/pics/people/girl_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_3:: @ 84AF338
-	.incbin "graphics/map_objects/pics/people/girl_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_4:: @ 84AF438
-	.incbin "graphics/map_objects/pics/people/girl_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_5:: @ 84AF538
-	.incbin "graphics/map_objects/pics/people/girl_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_6:: @ 84AF638
-	.incbin "graphics/map_objects/pics/people/girl_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_7:: @ 84AF738
-	.incbin "graphics/map_objects/pics/people/girl_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl1_8:: @ 84AF838
-	.incbin "graphics/map_objects/pics/people/girl_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_0:: @ 84AF938
-	.incbin "graphics/map_objects/pics/people/boy_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_1:: @ 84AFA38
-	.incbin "graphics/map_objects/pics/people/boy_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_2:: @ 84AFB38
-	.incbin "graphics/map_objects/pics/people/boy_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_3:: @ 84AFC38
-	.incbin "graphics/map_objects/pics/people/boy_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_4:: @ 84AFD38
-	.incbin "graphics/map_objects/pics/people/boy_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_5:: @ 84AFE38
-	.incbin "graphics/map_objects/pics/people/boy_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_6:: @ 84AFF38
-	.incbin "graphics/map_objects/pics/people/boy_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_7:: @ 84B0038
-	.incbin "graphics/map_objects/pics/people/boy_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy2_8:: @ 84B0138
-	.incbin "graphics/map_objects/pics/people/boy_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_0:: @ 84B0238
-	.incbin "graphics/map_objects/pics/people/girl_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_1:: @ 84B0338
-	.incbin "graphics/map_objects/pics/people/girl_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_2:: @ 84B0438
-	.incbin "graphics/map_objects/pics/people/girl_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_3:: @ 84B0538
-	.incbin "graphics/map_objects/pics/people/girl_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_4:: @ 84B0638
-	.incbin "graphics/map_objects/pics/people/girl_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_5:: @ 84B0738
-	.incbin "graphics/map_objects/pics/people/girl_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_6:: @ 84B0838
-	.incbin "graphics/map_objects/pics/people/girl_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_7:: @ 84B0938
-	.incbin "graphics/map_objects/pics/people/girl_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl2_8:: @ 84B0A38
-	.incbin "graphics/map_objects/pics/people/girl_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_0:: @ 84B0B38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_1:: @ 84B0BB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_2:: @ 84B0C38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_3:: @ 84B0CB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_4:: @ 84B0D38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_5:: @ 84B0DB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_6:: @ 84B0E38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_7:: @ 84B0EB8
-	.incbin "graphics/map_objects/pics/people/little_boy_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleBoy2_8:: @ 84B0F38
-	.incbin "graphics/map_objects/pics/people/little_boy_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_0:: @ 84B0FB8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_1:: @ 84B1038
-	.incbin "graphics/map_objects/pics/people/little_girl_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_2:: @ 84B10B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_3:: @ 84B1138
-	.incbin "graphics/map_objects/pics/people/little_girl_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_4:: @ 84B11B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_5:: @ 84B1238
-	.incbin "graphics/map_objects/pics/people/little_girl_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_6:: @ 84B12B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_7:: @ 84B1338
-	.incbin "graphics/map_objects/pics/people/little_girl_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_LittleGirl2_8:: @ 84B13B8
-	.incbin "graphics/map_objects/pics/people/little_girl_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_0:: @ 84B1438
-	.incbin "graphics/map_objects/pics/people/boy_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_1:: @ 84B1538
-	.incbin "graphics/map_objects/pics/people/boy_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_2:: @ 84B1638
-	.incbin "graphics/map_objects/pics/people/boy_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_3:: @ 84B1738
-	.incbin "graphics/map_objects/pics/people/boy_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_4:: @ 84B1838
-	.incbin "graphics/map_objects/pics/people/boy_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_5:: @ 84B1938
-	.incbin "graphics/map_objects/pics/people/boy_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_6:: @ 84B1A38
-	.incbin "graphics/map_objects/pics/people/boy_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_7:: @ 84B1B38
-	.incbin "graphics/map_objects/pics/people/boy_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy3_8:: @ 84B1C38
-	.incbin "graphics/map_objects/pics/people/boy_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_0:: @ 84B1D38
-	.incbin "graphics/map_objects/pics/people/girl_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_1:: @ 84B1E38
-	.incbin "graphics/map_objects/pics/people/girl_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_2:: @ 84B1F38
-	.incbin "graphics/map_objects/pics/people/girl_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_3:: @ 84B2038
-	.incbin "graphics/map_objects/pics/people/girl_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_4:: @ 84B2138
-	.incbin "graphics/map_objects/pics/people/girl_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_5:: @ 84B2238
-	.incbin "graphics/map_objects/pics/people/girl_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_6:: @ 84B2338
-	.incbin "graphics/map_objects/pics/people/girl_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_7:: @ 84B2438
-	.incbin "graphics/map_objects/pics/people/girl_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Girl3_8:: @ 84B2538
-	.incbin "graphics/map_objects/pics/people/girl_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_0:: @ 84B2638
-	.incbin "graphics/map_objects/pics/people/boy_4/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_1:: @ 84B2738
-	.incbin "graphics/map_objects/pics/people/boy_4/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_2:: @ 84B2838
-	.incbin "graphics/map_objects/pics/people/boy_4/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_3:: @ 84B2938
-	.incbin "graphics/map_objects/pics/people/boy_4/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_4:: @ 84B2A38
-	.incbin "graphics/map_objects/pics/people/boy_4/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_5:: @ 84B2B38
-	.incbin "graphics/map_objects/pics/people/boy_4/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_6:: @ 84B2C38
-	.incbin "graphics/map_objects/pics/people/boy_4/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_7:: @ 84B2D38
-	.incbin "graphics/map_objects/pics/people/boy_4/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy4_8:: @ 84B2E38
-	.incbin "graphics/map_objects/pics/people/boy_4/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_0:: @ 84B2F38
-	.incbin "graphics/map_objects/pics/people/woman_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_1:: @ 84B3038
-	.incbin "graphics/map_objects/pics/people/woman_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_2:: @ 84B3138
-	.incbin "graphics/map_objects/pics/people/woman_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_3:: @ 84B3238
-	.incbin "graphics/map_objects/pics/people/woman_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_4:: @ 84B3338
-	.incbin "graphics/map_objects/pics/people/woman_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_5:: @ 84B3438
-	.incbin "graphics/map_objects/pics/people/woman_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_6:: @ 84B3538
-	.incbin "graphics/map_objects/pics/people/woman_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_7:: @ 84B3638
-	.incbin "graphics/map_objects/pics/people/woman_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman1_8:: @ 84B3738
-	.incbin "graphics/map_objects/pics/people/woman_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_0:: @ 84B3838
-	.incbin "graphics/map_objects/pics/people/fat_man/0.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_1:: @ 84B3938
-	.incbin "graphics/map_objects/pics/people/fat_man/1.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_2:: @ 84B3A38
-	.incbin "graphics/map_objects/pics/people/fat_man/2.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_3:: @ 84B3B38
-	.incbin "graphics/map_objects/pics/people/fat_man/3.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_4:: @ 84B3C38
-	.incbin "graphics/map_objects/pics/people/fat_man/4.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_5:: @ 84B3D38
-	.incbin "graphics/map_objects/pics/people/fat_man/5.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_6:: @ 84B3E38
-	.incbin "graphics/map_objects/pics/people/fat_man/6.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_7:: @ 84B3F38
-	.incbin "graphics/map_objects/pics/people/fat_man/7.4bpp"
-
-	.align 2
-gFieldObjectPic_FatMan_8:: @ 84B4038
-	.incbin "graphics/map_objects/pics/people/fat_man/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_0:: @ 84B4138
-	.incbin "graphics/map_objects/pics/people/woman_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_1:: @ 84B4238
-	.incbin "graphics/map_objects/pics/people/woman_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_2:: @ 84B4338
-	.incbin "graphics/map_objects/pics/people/woman_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_3:: @ 84B4438
-	.incbin "graphics/map_objects/pics/people/woman_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_4:: @ 84B4538
-	.incbin "graphics/map_objects/pics/people/woman_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_5:: @ 84B4638
-	.incbin "graphics/map_objects/pics/people/woman_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_6:: @ 84B4738
-	.incbin "graphics/map_objects/pics/people/woman_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_7:: @ 84B4838
-	.incbin "graphics/map_objects/pics/people/woman_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman2_8:: @ 84B4938
-	.incbin "graphics/map_objects/pics/people/woman_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_0:: @ 84B4A38
-	.incbin "graphics/map_objects/pics/people/man_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_1:: @ 84B4B38
-	.incbin "graphics/map_objects/pics/people/man_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_2:: @ 84B4C38
-	.incbin "graphics/map_objects/pics/people/man_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_3:: @ 84B4D38
-	.incbin "graphics/map_objects/pics/people/man_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_4:: @ 84B4E38
-	.incbin "graphics/map_objects/pics/people/man_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_5:: @ 84B4F38
-	.incbin "graphics/map_objects/pics/people/man_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_6:: @ 84B5038
-	.incbin "graphics/map_objects/pics/people/man_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_7:: @ 84B5138
-	.incbin "graphics/map_objects/pics/people/man_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man1_8:: @ 84B5238
-	.incbin "graphics/map_objects/pics/people/man_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_0:: @ 84B5338
-	.incbin "graphics/map_objects/pics/people/woman_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_1:: @ 84B5438
-	.incbin "graphics/map_objects/pics/people/woman_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_2:: @ 84B5538
-	.incbin "graphics/map_objects/pics/people/woman_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_3:: @ 84B5638
-	.incbin "graphics/map_objects/pics/people/woman_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_4:: @ 84B5738
-	.incbin "graphics/map_objects/pics/people/woman_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_5:: @ 84B5838
-	.incbin "graphics/map_objects/pics/people/woman_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_6:: @ 84B5938
-	.incbin "graphics/map_objects/pics/people/woman_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_7:: @ 84B5A38
-	.incbin "graphics/map_objects/pics/people/woman_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman3_8:: @ 84B5B38
-	.incbin "graphics/map_objects/pics/people/woman_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_0:: @ 84B5C38
-	.incbin "graphics/map_objects/pics/people/old_man_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_1:: @ 84B5D38
-	.incbin "graphics/map_objects/pics/people/old_man_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_2:: @ 84B5E38
-	.incbin "graphics/map_objects/pics/people/old_man_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_3:: @ 84B5F38
-	.incbin "graphics/map_objects/pics/people/old_man_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_4:: @ 84B6038
-	.incbin "graphics/map_objects/pics/people/old_man_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_5:: @ 84B6138
-	.incbin "graphics/map_objects/pics/people/old_man_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_6:: @ 84B6238
-	.incbin "graphics/map_objects/pics/people/old_man_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_7:: @ 84B6338
-	.incbin "graphics/map_objects/pics/people/old_man_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan1_8:: @ 84B6438
-	.incbin "graphics/map_objects/pics/people/old_man_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_0:: @ 84B6538
-	.incbin "graphics/map_objects/pics/people/old_woman_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_1:: @ 84B6638
-	.incbin "graphics/map_objects/pics/people/old_woman_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_2:: @ 84B6738
-	.incbin "graphics/map_objects/pics/people/old_woman_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_3:: @ 84B6838
-	.incbin "graphics/map_objects/pics/people/old_woman_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_4:: @ 84B6938
-	.incbin "graphics/map_objects/pics/people/old_woman_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_5:: @ 84B6A38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_6:: @ 84B6B38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_7:: @ 84B6C38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman1_8:: @ 84B6D38
-	.incbin "graphics/map_objects/pics/people/old_woman_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_0:: @ 84B6E38
-	.incbin "graphics/map_objects/pics/people/man_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_1:: @ 84B6F38
-	.incbin "graphics/map_objects/pics/people/man_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_2:: @ 84B7038
-	.incbin "graphics/map_objects/pics/people/man_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_3:: @ 84B7138
-	.incbin "graphics/map_objects/pics/people/man_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_4:: @ 84B7238
-	.incbin "graphics/map_objects/pics/people/man_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_5:: @ 84B7338
-	.incbin "graphics/map_objects/pics/people/man_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_6:: @ 84B7438
-	.incbin "graphics/map_objects/pics/people/man_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_7:: @ 84B7538
-	.incbin "graphics/map_objects/pics/people/man_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man2_8:: @ 84B7638
-	.incbin "graphics/map_objects/pics/people/man_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_0:: @ 84B7738
-	.incbin "graphics/map_objects/pics/people/woman_4/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_1:: @ 84B7838
-	.incbin "graphics/map_objects/pics/people/woman_4/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_2:: @ 84B7938
-	.incbin "graphics/map_objects/pics/people/woman_4/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_3:: @ 84B7A38
-	.incbin "graphics/map_objects/pics/people/woman_4/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_4:: @ 84B7B38
-	.incbin "graphics/map_objects/pics/people/woman_4/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_5:: @ 84B7C38
-	.incbin "graphics/map_objects/pics/people/woman_4/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_6:: @ 84B7D38
-	.incbin "graphics/map_objects/pics/people/woman_4/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_7:: @ 84B7E38
-	.incbin "graphics/map_objects/pics/people/woman_4/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman4_8:: @ 84B7F38
-	.incbin "graphics/map_objects/pics/people/woman_4/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_0:: @ 84B8038
-	.incbin "graphics/map_objects/pics/people/man_3/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_1:: @ 84B8138
-	.incbin "graphics/map_objects/pics/people/man_3/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_2:: @ 84B8238
-	.incbin "graphics/map_objects/pics/people/man_3/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_3:: @ 84B8338
-	.incbin "graphics/map_objects/pics/people/man_3/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_4:: @ 84B8438
-	.incbin "graphics/map_objects/pics/people/man_3/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_5:: @ 84B8538
-	.incbin "graphics/map_objects/pics/people/man_3/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_6:: @ 84B8638
-	.incbin "graphics/map_objects/pics/people/man_3/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_7:: @ 84B8738
-	.incbin "graphics/map_objects/pics/people/man_3/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man3_8:: @ 84B8838
-	.incbin "graphics/map_objects/pics/people/man_3/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_0:: @ 84B8938
-	.incbin "graphics/map_objects/pics/people/woman_5/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_1:: @ 84B8A38
-	.incbin "graphics/map_objects/pics/people/woman_5/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_2:: @ 84B8B38
-	.incbin "graphics/map_objects/pics/people/woman_5/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_3:: @ 84B8C38
-	.incbin "graphics/map_objects/pics/people/woman_5/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_4:: @ 84B8D38
-	.incbin "graphics/map_objects/pics/people/woman_5/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_5:: @ 84B8E38
-	.incbin "graphics/map_objects/pics/people/woman_5/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_6:: @ 84B8F38
-	.incbin "graphics/map_objects/pics/people/woman_5/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_7:: @ 84B9038
-	.incbin "graphics/map_objects/pics/people/woman_5/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman5_8:: @ 84B9138
-	.incbin "graphics/map_objects/pics/people/woman_5/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Cook_0:: @ 84B9238
-	.incbin "graphics/map_objects/pics/people/cook/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Cook_1:: @ 84B9338
-	.incbin "graphics/map_objects/pics/people/cook/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Cook_2:: @ 84B9438
-	.incbin "graphics/map_objects/pics/people/cook/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_0:: @ 84B9538
-	.incbin "graphics/map_objects/pics/people/woman_6/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_1:: @ 84B9638
-	.incbin "graphics/map_objects/pics/people/woman_6/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_2:: @ 84B9738
-	.incbin "graphics/map_objects/pics/people/woman_6/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_3:: @ 84B9838
-	.incbin "graphics/map_objects/pics/people/woman_6/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_4:: @ 84B9938
-	.incbin "graphics/map_objects/pics/people/woman_6/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_5:: @ 84B9A38
-	.incbin "graphics/map_objects/pics/people/woman_6/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_6:: @ 84B9B38
-	.incbin "graphics/map_objects/pics/people/woman_6/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_7:: @ 84B9C38
-	.incbin "graphics/map_objects/pics/people/woman_6/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman6_8:: @ 84B9D38
-	.incbin "graphics/map_objects/pics/people/woman_6/8.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan2_0:: @ 84B9E38
-	.incbin "graphics/map_objects/pics/people/old_man_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan2_1:: @ 84B9F38
-	.incbin "graphics/map_objects/pics/people/old_man_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldMan2_2:: @ 84BA038
-	.incbin "graphics/map_objects/pics/people/old_man_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_0:: @ 84BA138
-	.incbin "graphics/map_objects/pics/people/old_woman_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_1:: @ 84BA238
-	.incbin "graphics/map_objects/pics/people/old_woman_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_2:: @ 84BA338
-	.incbin "graphics/map_objects/pics/people/old_woman_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_3:: @ 84BA438
-	.incbin "graphics/map_objects/pics/people/old_woman_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_4:: @ 84BA538
-	.incbin "graphics/map_objects/pics/people/old_woman_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_5:: @ 84BA638
-	.incbin "graphics/map_objects/pics/people/old_woman_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_6:: @ 84BA738
-	.incbin "graphics/map_objects/pics/people/old_woman_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_7:: @ 84BA838
-	.incbin "graphics/map_objects/pics/people/old_woman_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_OldWoman2_8:: @ 84BA938
-	.incbin "graphics/map_objects/pics/people/old_woman_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_0:: @ 84BAA38
-	.incbin "graphics/map_objects/pics/people/camper/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_1:: @ 84BAB38
-	.incbin "graphics/map_objects/pics/people/camper/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_2:: @ 84BAC38
-	.incbin "graphics/map_objects/pics/people/camper/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_3:: @ 84BAD38
-	.incbin "graphics/map_objects/pics/people/camper/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_4:: @ 84BAE38
-	.incbin "graphics/map_objects/pics/people/camper/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_5:: @ 84BAF38
-	.incbin "graphics/map_objects/pics/people/camper/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_6:: @ 84BB038
-	.incbin "graphics/map_objects/pics/people/camper/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_7:: @ 84BB138
-	.incbin "graphics/map_objects/pics/people/camper/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Camper_8:: @ 84BB238
-	.incbin "graphics/map_objects/pics/people/camper/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_0:: @ 84BB338
-	.incbin "graphics/map_objects/pics/people/picnicker/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_1:: @ 84BB438
-	.incbin "graphics/map_objects/pics/people/picnicker/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_2:: @ 84BB538
-	.incbin "graphics/map_objects/pics/people/picnicker/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_3:: @ 84BB638
-	.incbin "graphics/map_objects/pics/people/picnicker/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_4:: @ 84BB738
-	.incbin "graphics/map_objects/pics/people/picnicker/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_5:: @ 84BB838
-	.incbin "graphics/map_objects/pics/people/picnicker/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_6:: @ 84BB938
-	.incbin "graphics/map_objects/pics/people/picnicker/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_7:: @ 84BBA38
-	.incbin "graphics/map_objects/pics/people/picnicker/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Picnicker_8:: @ 84BBB38
-	.incbin "graphics/map_objects/pics/people/picnicker/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_0:: @ 84BBC38
-	.incbin "graphics/map_objects/pics/people/man_4/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_1:: @ 84BBD38
-	.incbin "graphics/map_objects/pics/people/man_4/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_2:: @ 84BBE38
-	.incbin "graphics/map_objects/pics/people/man_4/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_3:: @ 84BBF38
-	.incbin "graphics/map_objects/pics/people/man_4/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_4:: @ 84BC038
-	.incbin "graphics/map_objects/pics/people/man_4/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_5:: @ 84BC138
-	.incbin "graphics/map_objects/pics/people/man_4/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_6:: @ 84BC238
-	.incbin "graphics/map_objects/pics/people/man_4/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_7:: @ 84BC338
-	.incbin "graphics/map_objects/pics/people/man_4/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man4_8:: @ 84BC438
-	.incbin "graphics/map_objects/pics/people/man_4/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_0:: @ 84BC538
-	.incbin "graphics/map_objects/pics/people/woman_7/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_1:: @ 84BC638
-	.incbin "graphics/map_objects/pics/people/woman_7/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_2:: @ 84BC738
-	.incbin "graphics/map_objects/pics/people/woman_7/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_3:: @ 84BC838
-	.incbin "graphics/map_objects/pics/people/woman_7/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_4:: @ 84BC938
-	.incbin "graphics/map_objects/pics/people/woman_7/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_5:: @ 84BCA38
-	.incbin "graphics/map_objects/pics/people/woman_7/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_6:: @ 84BCB38
-	.incbin "graphics/map_objects/pics/people/woman_7/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_7:: @ 84BCC38
-	.incbin "graphics/map_objects/pics/people/woman_7/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Woman7_8:: @ 84BCD38
-	.incbin "graphics/map_objects/pics/people/woman_7/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_0:: @ 84BCE38
-	.incbin "graphics/map_objects/pics/people/youngster/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_1:: @ 84BCF38
-	.incbin "graphics/map_objects/pics/people/youngster/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_2:: @ 84BD038
-	.incbin "graphics/map_objects/pics/people/youngster/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_3:: @ 84BD138
-	.incbin "graphics/map_objects/pics/people/youngster/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_4:: @ 84BD238
-	.incbin "graphics/map_objects/pics/people/youngster/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_5:: @ 84BD338
-	.incbin "graphics/map_objects/pics/people/youngster/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_6:: @ 84BD438
-	.incbin "graphics/map_objects/pics/people/youngster/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_7:: @ 84BD538
-	.incbin "graphics/map_objects/pics/people/youngster/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Youngster_8:: @ 84BD638
-	.incbin "graphics/map_objects/pics/people/youngster/8.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_0:: @ 84BD738
-	.incbin "graphics/map_objects/pics/people/bug_catcher/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_1:: @ 84BD838
-	.incbin "graphics/map_objects/pics/people/bug_catcher/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_2:: @ 84BD938
-	.incbin "graphics/map_objects/pics/people/bug_catcher/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_3:: @ 84BDA38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_4:: @ 84BDB38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_5:: @ 84BDC38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_6:: @ 84BDD38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/6.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_7:: @ 84BDE38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/7.4bpp"
-
-	.align 2
-gFieldObjectPic_BugCatcher_8:: @ 84BDF38
-	.incbin "graphics/map_objects/pics/people/bug_catcher/8.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_0:: @ 84BE038
-	.incbin "graphics/map_objects/pics/people/psychic_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_1:: @ 84BE138
-	.incbin "graphics/map_objects/pics/people/psychic_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_2:: @ 84BE238
-	.incbin "graphics/map_objects/pics/people/psychic_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_3:: @ 84BE338
-	.incbin "graphics/map_objects/pics/people/psychic_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_4:: @ 84BE438
-	.incbin "graphics/map_objects/pics/people/psychic_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_5:: @ 84BE538
-	.incbin "graphics/map_objects/pics/people/psychic_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_6:: @ 84BE638
-	.incbin "graphics/map_objects/pics/people/psychic_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_7:: @ 84BE738
-	.incbin "graphics/map_objects/pics/people/psychic_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_PsychicM_8:: @ 84BE838
-	.incbin "graphics/map_objects/pics/people/psychic_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_0:: @ 84BE938
-	.incbin "graphics/map_objects/pics/people/school_kid_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_1:: @ 84BEA38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_2:: @ 84BEB38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_3:: @ 84BEC38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_4:: @ 84BED38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_5:: @ 84BEE38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_6:: @ 84BEF38
-	.incbin "graphics/map_objects/pics/people/school_kid_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_7:: @ 84BF038
-	.incbin "graphics/map_objects/pics/people/school_kid_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_SchoolKidM_8:: @ 84BF138
-	.incbin "graphics/map_objects/pics/people/school_kid_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_0:: @ 84BF238
-	.incbin "graphics/map_objects/pics/people/maniac/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_1:: @ 84BF338
-	.incbin "graphics/map_objects/pics/people/maniac/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_2:: @ 84BF438
-	.incbin "graphics/map_objects/pics/people/maniac/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_3:: @ 84BF538
-	.incbin "graphics/map_objects/pics/people/maniac/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_4:: @ 84BF638
-	.incbin "graphics/map_objects/pics/people/maniac/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_5:: @ 84BF738
-	.incbin "graphics/map_objects/pics/people/maniac/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_6:: @ 84BF838
-	.incbin "graphics/map_objects/pics/people/maniac/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_7:: @ 84BF938
-	.incbin "graphics/map_objects/pics/people/maniac/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Maniac_8:: @ 84BFA38
-	.incbin "graphics/map_objects/pics/people/maniac/8.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_0:: @ 84BFB38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_1:: @ 84BFC38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/1.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_2:: @ 84BFD38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/2.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_3:: @ 84BFE38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/3.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_4:: @ 84BFF38
-	.incbin "graphics/map_objects/pics/people/hex_maniac/4.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_5:: @ 84C0038
-	.incbin "graphics/map_objects/pics/people/hex_maniac/5.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_6:: @ 84C0138
-	.incbin "graphics/map_objects/pics/people/hex_maniac/6.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_7:: @ 84C0238
-	.incbin "graphics/map_objects/pics/people/hex_maniac/7.4bpp"
-
-	.align 2
-gFieldObjectPic_HexManiac_8:: @ 84C0338
-	.incbin "graphics/map_objects/pics/people/hex_maniac/8.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_0:: @ 84C0438
-	.incbin "graphics/map_objects/pics/people/unused_woman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_1:: @ 84C0538
-	.incbin "graphics/map_objects/pics/people/unused_woman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_2:: @ 84C0638
-	.incbin "graphics/map_objects/pics/people/unused_woman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_3:: @ 84C0738
-	.incbin "graphics/map_objects/pics/people/unused_woman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_4:: @ 84C0838
-	.incbin "graphics/map_objects/pics/people/unused_woman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_5:: @ 84C0938
-	.incbin "graphics/map_objects/pics/people/unused_woman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_6:: @ 84C0A38
-	.incbin "graphics/map_objects/pics/people/unused_woman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_7:: @ 84C0B38
-	.incbin "graphics/map_objects/pics/people/unused_woman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWoman_8:: @ 84C0C38
-	.incbin "graphics/map_objects/pics/people/unused_woman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_0:: @ 84C0D38
-	.incbin "graphics/map_objects/pics/people/swimmer_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_1:: @ 84C0E38
-	.incbin "graphics/map_objects/pics/people/swimmer_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_2:: @ 84C0F38
-	.incbin "graphics/map_objects/pics/people/swimmer_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_3:: @ 84C1038
-	.incbin "graphics/map_objects/pics/people/swimmer_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_4:: @ 84C1138
-	.incbin "graphics/map_objects/pics/people/swimmer_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_5:: @ 84C1238
-	.incbin "graphics/map_objects/pics/people/swimmer_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_6:: @ 84C1338
-	.incbin "graphics/map_objects/pics/people/swimmer_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_7:: @ 84C1438
-	.incbin "graphics/map_objects/pics/people/swimmer_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerM_8:: @ 84C1538
-	.incbin "graphics/map_objects/pics/people/swimmer_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_0:: @ 84C1638
-	.incbin "graphics/map_objects/pics/people/swimmer_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_1:: @ 84C1738
-	.incbin "graphics/map_objects/pics/people/swimmer_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_2:: @ 84C1838
-	.incbin "graphics/map_objects/pics/people/swimmer_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_3:: @ 84C1938
-	.incbin "graphics/map_objects/pics/people/swimmer_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_4:: @ 84C1A38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_5:: @ 84C1B38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_6:: @ 84C1C38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_7:: @ 84C1D38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_SwimmerF_8:: @ 84C1E38
-	.incbin "graphics/map_objects/pics/people/swimmer_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_0:: @ 84C1F38
-	.incbin "graphics/map_objects/pics/people/black_belt/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_1:: @ 84C2038
-	.incbin "graphics/map_objects/pics/people/black_belt/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_2:: @ 84C2138
-	.incbin "graphics/map_objects/pics/people/black_belt/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_3:: @ 84C2238
-	.incbin "graphics/map_objects/pics/people/black_belt/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_4:: @ 84C2338
-	.incbin "graphics/map_objects/pics/people/black_belt/4.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_5:: @ 84C2438
-	.incbin "graphics/map_objects/pics/people/black_belt/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_6:: @ 84C2538
-	.incbin "graphics/map_objects/pics/people/black_belt/6.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_7:: @ 84C2638
-	.incbin "graphics/map_objects/pics/people/black_belt/7.4bpp"
-
-	.align 2
-gFieldObjectPic_BlackBelt_8:: @ 84C2738
-	.incbin "graphics/map_objects/pics/people/black_belt/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_0:: @ 84C2838
-	.incbin "graphics/map_objects/pics/people/beauty/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_1:: @ 84C2938
-	.incbin "graphics/map_objects/pics/people/beauty/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_2:: @ 84C2A38
-	.incbin "graphics/map_objects/pics/people/beauty/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_3:: @ 84C2B38
-	.incbin "graphics/map_objects/pics/people/beauty/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_4:: @ 84C2C38
-	.incbin "graphics/map_objects/pics/people/beauty/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_5:: @ 84C2D38
-	.incbin "graphics/map_objects/pics/people/beauty/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_6:: @ 84C2E38
-	.incbin "graphics/map_objects/pics/people/beauty/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_7:: @ 84C2F38
-	.incbin "graphics/map_objects/pics/people/beauty/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Beauty_8:: @ 84C3038
-	.incbin "graphics/map_objects/pics/people/beauty/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_0:: @ 84C3138
-	.incbin "graphics/map_objects/pics/people/scientist_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_1:: @ 84C3238
-	.incbin "graphics/map_objects/pics/people/scientist_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_2:: @ 84C3338
-	.incbin "graphics/map_objects/pics/people/scientist_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_3:: @ 84C3438
-	.incbin "graphics/map_objects/pics/people/scientist_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_4:: @ 84C3538
-	.incbin "graphics/map_objects/pics/people/scientist_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_5:: @ 84C3638
-	.incbin "graphics/map_objects/pics/people/scientist_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_6:: @ 84C3738
-	.incbin "graphics/map_objects/pics/people/scientist_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_7:: @ 84C3838
-	.incbin "graphics/map_objects/pics/people/scientist_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist1_8:: @ 84C3938
-	.incbin "graphics/map_objects/pics/people/scientist_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_0:: @ 84C3A38
-	.incbin "graphics/map_objects/pics/people/lass/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_1:: @ 84C3B38
-	.incbin "graphics/map_objects/pics/people/lass/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_2:: @ 84C3C38
-	.incbin "graphics/map_objects/pics/people/lass/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_3:: @ 84C3D38
-	.incbin "graphics/map_objects/pics/people/lass/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_4:: @ 84C3E38
-	.incbin "graphics/map_objects/pics/people/lass/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_5:: @ 84C3F38
-	.incbin "graphics/map_objects/pics/people/lass/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_6:: @ 84C4038
-	.incbin "graphics/map_objects/pics/people/lass/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_7:: @ 84C4138
-	.incbin "graphics/map_objects/pics/people/lass/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Lass_8:: @ 84C4238
-	.incbin "graphics/map_objects/pics/people/lass/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_0:: @ 84C4338
-	.incbin "graphics/map_objects/pics/people/gentleman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_1:: @ 84C4438
-	.incbin "graphics/map_objects/pics/people/gentleman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_2:: @ 84C4538
-	.incbin "graphics/map_objects/pics/people/gentleman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_3:: @ 84C4638
-	.incbin "graphics/map_objects/pics/people/gentleman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_4:: @ 84C4738
-	.incbin "graphics/map_objects/pics/people/gentleman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_5:: @ 84C4838
-	.incbin "graphics/map_objects/pics/people/gentleman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_6:: @ 84C4938
-	.incbin "graphics/map_objects/pics/people/gentleman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_7:: @ 84C4A38
-	.incbin "graphics/map_objects/pics/people/gentleman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Gentleman_8:: @ 84C4B38
-	.incbin "graphics/map_objects/pics/people/gentleman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_0:: @ 84C4C38
-	.incbin "graphics/map_objects/pics/people/sailor/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_1:: @ 84C4D38
-	.incbin "graphics/map_objects/pics/people/sailor/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_2:: @ 84C4E38
-	.incbin "graphics/map_objects/pics/people/sailor/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_3:: @ 84C4F38
-	.incbin "graphics/map_objects/pics/people/sailor/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_4:: @ 84C5038
-	.incbin "graphics/map_objects/pics/people/sailor/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_5:: @ 84C5138
-	.incbin "graphics/map_objects/pics/people/sailor/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_6:: @ 84C5238
-	.incbin "graphics/map_objects/pics/people/sailor/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_7:: @ 84C5338
-	.incbin "graphics/map_objects/pics/people/sailor/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Sailor_8:: @ 84C5438
-	.incbin "graphics/map_objects/pics/people/sailor/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_0:: @ 84C5538
-	.incbin "graphics/map_objects/pics/people/fisherman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_1:: @ 84C5638
-	.incbin "graphics/map_objects/pics/people/fisherman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_2:: @ 84C5738
-	.incbin "graphics/map_objects/pics/people/fisherman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_3:: @ 84C5838
-	.incbin "graphics/map_objects/pics/people/fisherman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_4:: @ 84C5938
-	.incbin "graphics/map_objects/pics/people/fisherman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_5:: @ 84C5A38
-	.incbin "graphics/map_objects/pics/people/fisherman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_6:: @ 84C5B38
-	.incbin "graphics/map_objects/pics/people/fisherman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_7:: @ 84C5C38
-	.incbin "graphics/map_objects/pics/people/fisherman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Fisherman_8:: @ 84C5D38
-	.incbin "graphics/map_objects/pics/people/fisherman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_0:: @ 84C5E38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_1:: @ 84C5F38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_2:: @ 84C6038
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_3:: @ 84C6138
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_4:: @ 84C6238
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_5:: @ 84C6338
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_6:: @ 84C6438
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_7:: @ 84C6538
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteM_8:: @ 84C6638
-	.incbin "graphics/map_objects/pics/people/running_triathlete_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_0:: @ 84C6738
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_1:: @ 84C6838
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_2:: @ 84C6938
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_3:: @ 84C6A38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_4:: @ 84C6B38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_5:: @ 84C6C38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_6:: @ 84C6D38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_7:: @ 84C6E38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RunningTriathleteF_8:: @ 84C6F38
-	.incbin "graphics/map_objects/pics/people/running_triathlete_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_0:: @ 84C7038
-	.incbin "graphics/map_objects/pics/people/tuber_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_1:: @ 84C70B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_2:: @ 84C7138
-	.incbin "graphics/map_objects/pics/people/tuber_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_3:: @ 84C71B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_4:: @ 84C7238
-	.incbin "graphics/map_objects/pics/people/tuber_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_5:: @ 84C72B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_6:: @ 84C7338
-	.incbin "graphics/map_objects/pics/people/tuber_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_7:: @ 84C73B8
-	.incbin "graphics/map_objects/pics/people/tuber_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberF_8:: @ 84C7438
-	.incbin "graphics/map_objects/pics/people/tuber_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_0:: @ 84C74B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_1:: @ 84C7538
-	.incbin "graphics/map_objects/pics/people/tuber_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_2:: @ 84C75B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_3:: @ 84C7638
-	.incbin "graphics/map_objects/pics/people/tuber_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_4:: @ 84C76B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_5:: @ 84C7738
-	.incbin "graphics/map_objects/pics/people/tuber_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_6:: @ 84C77B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_7:: @ 84C7838
-	.incbin "graphics/map_objects/pics/people/tuber_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberM_8:: @ 84C78B8
-	.incbin "graphics/map_objects/pics/people/tuber_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_0:: @ 84C7938
-	.incbin "graphics/map_objects/pics/people/hiker/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_1:: @ 84C7A38
-	.incbin "graphics/map_objects/pics/people/hiker/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_2:: @ 84C7B38
-	.incbin "graphics/map_objects/pics/people/hiker/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_3:: @ 84C7C38
-	.incbin "graphics/map_objects/pics/people/hiker/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_4:: @ 84C7D38
-	.incbin "graphics/map_objects/pics/people/hiker/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_5:: @ 84C7E38
-	.incbin "graphics/map_objects/pics/people/hiker/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_6:: @ 84C7F38
-	.incbin "graphics/map_objects/pics/people/hiker/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_7:: @ 84C8038
-	.incbin "graphics/map_objects/pics/people/hiker/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Hiker_8:: @ 84C8138
-	.incbin "graphics/map_objects/pics/people/hiker/8.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_0:: @ 84C8238
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_1:: @ 84C8438
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_2:: @ 84C8638
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_3:: @ 84C8838
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_4:: @ 84C8A38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_5:: @ 84C8C38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_6:: @ 84C8E38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_7:: @ 84C9038
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteM_8:: @ 84C9238
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_0:: @ 84C9438
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_1:: @ 84C9638
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_2:: @ 84C9838
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_3:: @ 84C9A38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_4:: @ 84C9C38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_5:: @ 84C9E38
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_6:: @ 84CA038
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_7:: @ 84CA238
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_CyclingTriathleteF_8:: @ 84CA438
-	.incbin "graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_0:: @ 84CA638
-	.incbin "graphics/map_objects/pics/people/man_5/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_1:: @ 84CA738
-	.incbin "graphics/map_objects/pics/people/man_5/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_2:: @ 84CA838
-	.incbin "graphics/map_objects/pics/people/man_5/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_3:: @ 84CA938
-	.incbin "graphics/map_objects/pics/people/man_5/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_4:: @ 84CAA38
-	.incbin "graphics/map_objects/pics/people/man_5/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_5:: @ 84CAB38
-	.incbin "graphics/map_objects/pics/people/man_5/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_6:: @ 84CAC38
-	.incbin "graphics/map_objects/pics/people/man_5/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_7:: @ 84CAD38
-	.incbin "graphics/map_objects/pics/people/man_5/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man5_8:: @ 84CAE38
-	.incbin "graphics/map_objects/pics/people/man_5/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_0:: @ 84CAF38
-	.incbin "graphics/map_objects/pics/people/man_6/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_1:: @ 84CB038
-	.incbin "graphics/map_objects/pics/people/man_6/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_2:: @ 84CB138
-	.incbin "graphics/map_objects/pics/people/man_6/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_3:: @ 84CB238
-	.incbin "graphics/map_objects/pics/people/man_6/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_4:: @ 84CB338
-	.incbin "graphics/map_objects/pics/people/man_6/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_5:: @ 84CB438
-	.incbin "graphics/map_objects/pics/people/man_6/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_6:: @ 84CB538
-	.incbin "graphics/map_objects/pics/people/man_6/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_7:: @ 84CB638
-	.incbin "graphics/map_objects/pics/people/man_6/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man6_8:: @ 84CB738
-	.incbin "graphics/map_objects/pics/people/man_6/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_0:: @ 84CB838
-	.incbin "graphics/map_objects/pics/people/nurse/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_1:: @ 84CB938
-	.incbin "graphics/map_objects/pics/people/nurse/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_2:: @ 84CBA38
-	.incbin "graphics/map_objects/pics/people/nurse/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Nurse_3:: @ 84CBB38
-	.incbin "graphics/map_objects/pics/people/nurse/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ItemBall:: @ 84CBC38
-	.incbin "graphics/map_objects/pics/misc/item_ball.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_0:: @ 84CBCB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_1:: @ 84CBDB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_2:: @ 84CBEB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_3:: @ 84CBFB8
-	.incbin "graphics/map_objects/pics/people/prof_birch/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_4:: @ 84CC0B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_5:: @ 84CC1B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_6:: @ 84CC2B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_7:: @ 84CC3B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ProfBirch_8:: @ 84CC4B8
-	.incbin "graphics/map_objects/pics/people/prof_birch/8.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_0:: @ 84CC5B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_1:: @ 84CC6B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_2:: @ 84CC7B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_3:: @ 84CC8B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_4:: @ 84CC9B8
-	.incbin "graphics/map_objects/pics/people/reporter_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_5:: @ 84CCAB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_6:: @ 84CCBB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_7:: @ 84CCCB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterM_8:: @ 84CCDB8
-	.incbin "graphics/map_objects/pics/people/reporter_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_0:: @ 84CCEB8
-	.incbin "graphics/map_objects/pics/people/reporter_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_1:: @ 84CCFB8
-	.incbin "graphics/map_objects/pics/people/reporter_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_2:: @ 84CD0B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_3:: @ 84CD1B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_4:: @ 84CD2B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_5:: @ 84CD3B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_6:: @ 84CD4B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_7:: @ 84CD5B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ReporterF_8:: @ 84CD6B8
-	.incbin "graphics/map_objects/pics/people/reporter_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_0:: @ 84CD7B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_1:: @ 84CD8B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_2:: @ 84CD9B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_3:: @ 84CDAB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_4:: @ 84CDBB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_5:: @ 84CDCB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_6:: @ 84CDDB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_7:: @ 84CDEB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan1_8:: @ 84CDFB8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_0:: @ 84CE0B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_1:: @ 84CE1B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_2:: @ 84CE2B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_3:: @ 84CE3B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_4:: @ 84CE4B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_5:: @ 84CE5B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_6:: @ 84CE6B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_7:: @ 84CE7B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MauvilleOldMan2_8:: @ 84CE8B8
-	.incbin "graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_0:: @ 84CE9B8
-	.incbin "graphics/map_objects/pics/people/mart_employee/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_1:: @ 84CEAB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_2:: @ 84CEBB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_3:: @ 84CECB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_4:: @ 84CEDB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_5:: @ 84CEEB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_6:: @ 84CEFB8
-	.incbin "graphics/map_objects/pics/people/mart_employee/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_7:: @ 84CF0B8
-	.incbin "graphics/map_objects/pics/people/mart_employee/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MartEmployee_8:: @ 84CF1B8
-	.incbin "graphics/map_objects/pics/people/mart_employee/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_0:: @ 84CF2B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_1:: @ 84CF3B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_2:: @ 84CF4B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_3:: @ 84CF5B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_4:: @ 84CF6B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_5:: @ 84CF7B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_6:: @ 84CF8B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_7:: @ 84CF9B8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RooftopSaleWoman_8:: @ 84CFAB8
-	.incbin "graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_0:: @ 84CFBB8
-	.incbin "graphics/map_objects/pics/people/teala/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_1:: @ 84CFCB8
-	.incbin "graphics/map_objects/pics/people/teala/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_2:: @ 84CFDB8
-	.incbin "graphics/map_objects/pics/people/teala/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_3:: @ 84CFEB8
-	.incbin "graphics/map_objects/pics/people/teala/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_4:: @ 84CFFB8
-	.incbin "graphics/map_objects/pics/people/teala/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_5:: @ 84D00B8
-	.incbin "graphics/map_objects/pics/people/teala/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_6:: @ 84D01B8
-	.incbin "graphics/map_objects/pics/people/teala/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_7:: @ 84D02B8
-	.incbin "graphics/map_objects/pics/people/teala/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Teala_8:: @ 84D03B8
-	.incbin "graphics/map_objects/pics/people/teala/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_0:: @ 84D04B8
-	.incbin "graphics/map_objects/pics/people/artist/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_1:: @ 84D05B8
-	.incbin "graphics/map_objects/pics/people/artist/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_2:: @ 84D06B8
-	.incbin "graphics/map_objects/pics/people/artist/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_3:: @ 84D07B8
-	.incbin "graphics/map_objects/pics/people/artist/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_4:: @ 84D08B8
-	.incbin "graphics/map_objects/pics/people/artist/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_5:: @ 84D09B8
-	.incbin "graphics/map_objects/pics/people/artist/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_6:: @ 84D0AB8
-	.incbin "graphics/map_objects/pics/people/artist/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_7:: @ 84D0BB8
-	.incbin "graphics/map_objects/pics/people/artist/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Artist_8:: @ 84D0CB8
-	.incbin "graphics/map_objects/pics/people/artist/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_0:: @ 84D0DB8
-	.incbin "graphics/map_objects/pics/people/cameraman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_1:: @ 84D0EB8
-	.incbin "graphics/map_objects/pics/people/cameraman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_2:: @ 84D0FB8
-	.incbin "graphics/map_objects/pics/people/cameraman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_3:: @ 84D10B8
-	.incbin "graphics/map_objects/pics/people/cameraman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_4:: @ 84D11B8
-	.incbin "graphics/map_objects/pics/people/cameraman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_5:: @ 84D12B8
-	.incbin "graphics/map_objects/pics/people/cameraman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_6:: @ 84D13B8
-	.incbin "graphics/map_objects/pics/people/cameraman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_7:: @ 84D14B8
-	.incbin "graphics/map_objects/pics/people/cameraman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Cameraman_8:: @ 84D15B8
-	.incbin "graphics/map_objects/pics/people/cameraman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_0:: @ 84D16B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_1:: @ 84D17B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_2:: @ 84D18B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_3:: @ 84D19B8
-	.incbin "graphics/map_objects/pics/people/scientist_2/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_4:: @ 84D1AB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_5:: @ 84D1BB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_6:: @ 84D1CB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_7:: @ 84D1DB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Scientist2_8:: @ 84D1EB8
-	.incbin "graphics/map_objects/pics/people/scientist_2/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_0:: @ 84D1FB8
-	.incbin "graphics/map_objects/pics/people/man_7/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_1:: @ 84D20B8
-	.incbin "graphics/map_objects/pics/people/man_7/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_2:: @ 84D21B8
-	.incbin "graphics/map_objects/pics/people/man_7/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_3:: @ 84D22B8
-	.incbin "graphics/map_objects/pics/people/man_7/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_4:: @ 84D23B8
-	.incbin "graphics/map_objects/pics/people/man_7/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_5:: @ 84D24B8
-	.incbin "graphics/map_objects/pics/people/man_7/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_6:: @ 84D25B8
-	.incbin "graphics/map_objects/pics/people/man_7/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_7:: @ 84D26B8
-	.incbin "graphics/map_objects/pics/people/man_7/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Man7_8:: @ 84D27B8
-	.incbin "graphics/map_objects/pics/people/man_7/8.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_0:: @ 84D28B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_1:: @ 84D29B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_2:: @ 84D2AB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_3:: @ 84D2BB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_4:: @ 84D2CB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_5:: @ 84D2DB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_6:: @ 84D2EB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_7:: @ 84D2FB8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberM_8:: @ 84D30B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_0:: @ 84D31B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_1:: @ 84D32B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_2:: @ 84D33B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_3:: @ 84D34B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_4:: @ 84D35B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_5:: @ 84D36B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_6:: @ 84D37B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_7:: @ 84D38B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_AquaMemberF_8:: @ 84D39B8
-	.incbin "graphics/map_objects/pics/people/aqua_member_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_0:: @ 84D3AB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_1:: @ 84D3BB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_2:: @ 84D3CB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_3:: @ 84D3DB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_4:: @ 84D3EB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_5:: @ 84D3FB8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_6:: @ 84D40B8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_7:: @ 84D41B8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberM_8:: @ 84D42B8
-	.incbin "graphics/map_objects/pics/people/magma_member_m/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_0:: @ 84D43B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_1:: @ 84D44B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_2:: @ 84D45B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_3:: @ 84D46B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_4:: @ 84D47B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_5:: @ 84D48B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_6:: @ 84D49B8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/6.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_7:: @ 84D4AB8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/7.4bpp"
-
-	.align 2
-gFieldObjectPic_MagmaMemberF_8:: @ 84D4BB8
-	.incbin "graphics/map_objects/pics/people/magma_member_f/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Sidney_0:: @ 84D4CB8
-	.incbin "graphics/map_objects/pics/people/sidney/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Sidney_1:: @ 84D4DB8
-	.incbin "graphics/map_objects/pics/people/sidney/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Sidney_2:: @ 84D4EB8
-	.incbin "graphics/map_objects/pics/people/sidney/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Phoebe_0:: @ 84D4FB8
-	.incbin "graphics/map_objects/pics/people/phoebe/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Phoebe_1:: @ 84D50B8
-	.incbin "graphics/map_objects/pics/people/phoebe/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Phoebe_2:: @ 84D51B8
-	.incbin "graphics/map_objects/pics/people/phoebe/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Glacia_0:: @ 84D52B8
-	.incbin "graphics/map_objects/pics/people/glacia/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Glacia_1:: @ 84D53B8
-	.incbin "graphics/map_objects/pics/people/glacia/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Glacia_2:: @ 84D54B8
-	.incbin "graphics/map_objects/pics/people/glacia/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Drake_0:: @ 84D55B8
-	.incbin "graphics/map_objects/pics/people/drake/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Drake_1:: @ 84D56B8
-	.incbin "graphics/map_objects/pics/people/drake/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Drake_2:: @ 84D57B8
-	.incbin "graphics/map_objects/pics/people/drake/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Roxanne_0:: @ 84D58B8
-	.incbin "graphics/map_objects/pics/people/roxanne/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Roxanne_1:: @ 84D59B8
-	.incbin "graphics/map_objects/pics/people/roxanne/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Roxanne_2:: @ 84D5AB8
-	.incbin "graphics/map_objects/pics/people/roxanne/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Brawly_0:: @ 84D5BB8
-	.incbin "graphics/map_objects/pics/people/brawly/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Brawly_1:: @ 84D5CB8
-	.incbin "graphics/map_objects/pics/people/brawly/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Brawly_2:: @ 84D5DB8
-	.incbin "graphics/map_objects/pics/people/brawly/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wattson_0:: @ 84D5EB8
-	.incbin "graphics/map_objects/pics/people/wattson/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wattson_1:: @ 84D5FB8
-	.incbin "graphics/map_objects/pics/people/wattson/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wattson_2:: @ 84D60B8
-	.incbin "graphics/map_objects/pics/people/wattson/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Flannery_0:: @ 84D61B8
-	.incbin "graphics/map_objects/pics/people/flannery/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Flannery_1:: @ 84D62B8
-	.incbin "graphics/map_objects/pics/people/flannery/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Flannery_2:: @ 84D63B8
-	.incbin "graphics/map_objects/pics/people/flannery/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_0:: @ 84D64B8
-	.incbin "graphics/map_objects/pics/people/norman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_1:: @ 84D65B8
-	.incbin "graphics/map_objects/pics/people/norman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_2:: @ 84D66B8
-	.incbin "graphics/map_objects/pics/people/norman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_3:: @ 84D67B8
-	.incbin "graphics/map_objects/pics/people/norman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_4:: @ 84D68B8
-	.incbin "graphics/map_objects/pics/people/norman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_5:: @ 84D69B8
-	.incbin "graphics/map_objects/pics/people/norman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_6:: @ 84D6AB8
-	.incbin "graphics/map_objects/pics/people/norman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_7:: @ 84D6BB8
-	.incbin "graphics/map_objects/pics/people/norman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Norman_8:: @ 84D6CB8
-	.incbin "graphics/map_objects/pics/people/norman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Winona_0:: @ 84D6DB8
-	.incbin "graphics/map_objects/pics/people/winona/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Winona_1:: @ 84D6EB8
-	.incbin "graphics/map_objects/pics/people/winona/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Winona_2:: @ 84D6FB8
-	.incbin "graphics/map_objects/pics/people/winona/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Liza_0:: @ 84D70B8
-	.incbin "graphics/map_objects/pics/people/liza/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Liza_1:: @ 84D71B8
-	.incbin "graphics/map_objects/pics/people/liza/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Liza_2:: @ 84D72B8
-	.incbin "graphics/map_objects/pics/people/liza/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Tate_0:: @ 84D73B8
-	.incbin "graphics/map_objects/pics/people/tate/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Tate_1:: @ 84D74B8
-	.incbin "graphics/map_objects/pics/people/tate/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Tate_2:: @ 84D75B8
-	.incbin "graphics/map_objects/pics/people/tate/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_0:: @ 84D76B8
-	.incbin "graphics/map_objects/pics/people/wallace/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_1:: @ 84D77B8
-	.incbin "graphics/map_objects/pics/people/wallace/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_2:: @ 84D78B8
-	.incbin "graphics/map_objects/pics/people/wallace/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_3:: @ 84D79B8
-	.incbin "graphics/map_objects/pics/people/wallace/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_4:: @ 84D7AB8
-	.incbin "graphics/map_objects/pics/people/wallace/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_5:: @ 84D7BB8
-	.incbin "graphics/map_objects/pics/people/wallace/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_6:: @ 84D7CB8
-	.incbin "graphics/map_objects/pics/people/wallace/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_7:: @ 84D7DB8
-	.incbin "graphics/map_objects/pics/people/wallace/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Wallace_8:: @ 84D7EB8
-	.incbin "graphics/map_objects/pics/people/wallace/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_0:: @ 84D7FB8
-	.incbin "graphics/map_objects/pics/people/steven/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_1:: @ 84D80B8
-	.incbin "graphics/map_objects/pics/people/steven/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_2:: @ 84D81B8
-	.incbin "graphics/map_objects/pics/people/steven/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_3:: @ 84D82B8
-	.incbin "graphics/map_objects/pics/people/steven/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_4:: @ 84D83B8
-	.incbin "graphics/map_objects/pics/people/steven/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_5:: @ 84D84B8
-	.incbin "graphics/map_objects/pics/people/steven/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_6:: @ 84D85B8
-	.incbin "graphics/map_objects/pics/people/steven/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_7:: @ 84D86B8
-	.incbin "graphics/map_objects/pics/people/steven/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Steven_8:: @ 84D87B8
-	.incbin "graphics/map_objects/pics/people/steven/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_0:: @ 84D88B8
-	.incbin "graphics/map_objects/pics/people/wally/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_1:: @ 84D89B8
-	.incbin "graphics/map_objects/pics/people/wally/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_2:: @ 84D8AB8
-	.incbin "graphics/map_objects/pics/people/wally/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_3:: @ 84D8BB8
-	.incbin "graphics/map_objects/pics/people/wally/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_4:: @ 84D8CB8
-	.incbin "graphics/map_objects/pics/people/wally/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_5:: @ 84D8DB8
-	.incbin "graphics/map_objects/pics/people/wally/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_6:: @ 84D8EB8
-	.incbin "graphics/map_objects/pics/people/wally/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_7:: @ 84D8FB8
-	.incbin "graphics/map_objects/pics/people/wally/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Wally_8:: @ 84D90B8
-	.incbin "graphics/map_objects/pics/people/wally/8.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_0:: @ 84D91B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_1:: @ 84D9238
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_2:: @ 84D92B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_3:: @ 84D9338
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_4:: @ 84D93B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_5:: @ 84D9438
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_6:: @ 84D94B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_7:: @ 84D9538
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.4bpp"
-
-	.align 2
-gFieldObjectPic_RubySapphireLittleBoy_8:: @ 84D95B8
-	.incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_0:: @ 84D9638
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_1:: @ 84D9738
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_2:: @ 84D9838
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_3:: @ 84D9938
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_4:: @ 84D9A38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_5:: @ 84D9B38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_6:: @ 84D9C38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_7:: @ 84D9D38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp"
-
-	.align 2
-gFieldObjectPic_HotSpringsOldWoman_8:: @ 84D9E38
-	.incbin "graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp"
-
-	.align 2
-gFieldObjectPic_LatiasLatios_0:: @ 84D9F38
-	.incbin "graphics/map_objects/pics/pokemon/latias_latios/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LatiasLatios_1:: @ 84DA138
-	.incbin "graphics/map_objects/pics/pokemon/latias_latios/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LatiasLatios_2:: @ 84DA338
-	.incbin "graphics/map_objects/pics/pokemon/latias_latios/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy5_0:: @ 84DA538
-	.incbin "graphics/map_objects/pics/people/boy_5/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy5_1:: @ 84DA638
-	.incbin "graphics/map_objects/pics/people/boy_5/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Boy5_2:: @ 84DA738
-	.incbin "graphics/map_objects/pics/people/boy_5/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_0:: @ 84DA838
-	.incbin "graphics/map_objects/pics/people/contest_old_man/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_1:: @ 84DA938
-	.incbin "graphics/map_objects/pics/people/contest_old_man/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_2:: @ 84DAA38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_3:: @ 84DAB38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_4:: @ 84DAC38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_5:: @ 84DAD38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_6:: @ 84DAE38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/6.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_7:: @ 84DAF38
-	.incbin "graphics/map_objects/pics/people/contest_old_man/7.4bpp"
-
-	.align 2
-gFieldObjectPic_ContestOldMan_8:: @ 84DB038
-	.incbin "graphics/map_objects/pics/people/contest_old_man/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_0:: @ 84DB138
-	.incbin "graphics/map_objects/pics/people/archie/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_1:: @ 84DB238
-	.incbin "graphics/map_objects/pics/people/archie/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_2:: @ 84DB338
-	.incbin "graphics/map_objects/pics/people/archie/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_3:: @ 84DB438
-	.incbin "graphics/map_objects/pics/people/archie/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_4:: @ 84DB538
-	.incbin "graphics/map_objects/pics/people/archie/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_5:: @ 84DB638
-	.incbin "graphics/map_objects/pics/people/archie/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_6:: @ 84DB738
-	.incbin "graphics/map_objects/pics/people/archie/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_7:: @ 84DB838
-	.incbin "graphics/map_objects/pics/people/archie/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Archie_8:: @ 84DB938
-	.incbin "graphics/map_objects/pics/people/archie/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_0:: @ 84DBA38
-	.incbin "graphics/map_objects/pics/people/maxie/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_1:: @ 84DBB38
-	.incbin "graphics/map_objects/pics/people/maxie/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_2:: @ 84DBC38
-	.incbin "graphics/map_objects/pics/people/maxie/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_3:: @ 84DBD38
-	.incbin "graphics/map_objects/pics/people/maxie/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_4:: @ 84DBE38
-	.incbin "graphics/map_objects/pics/people/maxie/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_5:: @ 84DBF38
-	.incbin "graphics/map_objects/pics/people/maxie/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_6:: @ 84DC038
-	.incbin "graphics/map_objects/pics/people/maxie/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_7:: @ 84DC138
-	.incbin "graphics/map_objects/pics/people/maxie/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Maxie_8:: @ 84DC238
-	.incbin "graphics/map_objects/pics/people/maxie/8.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreFront_0:: @ 84DC338
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_front/0.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreFront_1:: @ 84DC538
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_front/1.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreSide_0:: @ 84DC738
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_side/0.4bpp"
-
-	.align 2
-gFieldObjectPic_KyogreSide_1:: @ 84DC938
-	.incbin "graphics/map_objects/pics/pokemon/kyogre_side/1.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonFront_0:: @ 84DCB38
-	.incbin "graphics/map_objects/pics/pokemon/groudon_front/0.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonFront_1:: @ 84DCD38
-	.incbin "graphics/map_objects/pics/pokemon/groudon_front/1.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonSide_0:: @ 84DCF38
-	.incbin "graphics/map_objects/pics/pokemon/groudon_side/0.4bpp"
-
-	.align 2
-gFieldObjectPic_GroudonSide_1:: @ 84DD138
-	.incbin "graphics/map_objects/pics/pokemon/groudon_side/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Regi:: @ 84DD338
-	.incbin "graphics/map_objects/pics/pokemon/regi.4bpp"
-
-	.align 2
-gFieldObjectPic_Skitty_0:: @ 84DD538
-	.incbin "graphics/map_objects/pics/pokemon/skitty/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Skitty_1:: @ 84DD5B8
-	.incbin "graphics/map_objects/pics/pokemon/skitty/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Skitty_2:: @ 84DD638
-	.incbin "graphics/map_objects/pics/pokemon/skitty/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Kecleon_0:: @ 84DD6B8
-	.incbin "graphics/map_objects/pics/pokemon/kecleon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Kecleon_1:: @ 84DD738
-	.incbin "graphics/map_objects/pics/pokemon/kecleon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Kecleon_2:: @ 84DD7B8
-	.incbin "graphics/map_objects/pics/pokemon/kecleon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_0:: @ 84DD838
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_1:: @ 84DE038
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_2:: @ 84DE838
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_3:: @ 84DF038
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Rayquaza_4:: @ 84DF838
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RayquazaStill:: @ 84E0038
-	.incbin "graphics/map_objects/pics/pokemon/rayquaza_still.4bpp"
-
-	.align 2
-gFieldObjectPic_Zigzagoon_0:: @ 84E0838
-	.incbin "graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Zigzagoon_1:: @ 84E08B8
-	.incbin "graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Zigzagoon_2:: @ 84E0938
-	.incbin "graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Pikachu_0:: @ 84E09B8
-	.incbin "graphics/map_objects/pics/pokemon/pikachu/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Pikachu_1:: @ 84E0A38
-	.incbin "graphics/map_objects/pics/pokemon/pikachu/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Pikachu_2:: @ 84E0AB8
-	.incbin "graphics/map_objects/pics/pokemon/pikachu/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Azumarill_0:: @ 84E0B38
-	.incbin "graphics/map_objects/pics/pokemon/azumarill/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Azumarill_1:: @ 84E0BB8
-	.incbin "graphics/map_objects/pics/pokemon/azumarill/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Azumarill_2:: @ 84E0C38
-	.incbin "graphics/map_objects/pics/pokemon/azumarill/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_0:: @ 84E0CB8
-	.incbin "graphics/map_objects/pics/pokemon/wingull/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_3:: @ 84E0D38
-	.incbin "graphics/map_objects/pics/pokemon/wingull/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_1:: @ 84E0DB8
-	.incbin "graphics/map_objects/pics/pokemon/wingull/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_4:: @ 84E0E38
-	.incbin "graphics/map_objects/pics/pokemon/wingull/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_2:: @ 84E0EB8
-	.incbin "graphics/map_objects/pics/pokemon/wingull/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Wingull_5:: @ 84E0F38
-	.incbin "graphics/map_objects/pics/pokemon/wingull/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_0:: @ 84E0FB8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_1:: @ 84E1038
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_2:: @ 84E10B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_3:: @ 84E1138
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_4:: @ 84E11B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_5:: @ 84E1238
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_6:: @ 84E12B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_7:: @ 84E1338
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp"
-
-	.align 2
-gFieldObjectPic_TuberMSwimming_8:: @ 84E13B8
-	.incbin "graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Azurill_0:: @ 84E1438
-	.incbin "graphics/map_objects/pics/pokemon/azurill/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Azurill_1:: @ 84E14B8
-	.incbin "graphics/map_objects/pics/pokemon/azurill/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Azurill_2:: @ 84E1538
-	.incbin "graphics/map_objects/pics/pokemon/azurill/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_0:: @ 84E15B8
-	.incbin "graphics/map_objects/pics/people/mom/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_1:: @ 84E16B8
-	.incbin "graphics/map_objects/pics/people/mom/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_2:: @ 84E17B8
-	.incbin "graphics/map_objects/pics/people/mom/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_3:: @ 84E18B8
-	.incbin "graphics/map_objects/pics/people/mom/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_4:: @ 84E19B8
-	.incbin "graphics/map_objects/pics/people/mom/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_5:: @ 84E1AB8
-	.incbin "graphics/map_objects/pics/people/mom/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_6:: @ 84E1BB8
-	.incbin "graphics/map_objects/pics/people/mom/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_7:: @ 84E1CB8
-	.incbin "graphics/map_objects/pics/people/mom/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Mom_8:: @ 84E1DB8
-	.incbin "graphics/map_objects/pics/people/mom/8.4bpp"
-
-	.align 2
-gFieldObjectPalette22:: @ 84E1EB8
-	.incbin "graphics/map_objects/palettes/field_object_palette_22.gbapal"
-
-	.align 2
-gFieldObjectPalette23:: @ 84E1ED8
-	.incbin "graphics/map_objects/palettes/field_object_palette_23.gbapal"
-
-	.align 2
-gFieldObjectPalette24:: @ 84E1EF8
-	.incbin "graphics/map_objects/palettes/field_object_palette_24.gbapal"
-
-	.align 2
-gFieldObjectPalette25:: @ 84E1F18
-	.incbin "graphics/map_objects/palettes/field_object_palette_25.gbapal"
-
-	.align 2
-gFieldObjectPic_UnusedNatuDoll:: @ 84E1F38
-	.incbin "graphics/map_objects/pics/dolls/unused_natu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedMagnemiteDoll:: @ 84E1FB8
-	.incbin "graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedSquirtleDoll:: @ 84E2038
-	.incbin "graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedWooperDoll:: @ 84E20B8
-	.incbin "graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedPikachuDoll:: @ 84E2138
-	.incbin "graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_UnusedPorygon2Doll:: @ 84E21B8
-	.incbin "graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_PichuDoll:: @ 84E2238
-	.incbin "graphics/map_objects/pics/dolls/pichu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_PikachuDoll:: @ 84E22B8
-	.incbin "graphics/map_objects/pics/dolls/pikachu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_MarillDoll:: @ 84E2338
-	.incbin "graphics/map_objects/pics/dolls/marill_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TogepiDoll:: @ 84E23B8
-	.incbin "graphics/map_objects/pics/dolls/togepi_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_CyndaquilDoll:: @ 84E2438
-	.incbin "graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_ChikoritaDoll:: @ 84E24B8
-	.incbin "graphics/map_objects/pics/dolls/chikorita_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TotodileDoll:: @ 84E2538
-	.incbin "graphics/map_objects/pics/dolls/totodile_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_JigglypuffDoll:: @ 84E25B8
-	.incbin "graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_MeowthDoll:: @ 84E2638
-	.incbin "graphics/map_objects/pics/dolls/meowth_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_ClefairyDoll:: @ 84E26B8
-	.incbin "graphics/map_objects/pics/dolls/clefairy_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_DittoDoll:: @ 84E2738
-	.incbin "graphics/map_objects/pics/dolls/ditto_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SmoochumDoll:: @ 84E27B8
-	.incbin "graphics/map_objects/pics/dolls/smoochum_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TreeckoDoll:: @ 84E2838
-	.incbin "graphics/map_objects/pics/dolls/treecko_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_TorchicDoll:: @ 84E28B8
-	.incbin "graphics/map_objects/pics/dolls/torchic_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_MudkipDoll:: @ 84E2938
-	.incbin "graphics/map_objects/pics/dolls/mudkip_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_DuskullDoll:: @ 84E29B8
-	.incbin "graphics/map_objects/pics/dolls/duskull_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_WynautDoll:: @ 84E2A38
-	.incbin "graphics/map_objects/pics/dolls/wynaut_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BaltoyDoll:: @ 84E2AB8
-	.incbin "graphics/map_objects/pics/dolls/baltoy_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_KecleonDoll:: @ 84E2B38
-	.incbin "graphics/map_objects/pics/dolls/kecleon_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_AzurillDoll:: @ 84E2BB8
-	.incbin "graphics/map_objects/pics/dolls/azurill_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SkittyDoll:: @ 84E2C38
-	.incbin "graphics/map_objects/pics/dolls/skitty_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SwabluDoll:: @ 84E2CB8
-	.incbin "graphics/map_objects/pics/dolls/swablu_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_GulpinDoll:: @ 84E2D38
-	.incbin "graphics/map_objects/pics/dolls/gulpin_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_LotadDoll:: @ 84E2DB8
-	.incbin "graphics/map_objects/pics/dolls/lotad_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_SeedotDoll:: @ 84E2E38
-	.incbin "graphics/map_objects/pics/dolls/seedot_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_PikaCushion:: @ 84E2EB8
-	.incbin "graphics/map_objects/pics/cushions/pika_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_RoundCushion:: @ 84E2F38
-	.incbin "graphics/map_objects/pics/cushions/round_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_KissCushion:: @ 84E2FB8
-	.incbin "graphics/map_objects/pics/cushions/kiss_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_ZigzagCushion:: @ 84E3038
-	.incbin "graphics/map_objects/pics/cushions/zigzag_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_SpinCushion:: @ 84E30B8
-	.incbin "graphics/map_objects/pics/cushions/spin_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_DiamondCushion:: @ 84E3138
-	.incbin "graphics/map_objects/pics/cushions/diamond_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_BallCushion:: @ 84E31B8
-	.incbin "graphics/map_objects/pics/cushions/ball_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_GrassCushion:: @ 84E3238
-	.incbin "graphics/map_objects/pics/cushions/grass_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_FireCushion:: @ 84E32B8
-	.incbin "graphics/map_objects/pics/cushions/fire_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_WaterCushion:: @ 84E3338
-	.incbin "graphics/map_objects/pics/cushions/water_cushion.4bpp"
-
-	.align 2
-gFieldObjectPic_BigSnorlaxDoll:: @ 84E33B8
-	.incbin "graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRhydonDoll:: @ 84E35B8
-	.incbin "graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigLaprasDoll:: @ 84E37B8
-	.incbin "graphics/map_objects/pics/dolls/big_lapras_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigVenusaurDoll:: @ 84E39B8
-	.incbin "graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigCharizardDoll:: @ 84E3BB8
-	.incbin "graphics/map_objects/pics/dolls/big_charizard_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigBlastoiseDoll:: @ 84E3DB8
-	.incbin "graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigWailmerDoll:: @ 84E3FB8
-	.incbin "graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRegirockDoll:: @ 84E41B8
-	.incbin "graphics/map_objects/pics/dolls/big_regirock_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRegiceDoll:: @ 84E43B8
-	.incbin "graphics/map_objects/pics/dolls/big_regice_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_BigRegisteelDoll:: @ 84E45B8
-	.incbin "graphics/map_objects/pics/dolls/big_registeel_doll.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_0:: @ 84E47B8
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_1:: @ 84E4838
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_2:: @ 84E48B8
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CuttableTree_3:: @ 84E4938
-	.incbin "graphics/map_objects/pics/misc/cuttable_tree/3.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_0:: @ 84E49B8
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_1:: @ 84E4A38
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/1.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_2:: @ 84E4AB8
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/2.4bpp"
-
-	.align 2
-gFieldObjectPic_BreakableRock_3:: @ 84E4B38
-	.incbin "graphics/map_objects/pics/misc/breakable_rock/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PushableBoulder:: @ 84E4BB8
-	.incbin "graphics/map_objects/pics/misc/pushable_boulder.4bpp"
-
-	.align 2
-gFieldObjectPic_MrBrineysBoat_0:: @ 84E4C38
-	.incbin "graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MrBrineysBoat_1:: @ 84E4E38
-	.incbin "graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MrBrineysBoat_2:: @ 84E5038
-	.incbin "graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Fossil:: @ 84E5238
-	.incbin "graphics/map_objects/pics/misc/fossil.4bpp"
-
-	.align 2
-gFieldObjectPic_SubmarineShadow:: @ 84E52B8
-	.incbin "graphics/map_objects/pics/misc/submarine_shadow.4bpp"
-
-	.align 2
-gFieldObjectPalette26:: @ 84E5838
-	.incbin "graphics/map_objects/palettes/field_object_palette_26.gbapal"
-
-	.align 2
-gFieldObjectPic_Truck:: @ 84E5858
-	.incbin "graphics/map_objects/pics/misc/truck.4bpp"
-
-	.align 2
-gFieldObjectPalette14:: @ 84E5CD8
-	.incbin "graphics/map_objects/palettes/field_object_palette_14.gbapal"
-
-	.align 2
-gFieldObjectPic_VigorothCarryingBox_0:: @ 84E5CF8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothCarryingBox_1:: @ 84E5EF8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothCarryingBox_2:: @ 84E60F8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothFacingAway_0:: @ 84E62F8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.4bpp"
-
-	.align 2
-gFieldObjectPic_VigorothFacingAway_1:: @ 84E64F8
-	.incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.4bpp"
-
-	.align 2
-gFieldObjectPalette15:: @ 84E66F8
-	.incbin "graphics/map_objects/palettes/field_object_palette_15.gbapal"
-
-	.align 2
-gFieldObjectPic_BirchsBag:: @ 84E6718
-	.incbin "graphics/map_objects/pics/misc/birchs_bag.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_0:: @ 84E6798
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_1:: @ 84E6998
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_2:: @ 84E6B98
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_3:: @ 84E6D98
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_4:: @ 84E6F98
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_5:: @ 84E7198
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_6:: @ 84E7398
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_7:: @ 84E7598
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.4bpp"
-
-	.align 2
-gFieldObjectPic_EnemyZigzagoon_8:: @ 84E7798
-	.incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.4bpp"
-
-	.align 2
-gFieldObjectPalette16:: @ 84E7998
-	.incbin "graphics/map_objects/palettes/field_object_palette_16.gbapal"
-
-	.align 2
-gFieldObjectPic_Poochyena_0:: @ 84E79B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_1:: @ 84E7BB8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_2:: @ 84E7DB8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_3:: @ 84E7FB8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_4:: @ 84E81B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_5:: @ 84E83B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_6:: @ 84E85B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_7:: @ 84E87B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Poochyena_8:: @ 84E89B8
-	.incbin "graphics/map_objects/pics/pokemon/poochyena/8.4bpp"
-
-	.align 2
-gFieldObjectPalette27:: @ 84E8BB8
-	.incbin "graphics/map_objects/palettes/field_object_palette_27.gbapal"
-
-	.align 2
-gFieldObjectPic_CableCar:: @ 84E8BD8
-	.incbin "graphics/map_objects/pics/misc/cable_car.4bpp"
-
-	.align 2
-gFieldObjectPalette20:: @ 84E93D8
-	.incbin "graphics/map_objects/palettes/field_object_palette_20.gbapal"
-
-	.align 2
-gFieldObjectPic_SSTidal:: @ 84E93F8
-	.incbin "graphics/map_objects/pics/misc/ss_tidal.4bpp"
-
-	.align 2
-gFieldObjectPalette21:: @ 84E9B78
-	.incbin "graphics/map_objects/palettes/field_object_palette_21.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_0:: @ 84E9B98
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_1:: @ 84E9C18
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_2:: @ 84E9C98
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_3:: @ 84E9D18
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_4:: @ 84E9D98
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BerryTreeGrowthSparkle_5:: @ 84E9E18
-	.incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp"
-
-	.align 2
-gFieldObjectPic_BerryTreeDirtPile:: @ 84E9E98
-	.incbin "graphics/map_objects/pics/berry_trees/dirt_pile.4bpp"
-
-	.align 2
-gFieldObjectPic_BerryTreeSprout_0:: @ 84E9F18
-	.incbin "graphics/map_objects/pics/berry_trees/sprout/0.4bpp"
-
-	.align 2
-gFieldObjectPic_BerryTreeSprout_1:: @ 84E9F98
-	.incbin "graphics/map_objects/pics/berry_trees/sprout/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_0:: @ 84EA018
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_1:: @ 84EA118
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_2:: @ 84EA218
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_3:: @ 84EA318
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_4:: @ 84EA418
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PechaBerryTree_5:: @ 84EA518
-	.incbin "graphics/map_objects/pics/berry_trees/pecha/5.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_0:: @ 84EA618
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_1:: @ 84EA718
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_2:: @ 84EA818
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_3:: @ 84EA918
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_4:: @ 84EAA18
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_KelpsyBerryTree_5:: @ 84EAB18
-	.incbin "graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_0:: @ 84EAC18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/0.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_1:: @ 84EAD18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/1.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_2:: @ 84EAE18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/2.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_3:: @ 84EAF18
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/3.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_4:: @ 84EB018
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/4.4bpp"
-
-	.align 2
-gFieldObjectPic_WepearBerryTree_5:: @ 84EB118
-	.incbin "graphics/map_objects/pics/berry_trees/wepear/5.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_0:: @ 84EB218
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/0.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_1:: @ 84EB318
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/1.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_2:: @ 84EB418
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/2.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_3:: @ 84EB518
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/3.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_4:: @ 84EB618
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/4.4bpp"
-
-	.align 2
-gFieldObjectPic_IapapaBerryTree_5:: @ 84EB718
-	.incbin "graphics/map_objects/pics/berry_trees/iapapa/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_0:: @ 84EB818
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_1:: @ 84EB918
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_2:: @ 84EBA18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_3:: @ 84EBB18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_4:: @ 84EBC18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CheriBerryTree_5:: @ 84EBD18
-	.incbin "graphics/map_objects/pics/berry_trees/cheri/5.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_0:: @ 84EBE18
-	.incbin "graphics/map_objects/pics/berry_trees/figy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_1:: @ 84EBF18
-	.incbin "graphics/map_objects/pics/berry_trees/figy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_2:: @ 84EC018
-	.incbin "graphics/map_objects/pics/berry_trees/figy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_3:: @ 84EC118
-	.incbin "graphics/map_objects/pics/berry_trees/figy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_4:: @ 84EC218
-	.incbin "graphics/map_objects/pics/berry_trees/figy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_FigyBerryTree_5:: @ 84EC318
-	.incbin "graphics/map_objects/pics/berry_trees/figy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_0:: @ 84EC418
-	.incbin "graphics/map_objects/pics/berry_trees/mago/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_1:: @ 84EC518
-	.incbin "graphics/map_objects/pics/berry_trees/mago/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_2:: @ 84EC618
-	.incbin "graphics/map_objects/pics/berry_trees/mago/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_3:: @ 84EC718
-	.incbin "graphics/map_objects/pics/berry_trees/mago/3.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_4:: @ 84EC818
-	.incbin "graphics/map_objects/pics/berry_trees/mago/4.4bpp"
-
-	.align 2
-gFieldObjectPic_MagoBerryTree_5:: @ 84EC918
-	.incbin "graphics/map_objects/pics/berry_trees/mago/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_0:: @ 84ECA18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_1:: @ 84ECB18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_2:: @ 84ECC18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_3:: @ 84ECD18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_4:: @ 84ECE18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LumBerryTree_5:: @ 84ECF18
-	.incbin "graphics/map_objects/pics/berry_trees/lum/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_0:: @ 84ED018
-	.incbin "graphics/map_objects/pics/berry_trees/razz/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_1:: @ 84ED118
-	.incbin "graphics/map_objects/pics/berry_trees/razz/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_2:: @ 84ED218
-	.incbin "graphics/map_objects/pics/berry_trees/razz/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_3:: @ 84ED318
-	.incbin "graphics/map_objects/pics/berry_trees/razz/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_4:: @ 84ED418
-	.incbin "graphics/map_objects/pics/berry_trees/razz/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RazzBerryTree_5:: @ 84ED518
-	.incbin "graphics/map_objects/pics/berry_trees/razz/5.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_0:: @ 84ED618
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/0.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_1:: @ 84ED718
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/1.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_2:: @ 84ED818
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/2.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_3:: @ 84ED918
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/3.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_4:: @ 84EDA18
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/4.4bpp"
-
-	.align 2
-gFieldObjectPic_GrepaBerryTree_5:: @ 84EDB18
-	.incbin "graphics/map_objects/pics/berry_trees/grepa/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_0:: @ 84EDC18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_1:: @ 84EDD18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_2:: @ 84EDE18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_3:: @ 84EDF18
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_4:: @ 84EE018
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RabutaBerryTree_5:: @ 84EE118
-	.incbin "graphics/map_objects/pics/berry_trees/rabuta/5.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_0:: @ 84EE218
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/0.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_1:: @ 84EE318
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/1.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_2:: @ 84EE418
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/2.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_3:: @ 84EE518
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/3.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_4:: @ 84EE618
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/4.4bpp"
-
-	.align 2
-gFieldObjectPic_NomelBerryTree_5:: @ 84EE718
-	.incbin "graphics/map_objects/pics/berry_trees/nomel/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_0:: @ 84EE818
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_1:: @ 84EE918
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_2:: @ 84EEA18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_3:: @ 84EEB18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_4:: @ 84EEC18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LeppaBerryTree_5:: @ 84EED18
-	.incbin "graphics/map_objects/pics/berry_trees/leppa/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_0:: @ 84EEE18
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_1:: @ 84EEF18
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_2:: @ 84EF018
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_3:: @ 84EF118
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_4:: @ 84EF218
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LiechiBerryTree_5:: @ 84EF318
-	.incbin "graphics/map_objects/pics/berry_trees/liechi/5.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_0:: @ 84EF418
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_1:: @ 84EF518
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/1.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_2:: @ 84EF618
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/2.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_3:: @ 84EF718
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/3.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_4:: @ 84EF818
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/4.4bpp"
-
-	.align 2
-gFieldObjectPic_HondewBerryTree_5:: @ 84EF918
-	.incbin "graphics/map_objects/pics/berry_trees/hondew/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_0:: @ 84EFA18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_1:: @ 84EFB18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_2:: @ 84EFC18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_3:: @ 84EFD18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_4:: @ 84EFE18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AguavBerryTree_5:: @ 84EFF18
-	.incbin "graphics/map_objects/pics/berry_trees/aguav/5.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_0:: @ 84F0018
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/0.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_1:: @ 84F0118
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/1.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_2:: @ 84F0218
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/2.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_3:: @ 84F0318
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/3.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_4:: @ 84F0418
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/4.4bpp"
-
-	.align 2
-gFieldObjectPic_WikiBerryTree_5:: @ 84F0518
-	.incbin "graphics/map_objects/pics/berry_trees/wiki/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_0:: @ 84F0618
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_1:: @ 84F0718
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_2:: @ 84F0818
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_3:: @ 84F0918
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_4:: @ 84F0A18
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PomegBerryTree_5:: @ 84F0B18
-	.incbin "graphics/map_objects/pics/berry_trees/pomeg/5.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_0:: @ 84F0C18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/0.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_1:: @ 84F0D18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/1.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_2:: @ 84F0E18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/2.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_3:: @ 84F0F18
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/3.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_4:: @ 84F1018
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/4.4bpp"
-
-	.align 2
-gFieldObjectPic_RawstBerryTree_5:: @ 84F1118
-	.incbin "graphics/map_objects/pics/berry_trees/rawst/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_0:: @ 84F1218
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_1:: @ 84F1318
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_2:: @ 84F1418
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_3:: @ 84F1518
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_4:: @ 84F1618
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SpelonBerryTree_5:: @ 84F1718
-	.incbin "graphics/map_objects/pics/berry_trees/spelon/5.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_0:: @ 84F1818
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/0.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_1:: @ 84F1918
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/1.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_2:: @ 84F1A18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/2.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_3:: @ 84F1B18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/3.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_4:: @ 84F1C18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/4.4bpp"
-
-	.align 2
-gFieldObjectPic_ChestoBerryTree_5:: @ 84F1D18
-	.incbin "graphics/map_objects/pics/berry_trees/chesto/5.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_0:: @ 84F1E18
-	.incbin "graphics/map_objects/pics/berry_trees/oran/0.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_1:: @ 84F1F18
-	.incbin "graphics/map_objects/pics/berry_trees/oran/1.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_2:: @ 84F2018
-	.incbin "graphics/map_objects/pics/berry_trees/oran/2.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_3:: @ 84F2118
-	.incbin "graphics/map_objects/pics/berry_trees/oran/3.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_4:: @ 84F2218
-	.incbin "graphics/map_objects/pics/berry_trees/oran/4.4bpp"
-
-	.align 2
-gFieldObjectPic_OranBerryTree_5:: @ 84F2318
-	.incbin "graphics/map_objects/pics/berry_trees/oran/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_0:: @ 84F2418
-	.incbin "graphics/map_objects/pics/berry_trees/persim/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_1:: @ 84F2518
-	.incbin "graphics/map_objects/pics/berry_trees/persim/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_2:: @ 84F2618
-	.incbin "graphics/map_objects/pics/berry_trees/persim/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_3:: @ 84F2718
-	.incbin "graphics/map_objects/pics/berry_trees/persim/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_4:: @ 84F2818
-	.incbin "graphics/map_objects/pics/berry_trees/persim/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PersimBerryTree_5:: @ 84F2918
-	.incbin "graphics/map_objects/pics/berry_trees/persim/5.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_0:: @ 84F2A18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/0.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_1:: @ 84F2B18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/1.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_2:: @ 84F2C18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/2.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_3:: @ 84F2D18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/3.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_4:: @ 84F2E18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/4.4bpp"
-
-	.align 2
-gFieldObjectPic_SitrusBerryTree_5:: @ 84F2F18
-	.incbin "graphics/map_objects/pics/berry_trees/sitrus/5.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_0:: @ 84F3018
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/0.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_1:: @ 84F3118
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/1.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_2:: @ 84F3218
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/2.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_3:: @ 84F3318
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/3.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_4:: @ 84F3418
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/4.4bpp"
-
-	.align 2
-gFieldObjectPic_AspearBerryTree_5:: @ 84F3518
-	.incbin "graphics/map_objects/pics/berry_trees/aspear/5.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_0:: @ 84F3618
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/0.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_1:: @ 84F3718
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/1.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_2:: @ 84F3818
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/2.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_3:: @ 84F3918
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/3.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_4:: @ 84F3A18
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/4.4bpp"
-
-	.align 2
-gFieldObjectPic_PamtreBerryTree_5:: @ 84F3B18
-	.incbin "graphics/map_objects/pics/berry_trees/pamtre/5.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_0:: @ 84F3C18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/0.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_1:: @ 84F3D18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/1.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_2:: @ 84F3E18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/2.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_3:: @ 84F3F18
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/3.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_4:: @ 84F4018
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/4.4bpp"
-
-	.align 2
-gFieldObjectPic_CornnBerryTree_5:: @ 84F4118
-	.incbin "graphics/map_objects/pics/berry_trees/cornn/5.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_0:: @ 84F4218
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/0.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_1:: @ 84F4318
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/1.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_2:: @ 84F4418
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/2.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_3:: @ 84F4518
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/3.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_4:: @ 84F4618
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/4.4bpp"
-
-	.align 2
-gFieldObjectPic_LansatBerryTree_5:: @ 84F4718
-	.incbin "graphics/map_objects/pics/berry_trees/lansat/5.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_0:: @ 84F4818
-	.incbin "graphics/map_objects/pics/berry_trees/durin/0.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_1:: @ 84F4918
-	.incbin "graphics/map_objects/pics/berry_trees/durin/1.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_2:: @ 84F4A18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/2.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_3:: @ 84F4B18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/3.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_4:: @ 84F4C18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/4.4bpp"
-
-	.align 2
-gFieldObjectPic_DurinBerryTree_5:: @ 84F4D18
-	.incbin "graphics/map_objects/pics/berry_trees/durin/5.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_0:: @ 84F4E18
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/0.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_1:: @ 84F4F18
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/1.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_2:: @ 84F5018
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/2.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_3:: @ 84F5118
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/3.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_4:: @ 84F5218
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/4.4bpp"
-
-	.align 2
-gFieldObjectPic_TamatoBerryTree_5:: @ 84F5318
-	.incbin "graphics/map_objects/pics/berry_trees/tamato/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SurfBlob_0:: @ 84F5418
-	.incbin "graphics/map_objects/pics/effects/surf_blob/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SurfBlob_1:: @ 84F5618
-	.incbin "graphics/map_objects/pics/effects/surf_blob/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SurfBlob_2:: @ 84F5818
-	.incbin "graphics/map_objects/pics/effects/surf_blob/2.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_0:: @ 84F5A18
-	.incbin "graphics/map_objects/pics/people/quinty_plump/0.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_1:: @ 84F5C18
-	.incbin "graphics/map_objects/pics/people/quinty_plump/1.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_2:: @ 84F5E18
-	.incbin "graphics/map_objects/pics/people/quinty_plump/2.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_3:: @ 84F6018
-	.incbin "graphics/map_objects/pics/people/quinty_plump/3.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_4:: @ 84F6218
-	.incbin "graphics/map_objects/pics/people/quinty_plump/4.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_5:: @ 84F6418
-	.incbin "graphics/map_objects/pics/people/quinty_plump/5.4bpp"
-
-	.align 2
-gFieldObjectPic_QuintyPlump_6:: @ 84F6618
-	.incbin "graphics/map_objects/pics/people/quinty_plump/6.4bpp"
-
-	.align 2
-gFieldObjectPalette12:: @ 84F6818
-	.incbin "graphics/map_objects/palettes/field_object_palette_12.gbapal"
-
-	.align 2
-gFieldObjectPalette13:: @ 84F6838
-	.incbin "graphics/map_objects/palettes/field_object_palette_13.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_ShadowSmall:: @ 84F6858
-	.incbin "graphics/map_objects/pics/effects/shadow_small.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShadowMedium:: @ 84F6878
-	.incbin "graphics/map_objects/pics/effects/shadow_medium.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8
-	.incbin "graphics/map_objects/pics/effects/shadow_large.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938
-	.incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp"
-
-gUnknown_084F6D38:: @ 84F6D38
-	.incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette6:: @ 84F6E98
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_06.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_0:: @ 84F6EB8
-	.incbin "graphics/map_objects/pics/effects/ripple/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_1:: @ 84F6F38
-	.incbin "graphics/map_objects/pics/effects/ripple/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_2:: @ 84F6FB8
-	.incbin "graphics/map_objects/pics/effects/ripple/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_3:: @ 84F7038
-	.incbin "graphics/map_objects/pics/effects/ripple/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ripple_4:: @ 84F70B8
-	.incbin "graphics/map_objects/pics/effects/ripple/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_0:: @ 84F7138
-	.incbin "graphics/map_objects/pics/effects/ash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_1:: @ 84F71B8
-	.incbin "graphics/map_objects/pics/effects/ash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_2:: @ 84F7238
-	.incbin "graphics/map_objects/pics/effects/ash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_3:: @ 84F72B8
-	.incbin "graphics/map_objects/pics/effects/ash/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Ash_4:: @ 84F7338
-	.incbin "graphics/map_objects/pics/effects/ash/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_0:: @ 84F73B8
-	.incbin "graphics/map_objects/pics/effects/arrow/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_1:: @ 84F7438
-	.incbin "graphics/map_objects/pics/effects/arrow/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_2:: @ 84F74B8
-	.incbin "graphics/map_objects/pics/effects/arrow/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_3:: @ 84F7538
-	.incbin "graphics/map_objects/pics/effects/arrow/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_4:: @ 84F75B8
-	.incbin "graphics/map_objects/pics/effects/arrow/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_5:: @ 84F7638
-	.incbin "graphics/map_objects/pics/effects/arrow/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_6:: @ 84F76B8
-	.incbin "graphics/map_objects/pics/effects/arrow/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Arrow_7:: @ 84F7738
-	.incbin "graphics/map_objects/pics/effects/arrow/7.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette0:: @ 84F77B8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_00.gbapal"
-
-	.align 2
-gFieldEffectObjectPalette1:: @ 84F77D8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_01.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_GroundImpactDust_0:: @ 84F77F8
-	.incbin "graphics/map_objects/pics/effects/ground_impact_dust/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_GroundImpactDust_1:: @ 84F7838
-	.incbin "graphics/map_objects/pics/effects/ground_impact_dust/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_GroundImpactDust_2:: @ 84F7878
-	.incbin "graphics/map_objects/pics/effects/ground_impact_dust/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_0:: @ 84F78B8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_1:: @ 84F78F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978
-	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
-
-gUnusedGrass_0:: @4F79B8
-	.incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp"
-	
-gUnusedGrass_1:: @4F7A38
-	.incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp"
-	
-gUnusedGrass_2:: @4F7AB8
-	.incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp"
-	
-gUnusedGrass_3:: @4F7B38
-	.incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_1:: @ 84F7C38
-	.incbin "graphics/map_objects/pics/effects/unknown_16/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_2:: @ 84F7CB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38
-	.incbin "graphics/map_objects/pics/effects/unknown_16/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp"
-
-gUnknown_084F7E38:: @ 84F7E38
-	.incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8
-	.incbin "graphics/map_objects/pics/effects/unknown_16/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_0:: @ 84F7F38
-	.incbin "graphics/map_objects/pics/effects/unknown_17/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_1:: @ 84F7FB8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_2:: @ 84F8038
-	.incbin "graphics/map_objects/pics/effects/unknown_17/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_3:: @ 84F80B8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_4:: @ 84F8138
-	.incbin "graphics/map_objects/pics/effects/unknown_17/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_5:: @ 84F81B8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_6:: @ 84F8238
-	.incbin "graphics/map_objects/pics/effects/unknown_17/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown17_7:: @ 84F82B8
-	.incbin "graphics/map_objects/pics/effects/unknown_17/7.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_0:: @ 84F8338
-	.incbin "graphics/map_objects/pics/effects/unknown_18/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_1:: @ 84F83B8
-	.incbin "graphics/map_objects/pics/effects/unknown_18/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_2:: @ 84F8438
-	.incbin "graphics/map_objects/pics/effects/unknown_18/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown18_3:: @ 84F84B8
-	.incbin "graphics/map_objects/pics/effects/unknown_18/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_0:: @ 84F8538
-	.incbin "graphics/map_objects/pics/effects/long_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_1:: @ 84F85B8
-	.incbin "graphics/map_objects/pics/effects/long_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_2:: @ 84F8638
-	.incbin "graphics/map_objects/pics/effects/long_grass/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_LongGrass_3:: @ 84F86B8
-	.incbin "graphics/map_objects/pics/effects/long_grass/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_0:: @ 84F8738
-	.incbin "graphics/map_objects/pics/effects/tall_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_1:: @ 84F87B8
-	.incbin "graphics/map_objects/pics/effects/tall_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_2:: @ 84F8838
-	.incbin "graphics/map_objects/pics/effects/tall_grass/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_3:: @ 84F88B8
-	.incbin "graphics/map_objects/pics/effects/tall_grass/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TallGrass_4:: @ 84F8938
-	.incbin "graphics/map_objects/pics/effects/tall_grass/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShortGrass_0:: @ 84F89B8
-	.incbin "graphics/map_objects/pics/effects/short_grass/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_ShortGrass_1:: @ 84F8A38
-	.incbin "graphics/map_objects/pics/effects/short_grass/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandFootprints_0:: @ 84F8AB8
-	.incbin "graphics/map_objects/pics/effects/sand_footprints/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandFootprints_1:: @ 84F8B38
-	.incbin "graphics/map_objects/pics/effects/sand_footprints/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_DeepSandFootprints_0:: @ 84F8BB8
-	.incbin "graphics/map_objects/pics/effects/deep_sand_footprints/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_DeepSandFootprints_1:: @ 84F8C38
-	.incbin "graphics/map_objects/pics/effects/deep_sand_footprints/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_0:: @ 84F8CB8
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_1:: @ 84F8D38
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_2:: @ 84F8DB8
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeTireTracks_3:: @ 84F8E38
-	.incbin "graphics/map_objects/pics/effects/bike_tire_tracks/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_0:: @ 84F8EB8
-	.incbin "graphics/map_objects/pics/effects/unknown_19/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_1:: @ 84F8F38
-	.incbin "graphics/map_objects/pics/effects/unknown_19/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_2:: @ 84F8FB8
-	.incbin "graphics/map_objects/pics/effects/unknown_19/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown19_3:: @ 84F9038
-	.incbin "graphics/map_objects/pics/effects/unknown_19/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown29_0:: @ 84F90B8
-	.incbin "graphics/map_objects/pics/effects/unknown_29/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown29_1:: @ 84F90F8
-	.incbin "graphics/map_objects/pics/effects/unknown_29/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown29_2:: @ 84F9138
-	.incbin "graphics/map_objects/pics/effects/unknown_29/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_0:: @ 84F9178
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_1:: @ 84F91F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_2:: @ 84F9278
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopBigSplash_3:: @ 84F92F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Splash_0:: @ 84F9378
-	.incbin "graphics/map_objects/pics/effects/splash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Splash_1:: @ 84F93B8
-	.incbin "graphics/map_objects/pics/effects/splash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopSmallSplash_0:: @ 84F93F8
-	.incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopSmallSplash_1:: @ 84F9438
-	.incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_BikeHopSmallSplash_2:: @ 84F9478
-	.incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_0:: @ 84F94B8
-	.incbin "graphics/map_objects/pics/effects/unknown_20/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_1:: @ 84F9538
-	.incbin "graphics/map_objects/pics/effects/unknown_20/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_2:: @ 84F95B8
-	.incbin "graphics/map_objects/pics/effects/unknown_20/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown20_3:: @ 84F9638
-	.incbin "graphics/map_objects/pics/effects/unknown_20/3.4bpp"
-
-	.align 2
-@ unreferenced
-gFieldEffectObjectPic_Unknown20_4:: @ 84F96B8
-	.incbin "graphics/map_objects/pics/effects/unknown_20/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_0:: @ 84F9738
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_1:: @ 84F9838
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_2:: @ 84F9938
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_3:: @ 84F9A38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_4:: @ 84F9B38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_5:: @ 84F9C38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_TreeDisguise_6:: @ 84F9D38
-	.incbin "graphics/map_objects/pics/effects/tree_disguise/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_0:: @ 84F9E38
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_1:: @ 84F9F38
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_2:: @ 84FA038
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_3:: @ 84FA138
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_4:: @ 84FA238
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_5:: @ 84FA338
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_MountainDisguise_6:: @ 84FA438
-	.incbin "graphics/map_objects/pics/effects/mountain_disguise/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_0:: @ 84FA538
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_1:: @ 84FA638
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_2:: @ 84FA738
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_3:: @ 84FA838
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_4:: @ 84FA938
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_5:: @ 84FAA38
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_SandDisguisePlaceholder_6:: @ 84FAB38
-	.incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_HotSpringsWater:: @ 84FAC38
-	.incbin "graphics/map_objects/pics/effects/hot_springs_water.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette2:: @ 84FACB8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_02.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_0:: @ 84FACD8
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_1:: @ 84FAD58
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_2:: @ 84FADD8
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_3:: @ 84FAE58
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_JumpOutOfAsh_4:: @ 84FAED8
-	.incbin "graphics/map_objects/pics/effects/jump_out_of_ash/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_0:: @ 84FAF58
-	.incbin "graphics/map_objects/pics/effects/unknown_33/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_1:: @ 84FAFD8
-	.incbin "graphics/map_objects/pics/effects/unknown_33/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_2:: @ 84FB058
-	.incbin "graphics/map_objects/pics/effects/unknown_33/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_3:: @ 84FB0D8
-	.incbin "graphics/map_objects/pics/effects/unknown_33/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown33_4:: @ 84FB158
-	.incbin "graphics/map_objects/pics/effects/unknown_33/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_0:: @ 84FB1D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_1:: @ 84FB2D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_2:: @ 84FB3D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/2.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_3:: @ 84FB4D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/3.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_4:: @ 84FB5D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/4.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_5:: @ 84FB6D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/5.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_6:: @ 84FB7D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/6.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Bubbles_7:: @ 84FB8D8
-	.incbin "graphics/map_objects/pics/effects/bubbles/7.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown35_0:: @ 84FB9D8
-	.incbin "graphics/map_objects/pics/effects/unknown_35/0.4bpp"
-
-	.align 2
-gFieldEffectObjectPic_Unknown35_1:: @ 84FBA58
-	.incbin "graphics/map_objects/pics/effects/unknown_35/1.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette3:: @ 84FBAD8
-	.incbin "graphics/map_objects/palettes/field_effect_object_palette_03.gbapal"
-
-	.align 2
-gFieldEffectObjectPic_Bird:: @ 84FBAF8
-	.incbin "graphics/map_objects/pics/effects/bird.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_0:: @ 84FBCF8
-	.incbin "graphics/map_objects/pics/people/juan/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_1:: @ 84FBDF8
-	.incbin "graphics/map_objects/pics/people/juan/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_2:: @ 84FBEF8
-	.incbin "graphics/map_objects/pics/people/juan/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_3:: @ 84FBFF8
-	.incbin "graphics/map_objects/pics/people/juan/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_4:: @ 84FC0F8
-	.incbin "graphics/map_objects/pics/people/juan/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_5:: @ 84FC1F8
-	.incbin "graphics/map_objects/pics/people/juan/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_6:: @ 84FC2F8
-	.incbin "graphics/map_objects/pics/people/juan/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_7:: @ 84FC3F8
-	.incbin "graphics/map_objects/pics/people/juan/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Juan_8:: @ 84FC4F8
-	.incbin "graphics/map_objects/pics/people/juan/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_0:: @ 84FC5F8
-	.incbin "graphics/map_objects/pics/people/scott/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_1:: @ 84FC6F8
-	.incbin "graphics/map_objects/pics/people/scott/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_2:: @ 84FC7F8
-	.incbin "graphics/map_objects/pics/people/scott/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_3:: @ 84FC8F8
-	.incbin "graphics/map_objects/pics/people/scott/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_4:: @ 84FC9F8
-	.incbin "graphics/map_objects/pics/people/scott/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_5:: @ 84FCAF8
-	.incbin "graphics/map_objects/pics/people/scott/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_6:: @ 84FCBF8
-	.incbin "graphics/map_objects/pics/people/scott/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_7:: @ 84FCCF8
-	.incbin "graphics/map_objects/pics/people/scott/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Scott_8:: @ 84FCDF8
-	.incbin "graphics/map_objects/pics/people/scott/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Statue:: @ 84FCEF8
-	.incbin "graphics/map_objects/pics/misc/statue.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_0:: @ 84FCFF8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_1:: @ 84FD0F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_2:: @ 84FD1F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_3:: @ 84FD2F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_4:: @ 84FD3F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_5:: @ 84FD4F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_6:: @ 84FD5F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_7:: @ 84FD6F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Kirlia_8:: @ 84FD7F8
-	.incbin "graphics/map_objects/pics/pokemon/kirlia/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_0:: @ 84FD8F8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_1:: @ 84FD9F8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_2:: @ 84FDAF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_3:: @ 84FDBF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_4:: @ 84FDCF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_5:: @ 84FDDF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_6:: @ 84FDEF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_7:: @ 84FDFF8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Dusclops_8:: @ 84FE0F8
-	.incbin "graphics/map_objects/pics/pokemon/dusclops/8.4bpp"
-
-	.align 2
-gFieldObjectPic_MysteryEventDeliveryman_0:: @ 84FE1F8
-	.incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/0.4bpp"
-
-	.align 2
-gFieldObjectPic_MysteryEventDeliveryman_1:: @ 84FE2F8
-	.incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/1.4bpp"
-
-	.align 2
-gFieldObjectPic_MysteryEventDeliveryman_2:: @ 84FE3F8
-	.incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/2.4bpp"
-
-	.align 2
-gFieldObjectPic_UnionRoomAttendant_0:: @ 84FE4F8
-	.incbin "graphics/map_objects/pics/people/union_room_attendant/0.4bpp"
-
-	.align 2
-gFieldObjectPic_UnionRoomAttendant_1:: @ 84FE5F8
-	.incbin "graphics/map_objects/pics/people/union_room_attendant/1.4bpp"
-
-	.align 2
-gFieldObjectPic_UnionRoomAttendant_2:: @ 84FE6F8
-	.incbin "graphics/map_objects/pics/people/union_room_attendant/2.4bpp"
-
-	.align 2
-gFieldObjectPic_MovingBox:: @ 84FE7F8
-	.incbin "graphics/map_objects/pics/misc/moving_box.4bpp"
-
-	.align 2
-gFieldObjectPalette19:: @ 84FE878
-	.incbin "graphics/map_objects/palettes/field_object_palette_19.gbapal"
-
-	.align 2
-gFieldObjectPic_Sudowoodo_0:: @ 84FE898
-	.incbin "graphics/map_objects/pics/pokemon/sudowoodo/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Sudowoodo_1:: @ 84FE998
-	.incbin "graphics/map_objects/pics/pokemon/sudowoodo/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Sudowoodo_2:: @ 84FEA98
-	.incbin "graphics/map_objects/pics/pokemon/sudowoodo/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_0:: @ 84FEB98
-	.incbin "graphics/map_objects/pics/pokemon/mew/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_1:: @ 84FEC98
-	.incbin "graphics/map_objects/pics/pokemon/mew/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_2:: @ 84FED98
-	.incbin "graphics/map_objects/pics/pokemon/mew/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_3:: @ 84FEE98
-	.incbin "graphics/map_objects/pics/pokemon/mew/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_4:: @ 84FEF98
-	.incbin "graphics/map_objects/pics/pokemon/mew/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_5:: @ 84FF098
-	.incbin "graphics/map_objects/pics/pokemon/mew/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_6:: @ 84FF198
-	.incbin "graphics/map_objects/pics/pokemon/mew/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_7:: @ 84FF298
-	.incbin "graphics/map_objects/pics/pokemon/mew/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Mew_8:: @ 84FF398
-	.incbin "graphics/map_objects/pics/pokemon/mew/8.4bpp"
-
-	.align 2
-gFieldObjectPalette28:: @ 84FF498
-	.incbin "graphics/map_objects/palettes/field_object_palette_28.gbapal"
-
-	.align 2
-gFieldObjectPic_Red_0:: @ 84FF4B8
-	.incbin "graphics/map_objects/pics/people/red/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_1:: @ 84FF5B8
-	.incbin "graphics/map_objects/pics/people/red/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_2:: @ 84FF6B8
-	.incbin "graphics/map_objects/pics/people/red/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_3:: @ 84FF7B8
-	.incbin "graphics/map_objects/pics/people/red/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_4:: @ 84FF8B8
-	.incbin "graphics/map_objects/pics/people/red/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_5:: @ 84FF9B8
-	.incbin "graphics/map_objects/pics/people/red/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_6:: @ 84FFAB8
-	.incbin "graphics/map_objects/pics/people/red/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_7:: @ 84FFBB8
-	.incbin "graphics/map_objects/pics/people/red/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Red_8:: @ 84FFCB8
-	.incbin "graphics/map_objects/pics/people/red/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_0:: @ 84FFDB8
-	.incbin "graphics/map_objects/pics/people/leaf/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_1:: @ 84FFEB8
-	.incbin "graphics/map_objects/pics/people/leaf/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_2:: @ 84FFFB8
-	.incbin "graphics/map_objects/pics/people/leaf/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_3:: @ 85000B8
-	.incbin "graphics/map_objects/pics/people/leaf/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_4:: @ 85001B8
-	.incbin "graphics/map_objects/pics/people/leaf/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_5:: @ 85002B8
-	.incbin "graphics/map_objects/pics/people/leaf/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_6:: @ 85003B8
-	.incbin "graphics/map_objects/pics/people/leaf/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_7:: @ 85004B8
-	.incbin "graphics/map_objects/pics/people/leaf/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Leaf_8:: @ 85005B8
-	.incbin "graphics/map_objects/pics/people/leaf/8.4bpp"
-
-	.align 2
-gFieldObjectPalette30:: @ 85006B8
-	.incbin "graphics/map_objects/palettes/field_object_palette_30.gbapal"
-
-	.align 2
-gFieldObjectPic_BirthIslandStone:: @ 85006D8
-	.incbin "graphics/map_objects/pics/misc/birth_island_stone.4bpp"
-
-	.align 2
-gFieldObjectPalette29:: @ 85008D8
-	.incbin "graphics/map_objects/palettes/field_object_palette_29.gbapal"
-
-	.align 2
-gFieldObjectPic_Deoxys_0:: @ 85008F8
-	.incbin "graphics/map_objects/pics/pokemon/deoxys/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Deoxys_1:: @ 8500AF8
-	.incbin "graphics/map_objects/pics/pokemon/deoxys/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_0:: @ 8500CF8
-	.incbin "graphics/map_objects/pics/people/anabel/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_1:: @ 8500DF8
-	.incbin "graphics/map_objects/pics/people/anabel/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_2:: @ 8500EF8
-	.incbin "graphics/map_objects/pics/people/anabel/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_3:: @ 8500FF8
-	.incbin "graphics/map_objects/pics/people/anabel/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_4:: @ 85010F8
-	.incbin "graphics/map_objects/pics/people/anabel/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_5:: @ 85011F8
-	.incbin "graphics/map_objects/pics/people/anabel/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_6:: @ 85012F8
-	.incbin "graphics/map_objects/pics/people/anabel/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_7:: @ 85013F8
-	.incbin "graphics/map_objects/pics/people/anabel/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Anabel_8:: @ 85014F8
-	.incbin "graphics/map_objects/pics/people/anabel/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_0:: @ 85015F8
-	.incbin "graphics/map_objects/pics/people/tucker/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_1:: @ 85016F8
-	.incbin "graphics/map_objects/pics/people/tucker/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_2:: @ 85017F8
-	.incbin "graphics/map_objects/pics/people/tucker/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_3:: @ 85018F8
-	.incbin "graphics/map_objects/pics/people/tucker/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_4:: @ 85019F8
-	.incbin "graphics/map_objects/pics/people/tucker/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_5:: @ 8501AF8
-	.incbin "graphics/map_objects/pics/people/tucker/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_6:: @ 8501BF8
-	.incbin "graphics/map_objects/pics/people/tucker/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_7:: @ 8501CF8
-	.incbin "graphics/map_objects/pics/people/tucker/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Tucker_8:: @ 8501DF8
-	.incbin "graphics/map_objects/pics/people/tucker/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_0:: @ 8501EF8
-	.incbin "graphics/map_objects/pics/people/spenser/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_1:: @ 8501FF8
-	.incbin "graphics/map_objects/pics/people/spenser/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_2:: @ 85020F8
-	.incbin "graphics/map_objects/pics/people/spenser/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_3:: @ 85021F8
-	.incbin "graphics/map_objects/pics/people/spenser/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_4:: @ 85022F8
-	.incbin "graphics/map_objects/pics/people/spenser/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_5:: @ 85023F8
-	.incbin "graphics/map_objects/pics/people/spenser/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_6:: @ 85024F8
-	.incbin "graphics/map_objects/pics/people/spenser/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_7:: @ 85025F8
-	.incbin "graphics/map_objects/pics/people/spenser/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Spenser_8:: @ 85026F8
-	.incbin "graphics/map_objects/pics/people/spenser/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_0:: @ 85027F8
-	.incbin "graphics/map_objects/pics/people/greta/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_1:: @ 85028F8
-	.incbin "graphics/map_objects/pics/people/greta/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_2:: @ 85029F8
-	.incbin "graphics/map_objects/pics/people/greta/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_3:: @ 8502AF8
-	.incbin "graphics/map_objects/pics/people/greta/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_4:: @ 8502BF8
-	.incbin "graphics/map_objects/pics/people/greta/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_5:: @ 8502CF8
-	.incbin "graphics/map_objects/pics/people/greta/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_6:: @ 8502DF8
-	.incbin "graphics/map_objects/pics/people/greta/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_7:: @ 8502EF8
-	.incbin "graphics/map_objects/pics/people/greta/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Greta_8:: @ 8502FF8
-	.incbin "graphics/map_objects/pics/people/greta/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_0:: @ 85030F8
-	.incbin "graphics/map_objects/pics/people/noland/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_1:: @ 85031F8
-	.incbin "graphics/map_objects/pics/people/noland/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_2:: @ 85032F8
-	.incbin "graphics/map_objects/pics/people/noland/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_3:: @ 85033F8
-	.incbin "graphics/map_objects/pics/people/noland/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_4:: @ 85034F8
-	.incbin "graphics/map_objects/pics/people/noland/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_5:: @ 85035F8
-	.incbin "graphics/map_objects/pics/people/noland/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_6:: @ 85036F8
-	.incbin "graphics/map_objects/pics/people/noland/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_7:: @ 85037F8
-	.incbin "graphics/map_objects/pics/people/noland/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Noland_8:: @ 85038F8
-	.incbin "graphics/map_objects/pics/people/noland/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_0:: @ 85039F8
-	.incbin "graphics/map_objects/pics/people/lucy/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_1:: @ 8503AF8
-	.incbin "graphics/map_objects/pics/people/lucy/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_2:: @ 8503BF8
-	.incbin "graphics/map_objects/pics/people/lucy/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_3:: @ 8503CF8
-	.incbin "graphics/map_objects/pics/people/lucy/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_4:: @ 8503DF8
-	.incbin "graphics/map_objects/pics/people/lucy/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_5:: @ 8503EF8
-	.incbin "graphics/map_objects/pics/people/lucy/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_6:: @ 8503FF8
-	.incbin "graphics/map_objects/pics/people/lucy/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_7:: @ 85040F8
-	.incbin "graphics/map_objects/pics/people/lucy/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Lucy_8:: @ 85041F8
-	.incbin "graphics/map_objects/pics/people/lucy/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_0:: @ 85042F8
-	.incbin "graphics/map_objects/pics/people/brandon/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_1:: @ 85043F8
-	.incbin "graphics/map_objects/pics/people/brandon/1.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_2:: @ 85044F8
-	.incbin "graphics/map_objects/pics/people/brandon/2.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_3:: @ 85045F8
-	.incbin "graphics/map_objects/pics/people/brandon/3.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_4:: @ 85046F8
-	.incbin "graphics/map_objects/pics/people/brandon/4.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_5:: @ 85047F8
-	.incbin "graphics/map_objects/pics/people/brandon/5.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_6:: @ 85048F8
-	.incbin "graphics/map_objects/pics/people/brandon/6.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_7:: @ 85049F8
-	.incbin "graphics/map_objects/pics/people/brandon/7.4bpp"
-
-	.align 2
-gFieldObjectPic_Brandon_8:: @ 8504AF8
-	.incbin "graphics/map_objects/pics/people/brandon/8.4bpp"
-
-	.align 2
-gFieldObjectPic_Lugia_0:: @ 8504BF8
-	.incbin "graphics/map_objects/pics/pokemon/lugia/0.4bpp"
-
-	.align 2
-gFieldObjectPic_Lugia_1:: @ 8504DF8
-	.incbin "graphics/map_objects/pics/pokemon/lugia/1.4bpp"
-
-	.align 2
-gFieldObjectPalette32:: @ 8504FF8
-	.incbin "graphics/map_objects/palettes/field_object_palette_32.gbapal"
-
-	.align 2
-gFieldObjectPic_HoOh_0:: @ 8505018
-	.incbin "graphics/map_objects/pics/pokemon/ho_oh/0.4bpp"
-
-	.align 2
-gFieldObjectPic_HoOh_1:: @ 8505218
-	.incbin "graphics/map_objects/pics/pokemon/ho_oh/1.4bpp"
-
-	.align 2
-gFieldObjectPalette31:: @ 8505418
-	.incbin "graphics/map_objects/palettes/field_object_palette_31.gbapal"
diff --git a/data/graphics/field_objects/field_object_graphics_info.inc b/data/graphics/field_objects/field_object_graphics_info.inc
deleted file mode 100644
index 6a0778adf..000000000
--- a/data/graphics/field_objects/field_object_graphics_info.inc
+++ /dev/null
@@ -1,4164 +0,0 @@
-	.align 2
-gFieldObjectGraphicsInfo_BrendanNormal:: @ 8509954
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_BrendanNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanMachBike:: @ 8509978
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanAcroBike:: @ 850999C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_BrendanAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanSurfing:: @ 85099C0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_BrendanSurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanFieldMove:: @ 85099E4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_BrendanFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_QuintyPlump:: @ 8509A08
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110B @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_L << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_QuintyPlump
-	.4byte gFieldObjectPicTable_QuintyPlump
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleBoy1:: @ 8509A2C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleBoy1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleGirl1:: @ 8509A50
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleGirl1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy1:: @ 8509A74
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Girl1:: @ 8509A98
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Girl1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy2:: @ 8509ABC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Girl2:: @ 8509AE0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Girl2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleBoy2:: @ 8509B04
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleBoy2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LittleGirl2:: @ 8509B28
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LittleGirl2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy3:: @ 8509B4C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Girl3:: @ 8509B70
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Girl3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy4:: @ 8509B94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy4
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman1:: @ 8509BB8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_FatMan:: @ 8509BDC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_FatMan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman2:: @ 8509C00
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man1:: @ 8509C24
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman3:: @ 8509C48
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldMan1:: @ 8509C6C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldWoman1:: @ 8509C90
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldWoman1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man2:: @ 8509CB4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman4:: @ 8509CD8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman4
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man3:: @ 8509CFC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man3
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman5:: @ 8509D20
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman5
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Cook:: @ 8509D44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Cook
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman6:: @ 8509D68
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman6
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldMan2:: @ 8509D8C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_OldWoman2:: @ 8509DB0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_OldWoman2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Camper:: @ 8509DD4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Camper
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Picnicker:: @ 8509DF8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Picnicker
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man4:: @ 8509E1C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man4
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Woman7:: @ 8509E40
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Woman7
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Youngster:: @ 8509E64
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Youngster
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BugCatcher:: @ 8509E88
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BugCatcher
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PsychicM:: @ 8509EAC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_PsychicM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SchoolKidM:: @ 8509ED0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SchoolKidM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Maniac:: @ 8509EF4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Maniac
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_HexManiac:: @ 8509F18
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_HexManiac
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Rayquaza1:: @ 8509F3C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 2048 @ image size
-	.2byte 64 @ width
-	.2byte 64 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_64x64
-	.4byte gFieldObjectSpriteOamTables_64x64
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RayquazaStill
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SwimmerM:: @ 8509F60
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SwimmerM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SwimmerF:: @ 8509F84
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SwimmerF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BlackBelt:: @ 8509FA8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BlackBelt
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Beauty:: @ 8509FCC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Beauty
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Scientist1:: @ 8509FF0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Scientist1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Lass:: @ 850A014
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Lass
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Gentleman:: @ 850A038
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Gentleman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Sailor:: @ 850A05C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Sailor
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Fisherman:: @ 850A080
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Fisherman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RunningTriathleteM:: @ 850A0A4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RunningTriathleteM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RunningTriathleteF:: @ 850A0C8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RunningTriathleteF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TuberF:: @ 850A0EC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_TuberF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TuberM:: @ 850A110
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_TuberM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Hiker:: @ 850A134
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Hiker
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CyclingTriathleteM:: @ 850A158
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_CyclingTriathleteM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CyclingTriathleteF:: @ 850A17C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_CyclingTriathleteF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Nurse:: @ 850A1A0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Nurse
-	.4byte gFieldObjectPicTable_Nurse
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ItemBall:: @ 850A1C4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ItemBall
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BerryTree:: @ 850A1E8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte NULL @ sprite OAM tables
-	.4byte gFieldObjectImageAnimTable_BerryTree
-	.4byte gFieldObjectPicTable_PechaBerryTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BerryTreeEarlyStages:: @ 850A20C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_BerryTree
-	.4byte gFieldObjectPicTable_PechaBerryTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BerryTreeLateStages:: @ 850A230
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BerryTree
-	.4byte gFieldObjectPicTable_PechaBerryTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ProfBirch:: @ 850A254
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ProfBirch
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man5:: @ 850A278
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man5
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man6:: @ 850A29C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man6
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ReporterM:: @ 850A2C0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ReporterM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ReporterF:: @ 850A2E4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ReporterF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Bard:: @ 850A308
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Hipster:: @ 850A32C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Trader:: @ 850A350
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan1
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Storyteller:: @ 850A374
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Giddy:: @ 850A398
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1:: @ 850A3BC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2:: @ 850A3E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MauvilleOldMan2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedNatuDoll:: @ 850A404
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedNatuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedMagnemiteDoll:: @ 850A428
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedMagnemiteDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedSquirtleDoll:: @ 850A44C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedSquirtleDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedWooperDoll:: @ 850A470
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedWooperDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedPikachuDoll:: @ 850A494
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedPikachuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnusedPorygon2Doll:: @ 850A4B8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_UnusedPorygon2Doll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CuttableTree:: @ 850A4DC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_CuttableTree
-	.4byte gFieldObjectPicTable_CuttableTree
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MartEmployee:: @ 850A500
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MartEmployee
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RooftopSaleWoman:: @ 850A524
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RooftopSaleWoman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Teala:: @ 850A548
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Teala
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BreakableRock:: @ 850A56C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_BreakableRock
-	.4byte gFieldObjectPicTable_BreakableRock
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PushableBoulder:: @ 850A590
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PushableBoulder
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MrBrineysBoat:: @ 850A5B4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MrBrineysBoat
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayNormal:: @ 850A5D8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_MayNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayMachBike:: @ 850A5FC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayAcroBike:: @ 850A620
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_MayAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MaySurfing:: @ 850A644
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_MaySurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayFieldMove:: @ 850A668
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_MayFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Truck:: @ 850A68C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110D @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 1152 @ image size
-	.2byte 48 @ width
-	.2byte 48 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_Truck
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_Truck
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_VigorothCarryingBox:: @ 850A6B0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110E @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_VigorothCarryingBox
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_VigorothFacingAway:: @ 850A6D4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110E @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_VigorothFacingAway
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BirchsBag:: @ 850A6F8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BirchsBag
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_EnemyZigzagoon:: @ 850A71C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x110F @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_EnemyZigzagoon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Poochyena:: @ 850A740
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111C @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Poochyena
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Artist:: @ 850A764
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Artist
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanNormal:: @ 850A788
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_BrendanNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanMachBike:: @ 850A7AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanAcroBike:: @ 850A7D0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_BrendanAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanSurfing:: @ 850A7F4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_BrendanSurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalBrendanFieldMove:: @ 850A818
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_BrendanFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayNormal:: @ 850A83C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_MayNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayMachBike:: @ 850A860
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayMachBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayAcroBike:: @ 850A884
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_BIKE_TIRE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_AcroBike
-	.4byte gFieldObjectPicTable_MayAcroBike
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMaySurfing:: @ 850A8A8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Surfing
-	.4byte gFieldObjectPicTable_MaySurfing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RivalMayFieldMove:: @ 850A8CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_FieldMove
-	.4byte gFieldObjectPicTable_MayFieldMove
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Cameraman:: @ 850A8F0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Cameraman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanUnderwater:: @ 850A914
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1115 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanUnderwater
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayUnderwater:: @ 850A938
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1115 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayUnderwater
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MovingBox:: @ 850A95C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1112 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MovingBox
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CableCar:: @ 850A980
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1113 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 2048 @ image size
-	.2byte 64 @ width
-	.2byte 64 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_64x64
-	.4byte gFieldObjectSpriteOamTables_64x64
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_CableCar
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Scientist2:: @ 850A9A4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Scientist2
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Man7:: @ 850A9C8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Man7
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_AquaMemberM:: @ 850A9EC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_AquaMemberM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_AquaMemberF:: @ 850AA10
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_AquaMemberF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MagmaMemberM:: @ 850AA34
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MagmaMemberM
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MagmaMemberF:: @ 850AA58
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MagmaMemberF
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Sidney:: @ 850AA7C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Sidney
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Phoebe:: @ 850AAA0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Phoebe
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Glacia:: @ 850AAC4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Glacia
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Drake:: @ 850AAE8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Drake
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Roxanne:: @ 850AB0C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Roxanne
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Brawly:: @ 850AB30
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Brawly
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wattson:: @ 850AB54
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wattson
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Flannery:: @ 850AB78
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Flannery
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Norman:: @ 850AB9C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Norman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Winona:: @ 850ABC0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Winona
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Liza:: @ 850ABE4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Liza
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Tate:: @ 850AC08
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Tate
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wallace:: @ 850AC2C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wallace
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Steven:: @ 850AC50
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Steven
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wally:: @ 850AC74
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wally
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RubySapphireLittleBoy:: @ 850AC98
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RubySapphireLittleBoy
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanFishing:: @ 850ACBC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Fishing
-	.4byte gFieldObjectPicTable_BrendanFishing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayFishing:: @ 850ACE0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Fishing
-	.4byte gFieldObjectPicTable_MayFishing
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_HotSpringsOldWoman:: @ 850AD04
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_HotSpringsOldWoman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SSTidal:: @ 850AD28
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1114 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 1920 @ image size
-	.2byte 96 @ width
-	.2byte 40 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_8x8
-	.4byte gFieldObjectSpriteOamTables_SSTidal
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SSTidal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SubmarineShadow:: @ 850AD4C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111B @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 1408 @ image size
-	.2byte 88 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_8x8
-	.4byte gFieldObjectSpriteOamTables_SubmarineShadow
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_SubmarineShadow
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PichuDoll:: @ 850AD70
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PichuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PikachuDoll:: @ 850AD94
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PikachuDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MarillDoll:: @ 850ADB8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MarillDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TogepiDoll:: @ 850ADDC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TogepiDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_CyndaquilDoll:: @ 850AE00
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_CyndaquilDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ChikoritaDoll:: @ 850AE24
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ChikoritaDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TotodileDoll:: @ 850AE48
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TotodileDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_JigglypuffDoll:: @ 850AE6C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_JigglypuffDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MeowthDoll:: @ 850AE90
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MeowthDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ClefairyDoll:: @ 850AEB4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ClefairyDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_DittoDoll:: @ 850AED8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_DittoDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SmoochumDoll:: @ 850AEFC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SmoochumDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TreeckoDoll:: @ 850AF20
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TreeckoDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TorchicDoll:: @ 850AF44
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_TorchicDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MudkipDoll:: @ 850AF68
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MudkipDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_DuskullDoll:: @ 850AF8C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_DuskullDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_WynautDoll:: @ 850AFB0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_WynautDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BaltoyDoll:: @ 850AFD4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BaltoyDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_KecleonDoll:: @ 850AFF8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_KecleonDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_AzurillDoll:: @ 850B01C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_AzurillDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SkittyDoll:: @ 850B040
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SkittyDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SwabluDoll:: @ 850B064
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SwabluDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_GulpinDoll:: @ 850B088
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_GulpinDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LotadDoll:: @ 850B0AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_LotadDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SeedotDoll:: @ 850B0D0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SeedotDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_PikaCushion:: @ 850B0F4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_PikaCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RoundCushion:: @ 850B118
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_RoundCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_KissCushion:: @ 850B13C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_KissCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ZigzagCushion:: @ 850B160
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_ZigzagCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_SpinCushion:: @ 850B184
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_SpinCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_DiamondCushion:: @ 850B1A8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_DiamondCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BallCushion:: @ 850B1CC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BallCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_GrassCushion:: @ 850B1F0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_GrassCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_FireCushion:: @ 850B214
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_FireCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_WaterCushion:: @ 850B238
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_WaterCushion
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigSnorlaxDoll:: @ 850B25C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigSnorlaxDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRhydonDoll:: @ 850B280
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRhydonDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigLaprasDoll:: @ 850B2A4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigLaprasDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigVenusaurDoll:: @ 850B2C8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigVenusaurDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigCharizardDoll:: @ 850B2EC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigCharizardDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigBlastoiseDoll:: @ 850B310
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigBlastoiseDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigWailmerDoll:: @ 850B334
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigWailmerDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRegirockDoll:: @ 850B358
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRegirockDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRegiceDoll:: @ 850B37C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRegiceDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BigRegisteelDoll:: @ 850B3A0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BigRegisteelDoll
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Latias:: @ 850B3C4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LatiasLatios
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Latios:: @ 850B3E8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_LatiasLatios
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Boy5:: @ 850B40C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Boy5
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_ContestOldMan:: @ 850B430
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_ContestOldMan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanWatering:: @ 850B454
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_BrendanWatering
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayWatering:: @ 850B478
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MayWatering
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BrendanDecorating:: @ 850B49C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1100 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BrendanDecorating
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MayDecorating:: @ 850B4C0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_MayDecorating
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Archie:: @ 850B4E4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Archie
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Maxie:: @ 850B508
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Maxie
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kyogre1:: @ 850B52C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_KyogreFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Groudon1:: @ 850B550
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_GroudonFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Kyogre3:: @ 850B574
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_KyogreSide
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Groudon3:: @ 850B598
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Groudon3
-	.4byte gFieldObjectPicTable_GroudonSide
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Fossil:: @ 850B5BC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_NONE
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_Fossil
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Regirock:: @ 850B5E0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Regi
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Regice:: @ 850B604
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Regi
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Registeel:: @ 850B628
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Regi
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Skitty:: @ 850B64C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Skitty
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kecleon1:: @ 850B670
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Kecleon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kyogre2:: @ 850B694
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1116 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_KyogreFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Groudon2:: @ 850B6B8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1118 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_GroudonFront
-	.4byte gFieldObjectRotScalAnimTable_KyogreGroudon
-
-	.align 2
-gFieldObjectGraphicsInfo_Rayquaza2:: @ 850B6DC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 2048 @ image size
-	.2byte 64 @ width
-	.2byte 64 @ height
-	.byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_64x64
-	.4byte gFieldObjectSpriteOamTables_64x64
-	.4byte gFieldObjectImageAnimTable_Rayquaza2
-	.4byte gFieldObjectPicTable_Rayquaza
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Zigzagoon:: @ 850B700
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Zigzagoon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Pikachu:: @ 850B724
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Pikachu
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Azumarill:: @ 850B748
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Azumarill
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Wingull:: @ 850B76C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Wingull
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kecleon2:: @ 850B790
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Kecleon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_TuberMSwimming:: @ 850B7B4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1104 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_TuberMSwimming
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Azurill:: @ 850B7D8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 128 @ image size
-	.2byte 16 @ width
-	.2byte 16 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x16
-	.4byte gFieldObjectSpriteOamTables_16x16
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Azurill
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Mom:: @ 850B7FC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Mom
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LinkBrendan:: @ 850B820
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_BrendanNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_LinkMay:: @ 850B844
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1110 @ palette tag
-	.2byte 0x1102 @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_BrendanMayNormal
-	.4byte gFieldObjectPicTable_MayNormal
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Juan:: @ 850B868
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Juan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Scott:: @ 850B88C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Scott
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_MysteryEventDeliveryman:: @ 850B8B0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_MysteryEventDeliveryman
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Statue:: @ 850B8D4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_Statue
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Kirlia:: @ 850B8F8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Kirlia
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Dusclops:: @ 850B91C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Dusclops
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_UnionRoomAttendant:: @ 850B940
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_UnionRoomAttendant
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Red:: @ 850B964
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111D @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Red
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Leaf:: @ 850B988
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111D @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Leaf
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Sudowoodo:: @ 850B9AC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Sudowoodo
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Mew:: @ 850B9D0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Mew
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Deoxys:: @ 850B9F4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111E @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Deoxys
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_BirthIslandStone:: @ 850BA18
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x111F @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Inanimate
-	.4byte gFieldObjectPicTable_BirthIslandStone
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Anabel:: @ 850BA3C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Anabel
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Tucker:: @ 850BA60
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Tucker
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Greta:: @ 850BA84
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Greta
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Spenser:: @ 850BAA8
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1103 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Spenser
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Noland:: @ 850BACC
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Noland
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Lucy:: @ 850BAF0
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1106 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Lucy
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Brandon:: @ 850BB14
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1105 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Brandon
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RubySapphireBrendan:: @ 850BB38
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1122 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RubySapphireBrendan
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_RubySapphireMay:: @ 850BB5C
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1123 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 256 @ image size
-	.2byte 16 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_16x32
-	.4byte gFieldObjectSpriteOamTables_16x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_RubySapphireMay
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_Lugia:: @ 850BB80
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1121 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_Standard
-	.4byte gFieldObjectPicTable_Lugia
-	.4byte gDummySpriteAffineAnimTable
-
-	.align 2
-gFieldObjectGraphicsInfo_HoOh:: @ 850BBA4
-	.2byte 0xFFFF @ tiles tag
-	.2byte 0x1120 @ palette tag
-	.2byte 0x11FF @ palette tag 2
-	.2byte 512 @ image size
-	.2byte 32 @ width
-	.2byte 32 @ height
-	.byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot
-	.byte TRACKS_FOOT
-	.2byte 0 @ padding
-	.4byte gFieldObjectBaseOam_32x32
-	.4byte gFieldObjectSpriteOamTables_32x32
-	.4byte gFieldObjectImageAnimTable_HoOh
-	.4byte gFieldObjectPicTable_HoOh
-	.4byte gDummySpriteAffineAnimTable
diff --git a/data/graphics/field_objects/field_object_graphics_info_pointers.inc b/data/graphics/field_objects/field_object_graphics_info_pointers.inc
deleted file mode 100644
index 1faea449c..000000000
--- a/data/graphics/field_objects/field_object_graphics_info_pointers.inc
+++ /dev/null
@@ -1,251 +0,0 @@
-	.align 2
-gFieldObjectGraphicsInfoPointers:: @ 8505620
-	.4byte gFieldObjectGraphicsInfo_BrendanNormal
-	.4byte gFieldObjectGraphicsInfo_BrendanMachBike
-	.4byte gFieldObjectGraphicsInfo_BrendanSurfing
-	.4byte gFieldObjectGraphicsInfo_BrendanFieldMove
-	.4byte gFieldObjectGraphicsInfo_QuintyPlump
-	.4byte gFieldObjectGraphicsInfo_LittleBoy1
-	.4byte gFieldObjectGraphicsInfo_LittleGirl1
-	.4byte gFieldObjectGraphicsInfo_Boy1
-	.4byte gFieldObjectGraphicsInfo_Girl1
-	.4byte gFieldObjectGraphicsInfo_Boy2
-	.4byte gFieldObjectGraphicsInfo_Girl2
-	.4byte gFieldObjectGraphicsInfo_LittleBoy2
-	.4byte gFieldObjectGraphicsInfo_LittleGirl2
-	.4byte gFieldObjectGraphicsInfo_Boy3
-	.4byte gFieldObjectGraphicsInfo_Girl3
-	.4byte gFieldObjectGraphicsInfo_Boy4
-	.4byte gFieldObjectGraphicsInfo_Woman1
-	.4byte gFieldObjectGraphicsInfo_FatMan
-	.4byte gFieldObjectGraphicsInfo_Woman2
-	.4byte gFieldObjectGraphicsInfo_Man1
-	.4byte gFieldObjectGraphicsInfo_Woman3
-	.4byte gFieldObjectGraphicsInfo_OldMan1
-	.4byte gFieldObjectGraphicsInfo_OldWoman1
-	.4byte gFieldObjectGraphicsInfo_Man2
-	.4byte gFieldObjectGraphicsInfo_Woman4
-	.4byte gFieldObjectGraphicsInfo_Man3
-	.4byte gFieldObjectGraphicsInfo_Woman5
-	.4byte gFieldObjectGraphicsInfo_Cook
-	.4byte gFieldObjectGraphicsInfo_Woman6
-	.4byte gFieldObjectGraphicsInfo_OldMan2
-	.4byte gFieldObjectGraphicsInfo_OldWoman2
-	.4byte gFieldObjectGraphicsInfo_Camper
-	.4byte gFieldObjectGraphicsInfo_Picnicker
-	.4byte gFieldObjectGraphicsInfo_Man4
-	.4byte gFieldObjectGraphicsInfo_Woman7
-	.4byte gFieldObjectGraphicsInfo_Youngster
-	.4byte gFieldObjectGraphicsInfo_BugCatcher
-	.4byte gFieldObjectGraphicsInfo_PsychicM
-	.4byte gFieldObjectGraphicsInfo_SchoolKidM
-	.4byte gFieldObjectGraphicsInfo_Maniac
-	.4byte gFieldObjectGraphicsInfo_HexManiac
-	.4byte gFieldObjectGraphicsInfo_Rayquaza1
-	.4byte gFieldObjectGraphicsInfo_SwimmerM
-	.4byte gFieldObjectGraphicsInfo_SwimmerF
-	.4byte gFieldObjectGraphicsInfo_BlackBelt
-	.4byte gFieldObjectGraphicsInfo_Beauty
-	.4byte gFieldObjectGraphicsInfo_Scientist1
-	.4byte gFieldObjectGraphicsInfo_Lass
-	.4byte gFieldObjectGraphicsInfo_Gentleman
-	.4byte gFieldObjectGraphicsInfo_Sailor
-	.4byte gFieldObjectGraphicsInfo_Fisherman
-	.4byte gFieldObjectGraphicsInfo_RunningTriathleteM
-	.4byte gFieldObjectGraphicsInfo_RunningTriathleteF
-	.4byte gFieldObjectGraphicsInfo_TuberF
-	.4byte gFieldObjectGraphicsInfo_TuberM
-	.4byte gFieldObjectGraphicsInfo_Hiker
-	.4byte gFieldObjectGraphicsInfo_CyclingTriathleteM
-	.4byte gFieldObjectGraphicsInfo_CyclingTriathleteF
-	.4byte gFieldObjectGraphicsInfo_Nurse
-	.4byte gFieldObjectGraphicsInfo_ItemBall
-	.4byte gFieldObjectGraphicsInfo_BerryTree
-	.4byte gFieldObjectGraphicsInfo_BerryTreeEarlyStages
-	.4byte gFieldObjectGraphicsInfo_BerryTreeLateStages
-	.4byte gFieldObjectGraphicsInfo_BrendanAcroBike
-	.4byte gFieldObjectGraphicsInfo_ProfBirch
-	.4byte gFieldObjectGraphicsInfo_Man5
-	.4byte gFieldObjectGraphicsInfo_Man6
-	.4byte gFieldObjectGraphicsInfo_ReporterM
-	.4byte gFieldObjectGraphicsInfo_ReporterF
-	.4byte gFieldObjectGraphicsInfo_Bard
-	.4byte gFieldObjectGraphicsInfo_Anabel
-	.4byte gFieldObjectGraphicsInfo_Tucker
-	.4byte gFieldObjectGraphicsInfo_Greta
-	.4byte gFieldObjectGraphicsInfo_Spenser
-	.4byte gFieldObjectGraphicsInfo_Noland
-	.4byte gFieldObjectGraphicsInfo_Lucy
-	.4byte gFieldObjectGraphicsInfo_UnusedNatuDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedMagnemiteDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedSquirtleDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedWooperDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedPikachuDoll
-	.4byte gFieldObjectGraphicsInfo_UnusedPorygon2Doll
-	.4byte gFieldObjectGraphicsInfo_CuttableTree
-	.4byte gFieldObjectGraphicsInfo_MartEmployee
-	.4byte gFieldObjectGraphicsInfo_RooftopSaleWoman
-	.4byte gFieldObjectGraphicsInfo_Teala
-	.4byte gFieldObjectGraphicsInfo_BreakableRock
-	.4byte gFieldObjectGraphicsInfo_PushableBoulder
-	.4byte gFieldObjectGraphicsInfo_MrBrineysBoat
-	.4byte gFieldObjectGraphicsInfo_MayNormal
-	.4byte gFieldObjectGraphicsInfo_MayMachBike
-	.4byte gFieldObjectGraphicsInfo_MayAcroBike
-	.4byte gFieldObjectGraphicsInfo_MaySurfing
-	.4byte gFieldObjectGraphicsInfo_MayFieldMove
-	.4byte gFieldObjectGraphicsInfo_Truck
-	.4byte gFieldObjectGraphicsInfo_VigorothCarryingBox
-	.4byte gFieldObjectGraphicsInfo_VigorothFacingAway
-	.4byte gFieldObjectGraphicsInfo_BirchsBag
-	.4byte gFieldObjectGraphicsInfo_EnemyZigzagoon
-	.4byte gFieldObjectGraphicsInfo_Artist
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanNormal
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanMachBike
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanAcroBike
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanSurfing
-	.4byte gFieldObjectGraphicsInfo_RivalBrendanFieldMove
-	.4byte gFieldObjectGraphicsInfo_RivalMayNormal
-	.4byte gFieldObjectGraphicsInfo_RivalMayMachBike
-	.4byte gFieldObjectGraphicsInfo_RivalMayAcroBike
-	.4byte gFieldObjectGraphicsInfo_RivalMaySurfing
-	.4byte gFieldObjectGraphicsInfo_RivalMayFieldMove
-	.4byte gFieldObjectGraphicsInfo_Cameraman
-	.4byte gFieldObjectGraphicsInfo_BrendanUnderwater
-	.4byte gFieldObjectGraphicsInfo_MayUnderwater
-	.4byte gFieldObjectGraphicsInfo_MovingBox
-	.4byte gFieldObjectGraphicsInfo_CableCar
-	.4byte gFieldObjectGraphicsInfo_Scientist2
-	.4byte gFieldObjectGraphicsInfo_Man7
-	.4byte gFieldObjectGraphicsInfo_AquaMemberM
-	.4byte gFieldObjectGraphicsInfo_AquaMemberF
-	.4byte gFieldObjectGraphicsInfo_MagmaMemberM
-	.4byte gFieldObjectGraphicsInfo_MagmaMemberF
-	.4byte gFieldObjectGraphicsInfo_Sidney
-	.4byte gFieldObjectGraphicsInfo_Phoebe
-	.4byte gFieldObjectGraphicsInfo_Glacia
-	.4byte gFieldObjectGraphicsInfo_Drake
-	.4byte gFieldObjectGraphicsInfo_Roxanne
-	.4byte gFieldObjectGraphicsInfo_Brawly
-	.4byte gFieldObjectGraphicsInfo_Wattson
-	.4byte gFieldObjectGraphicsInfo_Flannery
-	.4byte gFieldObjectGraphicsInfo_Norman
-	.4byte gFieldObjectGraphicsInfo_Winona
-	.4byte gFieldObjectGraphicsInfo_Liza
-	.4byte gFieldObjectGraphicsInfo_Tate
-	.4byte gFieldObjectGraphicsInfo_Wallace
-	.4byte gFieldObjectGraphicsInfo_Steven
-	.4byte gFieldObjectGraphicsInfo_Wally
-	.4byte gFieldObjectGraphicsInfo_RubySapphireLittleBoy
-	.4byte gFieldObjectGraphicsInfo_BrendanFishing
-	.4byte gFieldObjectGraphicsInfo_MayFishing
-	.4byte gFieldObjectGraphicsInfo_HotSpringsOldWoman
-	.4byte gFieldObjectGraphicsInfo_SSTidal
-	.4byte gFieldObjectGraphicsInfo_SubmarineShadow
-	.4byte gFieldObjectGraphicsInfo_PichuDoll
-	.4byte gFieldObjectGraphicsInfo_PikachuDoll
-	.4byte gFieldObjectGraphicsInfo_MarillDoll
-	.4byte gFieldObjectGraphicsInfo_TogepiDoll
-	.4byte gFieldObjectGraphicsInfo_CyndaquilDoll
-	.4byte gFieldObjectGraphicsInfo_ChikoritaDoll
-	.4byte gFieldObjectGraphicsInfo_TotodileDoll
-	.4byte gFieldObjectGraphicsInfo_JigglypuffDoll
-	.4byte gFieldObjectGraphicsInfo_MeowthDoll
-	.4byte gFieldObjectGraphicsInfo_ClefairyDoll
-	.4byte gFieldObjectGraphicsInfo_DittoDoll
-	.4byte gFieldObjectGraphicsInfo_SmoochumDoll
-	.4byte gFieldObjectGraphicsInfo_TreeckoDoll
-	.4byte gFieldObjectGraphicsInfo_TorchicDoll
-	.4byte gFieldObjectGraphicsInfo_MudkipDoll
-	.4byte gFieldObjectGraphicsInfo_DuskullDoll
-	.4byte gFieldObjectGraphicsInfo_WynautDoll
-	.4byte gFieldObjectGraphicsInfo_BaltoyDoll
-	.4byte gFieldObjectGraphicsInfo_KecleonDoll
-	.4byte gFieldObjectGraphicsInfo_AzurillDoll
-	.4byte gFieldObjectGraphicsInfo_SkittyDoll
-	.4byte gFieldObjectGraphicsInfo_SwabluDoll
-	.4byte gFieldObjectGraphicsInfo_GulpinDoll
-	.4byte gFieldObjectGraphicsInfo_LotadDoll
-	.4byte gFieldObjectGraphicsInfo_SeedotDoll
-	.4byte gFieldObjectGraphicsInfo_PikaCushion
-	.4byte gFieldObjectGraphicsInfo_RoundCushion
-	.4byte gFieldObjectGraphicsInfo_KissCushion
-	.4byte gFieldObjectGraphicsInfo_ZigzagCushion
-	.4byte gFieldObjectGraphicsInfo_SpinCushion
-	.4byte gFieldObjectGraphicsInfo_DiamondCushion
-	.4byte gFieldObjectGraphicsInfo_BallCushion
-	.4byte gFieldObjectGraphicsInfo_GrassCushion
-	.4byte gFieldObjectGraphicsInfo_FireCushion
-	.4byte gFieldObjectGraphicsInfo_WaterCushion
-	.4byte gFieldObjectGraphicsInfo_BigSnorlaxDoll
-	.4byte gFieldObjectGraphicsInfo_BigRhydonDoll
-	.4byte gFieldObjectGraphicsInfo_BigLaprasDoll
-	.4byte gFieldObjectGraphicsInfo_BigVenusaurDoll
-	.4byte gFieldObjectGraphicsInfo_BigCharizardDoll
-	.4byte gFieldObjectGraphicsInfo_BigBlastoiseDoll
-	.4byte gFieldObjectGraphicsInfo_BigWailmerDoll
-	.4byte gFieldObjectGraphicsInfo_BigRegirockDoll
-	.4byte gFieldObjectGraphicsInfo_BigRegiceDoll
-	.4byte gFieldObjectGraphicsInfo_BigRegisteelDoll
-	.4byte gFieldObjectGraphicsInfo_Latias
-	.4byte gFieldObjectGraphicsInfo_Latios
-	.4byte gFieldObjectGraphicsInfo_Boy5
-	.4byte gFieldObjectGraphicsInfo_ContestOldMan
-	.4byte gFieldObjectGraphicsInfo_BrendanWatering
-	.4byte gFieldObjectGraphicsInfo_MayWatering
-	.4byte gFieldObjectGraphicsInfo_BrendanDecorating
-	.4byte gFieldObjectGraphicsInfo_MayDecorating
-	.4byte gFieldObjectGraphicsInfo_Archie
-	.4byte gFieldObjectGraphicsInfo_Maxie
-	.4byte gFieldObjectGraphicsInfo_Kyogre1
-	.4byte gFieldObjectGraphicsInfo_Groudon1
-	.4byte gFieldObjectGraphicsInfo_Fossil
-	.4byte gFieldObjectGraphicsInfo_Regirock
-	.4byte gFieldObjectGraphicsInfo_Regice
-	.4byte gFieldObjectGraphicsInfo_Registeel
-	.4byte gFieldObjectGraphicsInfo_Skitty
-	.4byte gFieldObjectGraphicsInfo_Kecleon1
-	.4byte gFieldObjectGraphicsInfo_Kyogre2
-	.4byte gFieldObjectGraphicsInfo_Groudon2
-	.4byte gFieldObjectGraphicsInfo_Rayquaza2
-	.4byte gFieldObjectGraphicsInfo_Zigzagoon
-	.4byte gFieldObjectGraphicsInfo_Pikachu
-	.4byte gFieldObjectGraphicsInfo_Azumarill
-	.4byte gFieldObjectGraphicsInfo_Wingull
-	.4byte gFieldObjectGraphicsInfo_Kecleon2
-	.4byte gFieldObjectGraphicsInfo_TuberMSwimming
-	.4byte gFieldObjectGraphicsInfo_Azurill
-	.4byte gFieldObjectGraphicsInfo_Mom
-	.4byte gFieldObjectGraphicsInfo_LinkBrendan
-	.4byte gFieldObjectGraphicsInfo_LinkMay
-	.4byte gFieldObjectGraphicsInfo_Juan
-	.4byte gFieldObjectGraphicsInfo_Scott
-	.4byte gFieldObjectGraphicsInfo_Poochyena
-	.4byte gFieldObjectGraphicsInfo_Kyogre3
-	.4byte gFieldObjectGraphicsInfo_Groudon3
-	.4byte gFieldObjectGraphicsInfo_MysteryEventDeliveryman
-	.4byte gFieldObjectGraphicsInfo_Statue
-	.4byte gFieldObjectGraphicsInfo_Kirlia
-	.4byte gFieldObjectGraphicsInfo_Dusclops
-	.4byte gFieldObjectGraphicsInfo_UnionRoomAttendant
-	.4byte gFieldObjectGraphicsInfo_Sudowoodo
-	.4byte gFieldObjectGraphicsInfo_Mew
-	.4byte gFieldObjectGraphicsInfo_Red
-	.4byte gFieldObjectGraphicsInfo_Leaf
-	.4byte gFieldObjectGraphicsInfo_Deoxys
-	.4byte gFieldObjectGraphicsInfo_BirthIslandStone
-	.4byte gFieldObjectGraphicsInfo_Brandon
-	.4byte gFieldObjectGraphicsInfo_RubySapphireBrendan
-	.4byte gFieldObjectGraphicsInfo_RubySapphireMay
-	.4byte gFieldObjectGraphicsInfo_Lugia
-	.4byte gFieldObjectGraphicsInfo_HoOh
-
-	.align 2
-gMauvilleOldManGraphicsInfoPointers:: @ 85059DC
-	.4byte gFieldObjectGraphicsInfo_Bard
-	.4byte gFieldObjectGraphicsInfo_Hipster
-	.4byte gFieldObjectGraphicsInfo_Trader
-	.4byte gFieldObjectGraphicsInfo_Storyteller
-	.4byte gFieldObjectGraphicsInfo_Giddy
-	.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1
-	.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2
diff --git a/data/graphics/field_objects/field_object_oam.inc b/data/graphics/field_objects/field_object_oam.inc
deleted file mode 100644
index ea4da1c02..000000000
--- a/data/graphics/field_objects/field_object_oam.inc
+++ /dev/null
@@ -1,465 +0,0 @@
-	.align 2
-gFieldObjectBaseOam_8x8:: @ 85094EC
-	.4byte OAM_SIZE_8x8
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_16x8:: @ 85094F4
-	.4byte OAM_SIZE_16x8
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_16x16:: @ 85094FC
-	.4byte OAM_SIZE_16x16
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_32x8:: @ 8509504
-	.4byte OAM_SIZE_32x8
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_64x32:: @ 850950C
-	.4byte OAM_SIZE_64x32
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_16x32:: @ 8509514
-	.4byte OAM_SIZE_16x32
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_32x32:: @ 850951C
-	.4byte OAM_SIZE_32x32
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectBaseOam_64x64:: @ 8509524
-	.4byte OAM_SIZE_64x64
-	.2byte 2 << 10 @ priority
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_0:: @ 850952C
-	subsprite  -8,  -8, 2,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_1:: @ 8509530
-	subsprite  -8,  -8, 1,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_2:: @ 8509534
-	subsprite  -8,  -8, 2,  0, 16x8
-	subsprite  -8,   0, 3,  2, 16x8
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_3:: @ 850953C
-	subsprite  -8,  -8, 2,  0, 16x16
-	subsprite  -8,  -8, 3,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x16_4:: @ 8509544
-	subsprite  -8,  -8, 1,  0, 16x16
-	subsprite  -8,  -8, 3,  0, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTables_16x16:: @ 850954C
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_0:: @ 850957C
-	subsprite  -8, -16, 2,  0, 16x32
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_1:: @ 8509580
-	subsprite  -8, -16, 1,  0, 16x32
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_2:: @ 8509584
-	subsprite  -8, -16, 2,  0, 16x16
-	subsprite  -8,   0, 2,  4, 16x8
-	subsprite  -8,   8, 3,  6, 16x8
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_3:: @ 8509590
-	subsprite  -8, -16, 2,  0, 16x16
-	subsprite  -8,   0, 3,  4, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTable_16x32_4:: @ 8509598
-	subsprite  -8, -16, 1,  0, 16x16
-	subsprite  -8,   0, 3,  4, 16x16
-
-	.align 2
-gFieldObjectSpriteOamTables_16x32:: @ 85095A0
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge
-
-	.4byte 3 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0
-	subsprite -16, -16, 2,  0, 32x32
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4
-	subsprite -16, -16, 1,  0, 32x32
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8
-	subsprite -16, -16, 2,  0, 32x16
-	subsprite -16,   0, 2,  8, 32x8
-	subsprite -16,   8, 3, 12, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4
-	subsprite -16, -16, 2,  0, 32x16
-	subsprite -16,   0, 3,  8, 32x16
-
-	.align 2
-gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC
-	subsprite -16, -16, 1,  0, 32x16
-	subsprite -16,   0, 3,  8, 32x16
-
-	.align 2
-gFieldObjectSpriteOamTables_32x32:: @ 85095F4
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge
-
-	.4byte 3 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge
-
-	.4byte 2 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
-	subsprite -24, -24, 2,  0, 32x8
-	subsprite   8, -24, 2,  4, 16x8
-	subsprite -24, -16, 2,  6, 32x8
-	subsprite   8, -16, 2, 10, 16x8
-	subsprite -24,  -8, 2, 12, 32x8
-	subsprite   8,  -8, 2, 16, 16x8
-	subsprite -24,   0, 2, 18, 32x8
-	subsprite   8,   0, 2, 22, 16x8
-	subsprite -24,   8, 2, 24, 32x8
-	subsprite   8,   8, 2, 28, 16x8
-	subsprite -24,  16, 2, 30, 32x8
-	subsprite   8,  16, 2, 34, 16x8
-
-	.align 2
-gFieldObjectSpriteOamTables_Truck:: @ 8509654
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge
-
-	.4byte 12 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_0:: @ 8509684
-	subsprite -32, -16, 2,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_1:: @ 8509688
-	subsprite -32, -16, 1,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_2:: @ 850968C
-	subsprite -32, -16, 2,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTable_Unused_3:: @ 8509690
-	subsprite -32, -16, 2,  0, 64x32
-
-	.align 2
-gFieldObjectSpriteOamTables_Unused:: @ 8509694
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4
-	subsprite -32, -32, 2,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8
-	subsprite -32, -32, 1,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC
-	subsprite -32, -32, 2,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0
-	subsprite -32, -32, 2,  0, 64x64
-
-	.align 2
-gFieldObjectSpriteOamTables_64x64:: @ 85096D4
-	.4byte 0 @ number of sprites
-	.4byte NULL @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge
-
-	.4byte 1 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 32x8
-	subsprite -48, -12, 2, 12, 32x8
-	subsprite -16, -12, 2, 16, 32x8
-	subsprite  16, -12, 2, 20, 32x8
-	subsprite -48,  -4, 2, 24, 32x8
-	subsprite -16,  -4, 2, 28, 32x8
-	subsprite  16,  -4, 2, 32, 32x8
-	subsprite -48,   4, 2, 36, 32x8
-	subsprite -16,   4, 2, 40, 32x8
-	subsprite  16,   4, 2, 44, 32x8
-	subsprite -48,  12, 2, 48, 32x8
-	subsprite -16,  12, 2, 52, 32x8
-	subsprite  16,  12, 2, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 32x8
-	subsprite -48, -12, 1, 12, 32x8
-	subsprite -16, -12, 1, 16, 32x8
-	subsprite  16, -12, 1, 20, 32x8
-	subsprite -48,  -4, 1, 24, 32x8
-	subsprite -16,  -4, 1, 28, 32x8
-	subsprite  16,  -4, 1, 32, 32x8
-	subsprite -48,   4, 1, 36, 32x8
-	subsprite -16,   4, 1, 40, 32x8
-	subsprite  16,   4, 1, 44, 32x8
-	subsprite -48,  12, 1, 48, 32x8
-	subsprite -16,  12, 1, 52, 32x8
-	subsprite  16,  12, 1, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 32x8
-	subsprite -48, -12, 2, 12, 32x8
-	subsprite -16, -12, 2, 16, 32x8
-	subsprite  16, -12, 2, 20, 32x8
-	subsprite -48,  -4, 2, 24, 32x8
-	subsprite -16,  -4, 2, 28, 32x8
-	subsprite  16,  -4, 2, 32, 32x8
-	subsprite -48,   4, 2, 36, 32x8
-	subsprite -16,   4, 2, 40, 32x8
-	subsprite  16,   4, 2, 44, 32x8
-	subsprite -48,  12, 2, 48, 32x8
-	subsprite -16,  12, 2, 52, 32x8
-	subsprite  16,  12, 2, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 32x8
-	subsprite -48, -12, 1, 12, 32x8
-	subsprite -16, -12, 1, 16, 32x8
-	subsprite  16, -12, 1, 20, 32x8
-	subsprite -48,  -4, 2, 24, 32x8
-	subsprite -16,  -4, 2, 28, 32x8
-	subsprite  16,  -4, 2, 32, 32x8
-	subsprite -48,   4, 2, 36, 32x8
-	subsprite -16,   4, 2, 40, 32x8
-	subsprite  16,   4, 2, 44, 32x8
-	subsprite -48,  12, 2, 48, 32x8
-	subsprite -16,  12, 2, 52, 32x8
-	subsprite  16,  12, 2, 56, 32x8
-
-	.align 2
-gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge
-
-	.4byte 15 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 16x8
-	subsprite  32, -20, 2, 10,  8x8
-	subsprite -48, -12, 2, 11, 32x8
-	subsprite -16, -12, 2, 15, 32x8
-	subsprite  16, -12, 2, 19, 16x8
-	subsprite  32, -12, 2, 21,  8x8
-	subsprite -48,  -4, 2, 22, 32x8
-	subsprite -16,  -4, 2, 26, 32x8
-	subsprite  16,  -4, 2, 30, 16x8
-	subsprite  32,  -4, 2, 32,  8x8
-	subsprite -48,   4, 2, 33, 32x8
-	subsprite -16,   4, 2, 37, 32x8
-	subsprite  16,   4, 2, 41, 16x8
-	subsprite  32,   4, 2, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 16x8
-	subsprite  32, -20, 1, 10,  8x8
-	subsprite -48, -12, 1, 11, 32x8
-	subsprite -16, -12, 1, 15, 32x8
-	subsprite  16, -12, 1, 19, 16x8
-	subsprite  32, -12, 1, 21,  8x8
-	subsprite -48,  -4, 1, 22, 32x8
-	subsprite -16,  -4, 1, 26, 32x8
-	subsprite  16,  -4, 1, 30, 16x8
-	subsprite  32,  -4, 1, 32,  8x8
-	subsprite -48,   4, 1, 33, 32x8
-	subsprite -16,   4, 1, 37, 32x8
-	subsprite  16,   4, 1, 41, 16x8
-	subsprite  32,   4, 1, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4
-	subsprite -48, -20, 2,  0, 32x8
-	subsprite -16, -20, 2,  4, 32x8
-	subsprite  16, -20, 2,  8, 16x8
-	subsprite  32, -20, 2, 10,  8x8
-	subsprite -48, -12, 2, 11, 32x8
-	subsprite -16, -12, 2, 15, 32x8
-	subsprite  16, -12, 2, 19, 16x8
-	subsprite  32, -12, 2, 21,  8x8
-	subsprite -48,  -4, 2, 22, 32x8
-	subsprite -16,  -4, 2, 26, 32x8
-	subsprite  16,  -4, 2, 30, 16x8
-	subsprite  32,  -4, 2, 32,  8x8
-	subsprite -48,   4, 2, 33, 32x8
-	subsprite -16,   4, 2, 37, 32x8
-	subsprite  16,   4, 2, 41, 16x8
-	subsprite  32,   4, 2, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4
-	subsprite -48, -20, 1,  0, 32x8
-	subsprite -16, -20, 1,  4, 32x8
-	subsprite  16, -20, 1,  8, 16x8
-	subsprite  32, -20, 1, 10,  8x8
-	subsprite -48, -12, 1, 11, 32x8
-	subsprite -16, -12, 1, 15, 32x8
-	subsprite  16, -12, 1, 19, 16x8
-	subsprite  32, -12, 1, 21,  8x8
-	subsprite -48,  -4, 2, 22, 32x8
-	subsprite -16,  -4, 2, 26, 32x8
-	subsprite  16,  -4, 2, 30, 16x8
-	subsprite  32,  -4, 2, 32,  8x8
-	subsprite -48,   4, 2, 33, 32x8
-	subsprite -16,   4, 2, 37, 32x8
-	subsprite  16,   4, 2, 41, 16x8
-	subsprite  32,   4, 2, 43,  8x8
-
-	.align 2
-gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge
-
-	.4byte 16 @ number of sprites
-	.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge
diff --git a/data/graphics/field_objects/field_object_pic_tables.inc b/data/graphics/field_objects/field_object_pic_tables.inc
deleted file mode 100644
index abd09d7c4..000000000
--- a/data/graphics/field_objects/field_object_pic_tables.inc
+++ /dev/null
@@ -1,2174 +0,0 @@
-	.align 2
-gFieldObjectPicTable_BrendanNormal:: @ 8505A8C
-	obj_tiles gFieldObjectPic_BrendanNormal_0, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_1, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_2, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_3, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_4, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_5, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_6, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_7, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_8, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_9, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_10, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_11, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_12, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_13, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_14, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_15, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_16, 0x100
-	obj_tiles gFieldObjectPic_BrendanNormal_17, 0x100
-
-	.align 2
-gFieldObjectPicTable_BrendanMachBike:: @ 8505B1C
-	obj_tiles gFieldObjectPic_BrendanMachBike_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_6, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_7, 0x200
-	obj_tiles gFieldObjectPic_BrendanMachBike_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanAcroBike:: @ 8505B64
-	obj_tiles gFieldObjectPic_BrendanAcroBike_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_6, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_7, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_8, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_9, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_10, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_11, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_12, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_13, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_14, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_15, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_16, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_17, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_18, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_19, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_20, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_21, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_22, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_23, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_24, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_25, 0x200
-	obj_tiles gFieldObjectPic_BrendanAcroBike_26, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanSurfing:: @ 8505C3C
-	obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanSurfing_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanUnderwater:: @ 8505C9C
-	obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanFieldMove:: @ 8505CE4
-	obj_tiles gFieldObjectPic_BrendanFieldMove_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanFieldMove_4, 0x200
-
-	.align 2
-gFieldObjectPicTable_QuintyPlump:: @ 8505D0C
-	obj_tiles gFieldObjectPic_QuintyPlump_0, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_1, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_2, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_3, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_4, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_5, 0x200
-	obj_tiles gFieldObjectPic_QuintyPlump_6, 0x200
-
-	.align 2
-gFieldObjectPicTable_LittleBoy1:: @ 8505D44
-	obj_tiles gFieldObjectPic_LittleBoy1_0, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_1, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_2, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_3, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_4, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_5, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_6, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_7, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy1_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_LittleGirl1:: @ 8505D8C
-	obj_tiles gFieldObjectPic_LittleGirl1_0, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_1, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_2, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_3, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_4, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_5, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_6, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_7, 0x100
-	obj_tiles gFieldObjectPic_LittleGirl1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Boy1:: @ 8505DD4
-	obj_tiles gFieldObjectPic_Boy1_0, 0x100
-	obj_tiles gFieldObjectPic_Boy1_1, 0x100
-	obj_tiles gFieldObjectPic_Boy1_2, 0x100
-	obj_tiles gFieldObjectPic_Boy1_3, 0x100
-	obj_tiles gFieldObjectPic_Boy1_4, 0x100
-	obj_tiles gFieldObjectPic_Boy1_5, 0x100
-	obj_tiles gFieldObjectPic_Boy1_6, 0x100
-	obj_tiles gFieldObjectPic_Boy1_7, 0x100
-	obj_tiles gFieldObjectPic_Boy1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Girl1:: @ 8505E1C
-	obj_tiles gFieldObjectPic_Girl1_0, 0x100
-	obj_tiles gFieldObjectPic_Girl1_1, 0x100
-	obj_tiles gFieldObjectPic_Girl1_2, 0x100
-	obj_tiles gFieldObjectPic_Girl1_3, 0x100
-	obj_tiles gFieldObjectPic_Girl1_4, 0x100
-	obj_tiles gFieldObjectPic_Girl1_5, 0x100
-	obj_tiles gFieldObjectPic_Girl1_6, 0x100
-	obj_tiles gFieldObjectPic_Girl1_7, 0x100
-	obj_tiles gFieldObjectPic_Girl1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Boy2:: @ 8505E64
-	obj_tiles gFieldObjectPic_Boy2_0, 0x100
-	obj_tiles gFieldObjectPic_Boy2_1, 0x100
-	obj_tiles gFieldObjectPic_Boy2_2, 0x100
-	obj_tiles gFieldObjectPic_Boy2_3, 0x100
-	obj_tiles gFieldObjectPic_Boy2_4, 0x100
-	obj_tiles gFieldObjectPic_Boy2_5, 0x100
-	obj_tiles gFieldObjectPic_Boy2_6, 0x100
-	obj_tiles gFieldObjectPic_Boy2_7, 0x100
-	obj_tiles gFieldObjectPic_Boy2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Girl2:: @ 8505EAC
-	obj_tiles gFieldObjectPic_Girl2_0, 0x100
-	obj_tiles gFieldObjectPic_Girl2_1, 0x100
-	obj_tiles gFieldObjectPic_Girl2_2, 0x100
-	obj_tiles gFieldObjectPic_Girl2_3, 0x100
-	obj_tiles gFieldObjectPic_Girl2_4, 0x100
-	obj_tiles gFieldObjectPic_Girl2_5, 0x100
-	obj_tiles gFieldObjectPic_Girl2_6, 0x100
-	obj_tiles gFieldObjectPic_Girl2_7, 0x100
-	obj_tiles gFieldObjectPic_Girl2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_LittleBoy2:: @ 8505EF4
-	obj_tiles gFieldObjectPic_LittleBoy2_0, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_1, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_2, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_3, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_4, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_5, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_6, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_7, 0x80
-	obj_tiles gFieldObjectPic_LittleBoy2_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_LittleGirl2:: @ 8505F3C
-	obj_tiles gFieldObjectPic_LittleGirl2_0, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_1, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_2, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_3, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_4, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_5, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_6, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_7, 0x80
-	obj_tiles gFieldObjectPic_LittleGirl2_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_Boy3:: @ 8505F84
-	obj_tiles gFieldObjectPic_Boy3_0, 0x100
-	obj_tiles gFieldObjectPic_Boy3_1, 0x100
-	obj_tiles gFieldObjectPic_Boy3_2, 0x100
-	obj_tiles gFieldObjectPic_Boy3_3, 0x100
-	obj_tiles gFieldObjectPic_Boy3_4, 0x100
-	obj_tiles gFieldObjectPic_Boy3_5, 0x100
-	obj_tiles gFieldObjectPic_Boy3_6, 0x100
-	obj_tiles gFieldObjectPic_Boy3_7, 0x100
-	obj_tiles gFieldObjectPic_Boy3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Girl3:: @ 8505FCC
-	obj_tiles gFieldObjectPic_Girl3_0, 0x100
-	obj_tiles gFieldObjectPic_Girl3_1, 0x100
-	obj_tiles gFieldObjectPic_Girl3_2, 0x100
-	obj_tiles gFieldObjectPic_Girl3_3, 0x100
-	obj_tiles gFieldObjectPic_Girl3_4, 0x100
-	obj_tiles gFieldObjectPic_Girl3_5, 0x100
-	obj_tiles gFieldObjectPic_Girl3_6, 0x100
-	obj_tiles gFieldObjectPic_Girl3_7, 0x100
-	obj_tiles gFieldObjectPic_Girl3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Boy4:: @ 8506014
-	obj_tiles gFieldObjectPic_Boy4_0, 0x100
-	obj_tiles gFieldObjectPic_Boy4_1, 0x100
-	obj_tiles gFieldObjectPic_Boy4_2, 0x100
-	obj_tiles gFieldObjectPic_Boy4_3, 0x100
-	obj_tiles gFieldObjectPic_Boy4_4, 0x100
-	obj_tiles gFieldObjectPic_Boy4_5, 0x100
-	obj_tiles gFieldObjectPic_Boy4_6, 0x100
-	obj_tiles gFieldObjectPic_Boy4_7, 0x100
-	obj_tiles gFieldObjectPic_Boy4_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman1:: @ 850605C
-	obj_tiles gFieldObjectPic_Woman1_0, 0x100
-	obj_tiles gFieldObjectPic_Woman1_1, 0x100
-	obj_tiles gFieldObjectPic_Woman1_2, 0x100
-	obj_tiles gFieldObjectPic_Woman1_3, 0x100
-	obj_tiles gFieldObjectPic_Woman1_4, 0x100
-	obj_tiles gFieldObjectPic_Woman1_5, 0x100
-	obj_tiles gFieldObjectPic_Woman1_6, 0x100
-	obj_tiles gFieldObjectPic_Woman1_7, 0x100
-	obj_tiles gFieldObjectPic_Woman1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_FatMan:: @ 85060A4
-	obj_tiles gFieldObjectPic_FatMan_0, 0x100
-	obj_tiles gFieldObjectPic_FatMan_1, 0x100
-	obj_tiles gFieldObjectPic_FatMan_2, 0x100
-	obj_tiles gFieldObjectPic_FatMan_3, 0x100
-	obj_tiles gFieldObjectPic_FatMan_4, 0x100
-	obj_tiles gFieldObjectPic_FatMan_5, 0x100
-	obj_tiles gFieldObjectPic_FatMan_6, 0x100
-	obj_tiles gFieldObjectPic_FatMan_7, 0x100
-	obj_tiles gFieldObjectPic_FatMan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman2:: @ 85060EC
-	obj_tiles gFieldObjectPic_Woman2_0, 0x100
-	obj_tiles gFieldObjectPic_Woman2_1, 0x100
-	obj_tiles gFieldObjectPic_Woman2_2, 0x100
-	obj_tiles gFieldObjectPic_Woman2_3, 0x100
-	obj_tiles gFieldObjectPic_Woman2_4, 0x100
-	obj_tiles gFieldObjectPic_Woman2_5, 0x100
-	obj_tiles gFieldObjectPic_Woman2_6, 0x100
-	obj_tiles gFieldObjectPic_Woman2_7, 0x100
-	obj_tiles gFieldObjectPic_Woman2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man1:: @ 8506134
-	obj_tiles gFieldObjectPic_Man1_0, 0x100
-	obj_tiles gFieldObjectPic_Man1_1, 0x100
-	obj_tiles gFieldObjectPic_Man1_2, 0x100
-	obj_tiles gFieldObjectPic_Man1_3, 0x100
-	obj_tiles gFieldObjectPic_Man1_4, 0x100
-	obj_tiles gFieldObjectPic_Man1_5, 0x100
-	obj_tiles gFieldObjectPic_Man1_6, 0x100
-	obj_tiles gFieldObjectPic_Man1_7, 0x100
-	obj_tiles gFieldObjectPic_Man1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman3:: @ 850617C
-	obj_tiles gFieldObjectPic_Woman3_0, 0x100
-	obj_tiles gFieldObjectPic_Woman3_1, 0x100
-	obj_tiles gFieldObjectPic_Woman3_2, 0x100
-	obj_tiles gFieldObjectPic_Woman3_3, 0x100
-	obj_tiles gFieldObjectPic_Woman3_4, 0x100
-	obj_tiles gFieldObjectPic_Woman3_5, 0x100
-	obj_tiles gFieldObjectPic_Woman3_6, 0x100
-	obj_tiles gFieldObjectPic_Woman3_7, 0x100
-	obj_tiles gFieldObjectPic_Woman3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldMan1:: @ 85061C4
-	obj_tiles gFieldObjectPic_OldMan1_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_2, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_3, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_4, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_5, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_6, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_7, 0x100
-	obj_tiles gFieldObjectPic_OldMan1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldWoman1:: @ 850620C
-	obj_tiles gFieldObjectPic_OldWoman1_0, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_1, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_2, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_3, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_4, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_5, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_6, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_7, 0x100
-	obj_tiles gFieldObjectPic_OldWoman1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man2:: @ 8506254
-	obj_tiles gFieldObjectPic_Man2_0, 0x100
-	obj_tiles gFieldObjectPic_Man2_1, 0x100
-	obj_tiles gFieldObjectPic_Man2_2, 0x100
-	obj_tiles gFieldObjectPic_Man2_3, 0x100
-	obj_tiles gFieldObjectPic_Man2_4, 0x100
-	obj_tiles gFieldObjectPic_Man2_5, 0x100
-	obj_tiles gFieldObjectPic_Man2_6, 0x100
-	obj_tiles gFieldObjectPic_Man2_7, 0x100
-	obj_tiles gFieldObjectPic_Man2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman4:: @ 850629C
-	obj_tiles gFieldObjectPic_Woman4_0, 0x100
-	obj_tiles gFieldObjectPic_Woman4_1, 0x100
-	obj_tiles gFieldObjectPic_Woman4_2, 0x100
-	obj_tiles gFieldObjectPic_Woman4_3, 0x100
-	obj_tiles gFieldObjectPic_Woman4_4, 0x100
-	obj_tiles gFieldObjectPic_Woman4_5, 0x100
-	obj_tiles gFieldObjectPic_Woman4_6, 0x100
-	obj_tiles gFieldObjectPic_Woman4_7, 0x100
-	obj_tiles gFieldObjectPic_Woman4_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man3:: @ 85062E4
-	obj_tiles gFieldObjectPic_Man3_0, 0x100
-	obj_tiles gFieldObjectPic_Man3_1, 0x100
-	obj_tiles gFieldObjectPic_Man3_2, 0x100
-	obj_tiles gFieldObjectPic_Man3_3, 0x100
-	obj_tiles gFieldObjectPic_Man3_4, 0x100
-	obj_tiles gFieldObjectPic_Man3_5, 0x100
-	obj_tiles gFieldObjectPic_Man3_6, 0x100
-	obj_tiles gFieldObjectPic_Man3_7, 0x100
-	obj_tiles gFieldObjectPic_Man3_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman5:: @ 850632C
-	obj_tiles gFieldObjectPic_Woman5_0, 0x100
-	obj_tiles gFieldObjectPic_Woman5_1, 0x100
-	obj_tiles gFieldObjectPic_Woman5_2, 0x100
-	obj_tiles gFieldObjectPic_Woman5_3, 0x100
-	obj_tiles gFieldObjectPic_Woman5_4, 0x100
-	obj_tiles gFieldObjectPic_Woman5_5, 0x100
-	obj_tiles gFieldObjectPic_Woman5_6, 0x100
-	obj_tiles gFieldObjectPic_Woman5_7, 0x100
-	obj_tiles gFieldObjectPic_Woman5_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Cook:: @ 8506374
-	obj_tiles gFieldObjectPic_Cook_0, 0x100
-	obj_tiles gFieldObjectPic_Cook_1, 0x100
-	obj_tiles gFieldObjectPic_Cook_2, 0x100
-	obj_tiles gFieldObjectPic_Cook_0, 0x100
-	obj_tiles gFieldObjectPic_Cook_0, 0x100
-	obj_tiles gFieldObjectPic_Cook_1, 0x100
-	obj_tiles gFieldObjectPic_Cook_1, 0x100
-	obj_tiles gFieldObjectPic_Cook_2, 0x100
-	obj_tiles gFieldObjectPic_Cook_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman6:: @ 85063BC
-	obj_tiles gFieldObjectPic_Woman6_0, 0x100
-	obj_tiles gFieldObjectPic_Woman6_1, 0x100
-	obj_tiles gFieldObjectPic_Woman6_2, 0x100
-	obj_tiles gFieldObjectPic_Woman6_3, 0x100
-	obj_tiles gFieldObjectPic_Woman6_4, 0x100
-	obj_tiles gFieldObjectPic_Woman6_5, 0x100
-	obj_tiles gFieldObjectPic_Woman6_6, 0x100
-	obj_tiles gFieldObjectPic_Woman6_7, 0x100
-	obj_tiles gFieldObjectPic_Woman6_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldMan2:: @ 8506404
-	obj_tiles gFieldObjectPic_OldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_2, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_2, 0x100
-	obj_tiles gFieldObjectPic_OldMan2_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_OldWoman2:: @ 850644C
-	obj_tiles gFieldObjectPic_OldWoman2_0, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_1, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_2, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_3, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_4, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_5, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_6, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_7, 0x100
-	obj_tiles gFieldObjectPic_OldWoman2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Camper:: @ 8506494
-	obj_tiles gFieldObjectPic_Camper_0, 0x100
-	obj_tiles gFieldObjectPic_Camper_1, 0x100
-	obj_tiles gFieldObjectPic_Camper_2, 0x100
-	obj_tiles gFieldObjectPic_Camper_3, 0x100
-	obj_tiles gFieldObjectPic_Camper_4, 0x100
-	obj_tiles gFieldObjectPic_Camper_5, 0x100
-	obj_tiles gFieldObjectPic_Camper_6, 0x100
-	obj_tiles gFieldObjectPic_Camper_7, 0x100
-	obj_tiles gFieldObjectPic_Camper_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Picnicker:: @ 85064DC
-	obj_tiles gFieldObjectPic_Picnicker_0, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_1, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_2, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_3, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_4, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_5, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_6, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_7, 0x100
-	obj_tiles gFieldObjectPic_Picnicker_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man4:: @ 8506524
-	obj_tiles gFieldObjectPic_Man4_0, 0x100
-	obj_tiles gFieldObjectPic_Man4_1, 0x100
-	obj_tiles gFieldObjectPic_Man4_2, 0x100
-	obj_tiles gFieldObjectPic_Man4_3, 0x100
-	obj_tiles gFieldObjectPic_Man4_4, 0x100
-	obj_tiles gFieldObjectPic_Man4_5, 0x100
-	obj_tiles gFieldObjectPic_Man4_6, 0x100
-	obj_tiles gFieldObjectPic_Man4_7, 0x100
-	obj_tiles gFieldObjectPic_Man4_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Woman7:: @ 850656C
-	obj_tiles gFieldObjectPic_Woman7_0, 0x100
-	obj_tiles gFieldObjectPic_Woman7_1, 0x100
-	obj_tiles gFieldObjectPic_Woman7_2, 0x100
-	obj_tiles gFieldObjectPic_Woman7_3, 0x100
-	obj_tiles gFieldObjectPic_Woman7_4, 0x100
-	obj_tiles gFieldObjectPic_Woman7_5, 0x100
-	obj_tiles gFieldObjectPic_Woman7_6, 0x100
-	obj_tiles gFieldObjectPic_Woman7_7, 0x100
-	obj_tiles gFieldObjectPic_Woman7_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Youngster:: @ 85065B4
-	obj_tiles gFieldObjectPic_Youngster_0, 0x100
-	obj_tiles gFieldObjectPic_Youngster_1, 0x100
-	obj_tiles gFieldObjectPic_Youngster_2, 0x100
-	obj_tiles gFieldObjectPic_Youngster_3, 0x100
-	obj_tiles gFieldObjectPic_Youngster_4, 0x100
-	obj_tiles gFieldObjectPic_Youngster_5, 0x100
-	obj_tiles gFieldObjectPic_Youngster_6, 0x100
-	obj_tiles gFieldObjectPic_Youngster_7, 0x100
-	obj_tiles gFieldObjectPic_Youngster_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BugCatcher:: @ 85065FC
-	obj_tiles gFieldObjectPic_BugCatcher_0, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_1, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_2, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_3, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_4, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_5, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_6, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_7, 0x100
-	obj_tiles gFieldObjectPic_BugCatcher_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_PsychicM:: @ 8506644
-	obj_tiles gFieldObjectPic_PsychicM_0, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_1, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_2, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_3, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_4, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_5, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_6, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_7, 0x100
-	obj_tiles gFieldObjectPic_PsychicM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SchoolKidM:: @ 850668C
-	obj_tiles gFieldObjectPic_SchoolKidM_0, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_1, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_2, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_3, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_4, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_5, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_6, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_7, 0x100
-	obj_tiles gFieldObjectPic_SchoolKidM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Maniac:: @ 85066D4
-	obj_tiles gFieldObjectPic_Maniac_0, 0x100
-	obj_tiles gFieldObjectPic_Maniac_1, 0x100
-	obj_tiles gFieldObjectPic_Maniac_2, 0x100
-	obj_tiles gFieldObjectPic_Maniac_3, 0x100
-	obj_tiles gFieldObjectPic_Maniac_4, 0x100
-	obj_tiles gFieldObjectPic_Maniac_5, 0x100
-	obj_tiles gFieldObjectPic_Maniac_6, 0x100
-	obj_tiles gFieldObjectPic_Maniac_7, 0x100
-	obj_tiles gFieldObjectPic_Maniac_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_HexManiac:: @ 850671C
-	obj_tiles gFieldObjectPic_HexManiac_0, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_1, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_2, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_3, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_4, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_5, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_6, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_7, 0x100
-	obj_tiles gFieldObjectPic_HexManiac_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SwimmerM:: @ 8506764
-	obj_tiles gFieldObjectPic_SwimmerM_0, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_1, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_2, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_3, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_4, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_5, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_6, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_7, 0x100
-	obj_tiles gFieldObjectPic_SwimmerM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SwimmerF:: @ 85067AC
-	obj_tiles gFieldObjectPic_SwimmerF_0, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_1, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_2, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_3, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_4, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_5, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_6, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_7, 0x100
-	obj_tiles gFieldObjectPic_SwimmerF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BlackBelt:: @ 85067F4
-	obj_tiles gFieldObjectPic_BlackBelt_0, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_1, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_2, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_3, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_4, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_5, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_6, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_7, 0x100
-	obj_tiles gFieldObjectPic_BlackBelt_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Beauty:: @ 850683C
-	obj_tiles gFieldObjectPic_Beauty_0, 0x100
-	obj_tiles gFieldObjectPic_Beauty_1, 0x100
-	obj_tiles gFieldObjectPic_Beauty_2, 0x100
-	obj_tiles gFieldObjectPic_Beauty_3, 0x100
-	obj_tiles gFieldObjectPic_Beauty_4, 0x100
-	obj_tiles gFieldObjectPic_Beauty_5, 0x100
-	obj_tiles gFieldObjectPic_Beauty_6, 0x100
-	obj_tiles gFieldObjectPic_Beauty_7, 0x100
-	obj_tiles gFieldObjectPic_Beauty_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Scientist1:: @ 8506884
-	obj_tiles gFieldObjectPic_Scientist1_0, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_1, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_2, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_3, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_4, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_5, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_6, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_7, 0x100
-	obj_tiles gFieldObjectPic_Scientist1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Lass:: @ 85068CC
-	obj_tiles gFieldObjectPic_Lass_0, 0x100
-	obj_tiles gFieldObjectPic_Lass_1, 0x100
-	obj_tiles gFieldObjectPic_Lass_2, 0x100
-	obj_tiles gFieldObjectPic_Lass_3, 0x100
-	obj_tiles gFieldObjectPic_Lass_4, 0x100
-	obj_tiles gFieldObjectPic_Lass_5, 0x100
-	obj_tiles gFieldObjectPic_Lass_6, 0x100
-	obj_tiles gFieldObjectPic_Lass_7, 0x100
-	obj_tiles gFieldObjectPic_Lass_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Gentleman:: @ 8506914
-	obj_tiles gFieldObjectPic_Gentleman_0, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_1, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_2, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_3, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_4, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_5, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_6, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_7, 0x100
-	obj_tiles gFieldObjectPic_Gentleman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Sailor:: @ 850695C
-	obj_tiles gFieldObjectPic_Sailor_0, 0x100
-	obj_tiles gFieldObjectPic_Sailor_1, 0x100
-	obj_tiles gFieldObjectPic_Sailor_2, 0x100
-	obj_tiles gFieldObjectPic_Sailor_3, 0x100
-	obj_tiles gFieldObjectPic_Sailor_4, 0x100
-	obj_tiles gFieldObjectPic_Sailor_5, 0x100
-	obj_tiles gFieldObjectPic_Sailor_6, 0x100
-	obj_tiles gFieldObjectPic_Sailor_7, 0x100
-	obj_tiles gFieldObjectPic_Sailor_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Fisherman:: @ 85069A4
-	obj_tiles gFieldObjectPic_Fisherman_0, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_1, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_2, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_3, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_4, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_5, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_6, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_7, 0x100
-	obj_tiles gFieldObjectPic_Fisherman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RunningTriathleteM:: @ 85069EC
-	obj_tiles gFieldObjectPic_RunningTriathleteM_0, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_1, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_2, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_3, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_4, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_5, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_6, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_7, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RunningTriathleteF:: @ 8506A34
-	obj_tiles gFieldObjectPic_RunningTriathleteF_0, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_1, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_2, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_3, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_4, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_5, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_6, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_7, 0x100
-	obj_tiles gFieldObjectPic_RunningTriathleteF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_TuberF:: @ 8506A7C
-	obj_tiles gFieldObjectPic_TuberF_0, 0x80
-	obj_tiles gFieldObjectPic_TuberF_1, 0x80
-	obj_tiles gFieldObjectPic_TuberF_2, 0x80
-	obj_tiles gFieldObjectPic_TuberF_3, 0x80
-	obj_tiles gFieldObjectPic_TuberF_4, 0x80
-	obj_tiles gFieldObjectPic_TuberF_5, 0x80
-	obj_tiles gFieldObjectPic_TuberF_6, 0x80
-	obj_tiles gFieldObjectPic_TuberF_7, 0x80
-	obj_tiles gFieldObjectPic_TuberF_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_TuberM:: @ 8506AC4
-	obj_tiles gFieldObjectPic_TuberM_0, 0x80
-	obj_tiles gFieldObjectPic_TuberM_1, 0x80
-	obj_tiles gFieldObjectPic_TuberM_2, 0x80
-	obj_tiles gFieldObjectPic_TuberM_3, 0x80
-	obj_tiles gFieldObjectPic_TuberM_4, 0x80
-	obj_tiles gFieldObjectPic_TuberM_5, 0x80
-	obj_tiles gFieldObjectPic_TuberM_6, 0x80
-	obj_tiles gFieldObjectPic_TuberM_7, 0x80
-	obj_tiles gFieldObjectPic_TuberM_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_Hiker:: @ 8506B0C
-	obj_tiles gFieldObjectPic_Hiker_0, 0x100
-	obj_tiles gFieldObjectPic_Hiker_1, 0x100
-	obj_tiles gFieldObjectPic_Hiker_2, 0x100
-	obj_tiles gFieldObjectPic_Hiker_3, 0x100
-	obj_tiles gFieldObjectPic_Hiker_4, 0x100
-	obj_tiles gFieldObjectPic_Hiker_5, 0x100
-	obj_tiles gFieldObjectPic_Hiker_6, 0x100
-	obj_tiles gFieldObjectPic_Hiker_7, 0x100
-	obj_tiles gFieldObjectPic_Hiker_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_CyclingTriathleteM:: @ 8506B54
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_0, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_1, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_2, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_3, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_4, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_5, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_6, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_7, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteM_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_CyclingTriathleteF:: @ 8506B9C
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_0, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_1, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_2, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_3, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_4, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_5, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_6, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_7, 0x200
-	obj_tiles gFieldObjectPic_CyclingTriathleteF_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_Nurse:: @ 8506BE4
-	obj_tiles gFieldObjectPic_Nurse_0, 0x100
-	obj_tiles gFieldObjectPic_Nurse_1, 0x100
-	obj_tiles gFieldObjectPic_Nurse_2, 0x100
-	obj_tiles gFieldObjectPic_Nurse_0, 0x100
-	obj_tiles gFieldObjectPic_Nurse_0, 0x100
-	obj_tiles gFieldObjectPic_Nurse_1, 0x100
-	obj_tiles gFieldObjectPic_Nurse_1, 0x100
-	obj_tiles gFieldObjectPic_Nurse_2, 0x100
-	obj_tiles gFieldObjectPic_Nurse_2, 0x100
-	obj_tiles gFieldObjectPic_Nurse_3, 0x100
-
-	.align 2
-gFieldObjectPicTable_ItemBall:: @ 8506C34
-	obj_tiles gFieldObjectPic_ItemBall, 0x80
-
-	.align 2
-gFieldObjectPicTable_ProfBirch:: @ 8506C3C
-	obj_tiles gFieldObjectPic_ProfBirch_0, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_1, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_2, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_3, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_4, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_5, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_6, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_7, 0x100
-	obj_tiles gFieldObjectPic_ProfBirch_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man5:: @ 8506C84
-	obj_tiles gFieldObjectPic_Man5_0, 0x100
-	obj_tiles gFieldObjectPic_Man5_1, 0x100
-	obj_tiles gFieldObjectPic_Man5_2, 0x100
-	obj_tiles gFieldObjectPic_Man5_3, 0x100
-	obj_tiles gFieldObjectPic_Man5_4, 0x100
-	obj_tiles gFieldObjectPic_Man5_5, 0x100
-	obj_tiles gFieldObjectPic_Man5_6, 0x100
-	obj_tiles gFieldObjectPic_Man5_7, 0x100
-	obj_tiles gFieldObjectPic_Man5_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man6:: @ 8506CCC
-	obj_tiles gFieldObjectPic_Man6_0, 0x100
-	obj_tiles gFieldObjectPic_Man6_1, 0x100
-	obj_tiles gFieldObjectPic_Man6_2, 0x100
-	obj_tiles gFieldObjectPic_Man6_3, 0x100
-	obj_tiles gFieldObjectPic_Man6_4, 0x100
-	obj_tiles gFieldObjectPic_Man6_5, 0x100
-	obj_tiles gFieldObjectPic_Man6_6, 0x100
-	obj_tiles gFieldObjectPic_Man6_7, 0x100
-	obj_tiles gFieldObjectPic_Man6_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_ReporterM:: @ 8506D14
-	obj_tiles gFieldObjectPic_ReporterM_0, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_1, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_2, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_3, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_4, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_5, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_6, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_7, 0x100
-	obj_tiles gFieldObjectPic_ReporterM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_ReporterF:: @ 8506D5C
-	obj_tiles gFieldObjectPic_ReporterF_0, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_1, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_2, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_3, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_4, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_5, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_6, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_7, 0x100
-	obj_tiles gFieldObjectPic_ReporterF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MauvilleOldMan1:: @ 8506DA4
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_0, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_1, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_2, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_3, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_4, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_5, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_6, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_7, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan1_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MauvilleOldMan2:: @ 8506DEC
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_0, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_1, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_2, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_3, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_4, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_5, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_6, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_7, 0x100
-	obj_tiles gFieldObjectPic_MauvilleOldMan2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_UnusedNatuDoll:: @ 8506E34
-	obj_tiles gFieldObjectPic_UnusedNatuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedMagnemiteDoll:: @ 8506E3C
-	obj_tiles gFieldObjectPic_UnusedMagnemiteDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedSquirtleDoll:: @ 8506E44
-	obj_tiles gFieldObjectPic_UnusedSquirtleDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedWooperDoll:: @ 8506E4C
-	obj_tiles gFieldObjectPic_UnusedWooperDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedPikachuDoll:: @ 8506E54
-	obj_tiles gFieldObjectPic_UnusedPikachuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_UnusedPorygon2Doll:: @ 8506E5C
-	obj_tiles gFieldObjectPic_UnusedPorygon2Doll, 0x80
-
-	.align 2
-gFieldObjectPicTable_CuttableTree:: @ 8506E64
-	obj_tiles gFieldObjectPic_CuttableTree_0, 0x80
-	obj_tiles gFieldObjectPic_CuttableTree_1, 0x80
-	obj_tiles gFieldObjectPic_CuttableTree_2, 0x80
-	obj_tiles gFieldObjectPic_CuttableTree_3, 0x80
-
-	.align 2
-gFieldObjectPicTable_MartEmployee:: @ 8506E84
-	obj_tiles gFieldObjectPic_MartEmployee_0, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_1, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_2, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_3, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_4, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_5, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_6, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_7, 0x100
-	obj_tiles gFieldObjectPic_MartEmployee_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RooftopSaleWoman:: @ 8506ECC
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_0, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_1, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_2, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_3, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_4, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_5, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_6, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_7, 0x100
-	obj_tiles gFieldObjectPic_RooftopSaleWoman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Teala:: @ 8506F14
-	obj_tiles gFieldObjectPic_Teala_0, 0x100
-	obj_tiles gFieldObjectPic_Teala_1, 0x100
-	obj_tiles gFieldObjectPic_Teala_2, 0x100
-	obj_tiles gFieldObjectPic_Teala_3, 0x100
-	obj_tiles gFieldObjectPic_Teala_4, 0x100
-	obj_tiles gFieldObjectPic_Teala_5, 0x100
-	obj_tiles gFieldObjectPic_Teala_6, 0x100
-	obj_tiles gFieldObjectPic_Teala_7, 0x100
-	obj_tiles gFieldObjectPic_Teala_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BreakableRock:: @ 8506F5C
-	obj_tiles gFieldObjectPic_BreakableRock_0, 0x80
-	obj_tiles gFieldObjectPic_BreakableRock_1, 0x80
-	obj_tiles gFieldObjectPic_BreakableRock_2, 0x80
-	obj_tiles gFieldObjectPic_BreakableRock_3, 0x80
-
-	.align 2
-gFieldObjectPicTable_PushableBoulder:: @ 8506F7C
-	obj_tiles gFieldObjectPic_PushableBoulder, 0x80
-
-	.align 2
-gFieldObjectPicTable_MrBrineysBoat:: @ 8506F84
-	obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200
-	obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_Truck:: @ 8506FCC
-	obj_tiles gFieldObjectPic_Truck, 0x480
-
-	.align 2
-gFieldObjectPicTable_VigorothCarryingBox:: @ 8506FD4
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_VigorothFacingAway:: @ 850701C
-	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-	obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_BirchsBag:: @ 8507064
-	obj_tiles gFieldObjectPic_BirchsBag, 0x80
-
-	.align 2
-gFieldObjectPicTable_EnemyZigzagoon:: @ 850706C
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_0, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_1, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_2, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_3, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_4, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_5, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_6, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_7, 0x200
-	obj_tiles gFieldObjectPic_EnemyZigzagoon_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_Poochyena:: @ 85070B4
-	obj_tiles gFieldObjectPic_Poochyena_0, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_1, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_2, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_3, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_4, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_5, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_6, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_7, 0x200
-	obj_tiles gFieldObjectPic_Poochyena_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_Artist:: @ 85070FC
-	obj_tiles gFieldObjectPic_Artist_0, 0x100
-	obj_tiles gFieldObjectPic_Artist_1, 0x100
-	obj_tiles gFieldObjectPic_Artist_2, 0x100
-	obj_tiles gFieldObjectPic_Artist_3, 0x100
-	obj_tiles gFieldObjectPic_Artist_4, 0x100
-	obj_tiles gFieldObjectPic_Artist_5, 0x100
-	obj_tiles gFieldObjectPic_Artist_6, 0x100
-	obj_tiles gFieldObjectPic_Artist_7, 0x100
-	obj_tiles gFieldObjectPic_Artist_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MayNormal:: @ 8507144
-	obj_tiles gFieldObjectPic_MayNormal_0, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_1, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_2, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_3, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_4, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_5, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_6, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_7, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_8, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_9, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_10, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_11, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_12, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_13, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_14, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_15, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_16, 0x100
-	obj_tiles gFieldObjectPic_MayNormal_17, 0x100
-
-	.align 2
-gFieldObjectPicTable_MayMachBike:: @ 85071D4
-	obj_tiles gFieldObjectPic_MayMachBike_0, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_1, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_2, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_3, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_4, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_5, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_6, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_7, 0x200
-	obj_tiles gFieldObjectPic_MayMachBike_8, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayAcroBike:: @ 850721C
-	obj_tiles gFieldObjectPic_MayAcroBike_0, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_1, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_2, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_3, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_4, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_5, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_6, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_7, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_8, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_9, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_10, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_11, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_12, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_13, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_14, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_15, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_16, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_17, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_18, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_19, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_20, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_21, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_22, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_23, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_24, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_25, 0x200
-	obj_tiles gFieldObjectPic_MayAcroBike_26, 0x200
-
-	.align 2
-gFieldObjectPicTable_MaySurfing:: @ 85072F4
-	obj_tiles gFieldObjectPic_MaySurfing_0, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_1, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_2, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_0, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_0, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_1, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_1, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_2, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_2, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_3, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_4, 0x200
-	obj_tiles gFieldObjectPic_MaySurfing_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayUnderwater:: @ 8507354
-	obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200
-	obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayFieldMove:: @ 850739C
-	obj_tiles gFieldObjectPic_MayFieldMove_0, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_1, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_2, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_3, 0x200
-	obj_tiles gFieldObjectPic_MayFieldMove_4, 0x200
-
-	.align 2
-gFieldObjectPicTable_Cameraman:: @ 85073C4
-	obj_tiles gFieldObjectPic_Cameraman_0, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_1, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_2, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_3, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_4, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_5, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_6, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_7, 0x100
-	obj_tiles gFieldObjectPic_Cameraman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MovingBox:: @ 850740C
-	obj_tiles gFieldObjectPic_MovingBox, 0x80
-
-	.align 2
-gFieldObjectPicTable_CableCar:: @ 8507414
-	obj_tiles gFieldObjectPic_CableCar, 0x800
-
-	.align 2
-gFieldObjectPicTable_Scientist2:: @ 850741C
-	obj_tiles gFieldObjectPic_Scientist2_0, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_1, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_2, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_3, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_4, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_5, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_6, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_7, 0x100
-	obj_tiles gFieldObjectPic_Scientist2_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Man7:: @ 8507464
-	obj_tiles gFieldObjectPic_Man7_0, 0x100
-	obj_tiles gFieldObjectPic_Man7_1, 0x100
-	obj_tiles gFieldObjectPic_Man7_2, 0x100
-	obj_tiles gFieldObjectPic_Man7_3, 0x100
-	obj_tiles gFieldObjectPic_Man7_4, 0x100
-	obj_tiles gFieldObjectPic_Man7_5, 0x100
-	obj_tiles gFieldObjectPic_Man7_6, 0x100
-	obj_tiles gFieldObjectPic_Man7_7, 0x100
-	obj_tiles gFieldObjectPic_Man7_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_AquaMemberM:: @ 85074AC
-	obj_tiles gFieldObjectPic_AquaMemberM_0, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_1, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_2, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_3, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_4, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_5, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_6, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_7, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_AquaMemberF:: @ 85074F4
-	obj_tiles gFieldObjectPic_AquaMemberF_0, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_1, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_2, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_3, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_4, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_5, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_6, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_7, 0x100
-	obj_tiles gFieldObjectPic_AquaMemberF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MagmaMemberM:: @ 850753C
-	obj_tiles gFieldObjectPic_MagmaMemberM_0, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_1, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_2, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_3, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_4, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_5, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_6, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_7, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberM_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MagmaMemberF:: @ 8507584
-	obj_tiles gFieldObjectPic_MagmaMemberF_0, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_1, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_2, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_3, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_4, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_5, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_6, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_7, 0x100
-	obj_tiles gFieldObjectPic_MagmaMemberF_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Sidney:: @ 85075CC
-	obj_tiles gFieldObjectPic_Sidney_0, 0x100
-	obj_tiles gFieldObjectPic_Sidney_1, 0x100
-	obj_tiles gFieldObjectPic_Sidney_2, 0x100
-	obj_tiles gFieldObjectPic_Sidney_0, 0x100
-	obj_tiles gFieldObjectPic_Sidney_0, 0x100
-	obj_tiles gFieldObjectPic_Sidney_1, 0x100
-	obj_tiles gFieldObjectPic_Sidney_1, 0x100
-	obj_tiles gFieldObjectPic_Sidney_2, 0x100
-	obj_tiles gFieldObjectPic_Sidney_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Phoebe:: @ 8507614
-	obj_tiles gFieldObjectPic_Phoebe_0, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_1, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_2, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_0, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_0, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_1, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_1, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_2, 0x100
-	obj_tiles gFieldObjectPic_Phoebe_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Glacia:: @ 850765C
-	obj_tiles gFieldObjectPic_Glacia_0, 0x100
-	obj_tiles gFieldObjectPic_Glacia_1, 0x100
-	obj_tiles gFieldObjectPic_Glacia_2, 0x100
-	obj_tiles gFieldObjectPic_Glacia_0, 0x100
-	obj_tiles gFieldObjectPic_Glacia_0, 0x100
-	obj_tiles gFieldObjectPic_Glacia_1, 0x100
-	obj_tiles gFieldObjectPic_Glacia_1, 0x100
-	obj_tiles gFieldObjectPic_Glacia_2, 0x100
-	obj_tiles gFieldObjectPic_Glacia_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Drake:: @ 85076A4
-	obj_tiles gFieldObjectPic_Drake_0, 0x100
-	obj_tiles gFieldObjectPic_Drake_1, 0x100
-	obj_tiles gFieldObjectPic_Drake_2, 0x100
-	obj_tiles gFieldObjectPic_Drake_0, 0x100
-	obj_tiles gFieldObjectPic_Drake_0, 0x100
-	obj_tiles gFieldObjectPic_Drake_1, 0x100
-	obj_tiles gFieldObjectPic_Drake_1, 0x100
-	obj_tiles gFieldObjectPic_Drake_2, 0x100
-	obj_tiles gFieldObjectPic_Drake_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Roxanne:: @ 85076EC
-	obj_tiles gFieldObjectPic_Roxanne_0, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_1, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_2, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_0, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_0, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_1, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_1, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_2, 0x100
-	obj_tiles gFieldObjectPic_Roxanne_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Brawly:: @ 8507734
-	obj_tiles gFieldObjectPic_Brawly_0, 0x100
-	obj_tiles gFieldObjectPic_Brawly_1, 0x100
-	obj_tiles gFieldObjectPic_Brawly_2, 0x100
-	obj_tiles gFieldObjectPic_Brawly_0, 0x100
-	obj_tiles gFieldObjectPic_Brawly_0, 0x100
-	obj_tiles gFieldObjectPic_Brawly_1, 0x100
-	obj_tiles gFieldObjectPic_Brawly_1, 0x100
-	obj_tiles gFieldObjectPic_Brawly_2, 0x100
-	obj_tiles gFieldObjectPic_Brawly_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Wattson:: @ 850777C
-	obj_tiles gFieldObjectPic_Wattson_0, 0x100
-	obj_tiles gFieldObjectPic_Wattson_1, 0x100
-	obj_tiles gFieldObjectPic_Wattson_2, 0x100
-	obj_tiles gFieldObjectPic_Wattson_0, 0x100
-	obj_tiles gFieldObjectPic_Wattson_0, 0x100
-	obj_tiles gFieldObjectPic_Wattson_1, 0x100
-	obj_tiles gFieldObjectPic_Wattson_1, 0x100
-	obj_tiles gFieldObjectPic_Wattson_2, 0x100
-	obj_tiles gFieldObjectPic_Wattson_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Flannery:: @ 85077C4
-	obj_tiles gFieldObjectPic_Flannery_0, 0x100
-	obj_tiles gFieldObjectPic_Flannery_1, 0x100
-	obj_tiles gFieldObjectPic_Flannery_2, 0x100
-	obj_tiles gFieldObjectPic_Flannery_0, 0x100
-	obj_tiles gFieldObjectPic_Flannery_0, 0x100
-	obj_tiles gFieldObjectPic_Flannery_1, 0x100
-	obj_tiles gFieldObjectPic_Flannery_1, 0x100
-	obj_tiles gFieldObjectPic_Flannery_2, 0x100
-	obj_tiles gFieldObjectPic_Flannery_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Norman:: @ 850780C
-	obj_tiles gFieldObjectPic_Norman_0, 0x100
-	obj_tiles gFieldObjectPic_Norman_1, 0x100
-	obj_tiles gFieldObjectPic_Norman_2, 0x100
-	obj_tiles gFieldObjectPic_Norman_3, 0x100
-	obj_tiles gFieldObjectPic_Norman_4, 0x100
-	obj_tiles gFieldObjectPic_Norman_5, 0x100
-	obj_tiles gFieldObjectPic_Norman_6, 0x100
-	obj_tiles gFieldObjectPic_Norman_7, 0x100
-	obj_tiles gFieldObjectPic_Norman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Winona:: @ 8507854
-	obj_tiles gFieldObjectPic_Winona_0, 0x100
-	obj_tiles gFieldObjectPic_Winona_1, 0x100
-	obj_tiles gFieldObjectPic_Winona_2, 0x100
-	obj_tiles gFieldObjectPic_Winona_0, 0x100
-	obj_tiles gFieldObjectPic_Winona_0, 0x100
-	obj_tiles gFieldObjectPic_Winona_1, 0x100
-	obj_tiles gFieldObjectPic_Winona_1, 0x100
-	obj_tiles gFieldObjectPic_Winona_2, 0x100
-	obj_tiles gFieldObjectPic_Winona_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Liza:: @ 850789C
-	obj_tiles gFieldObjectPic_Liza_0, 0x100
-	obj_tiles gFieldObjectPic_Liza_1, 0x100
-	obj_tiles gFieldObjectPic_Liza_2, 0x100
-	obj_tiles gFieldObjectPic_Liza_0, 0x100
-	obj_tiles gFieldObjectPic_Liza_0, 0x100
-	obj_tiles gFieldObjectPic_Liza_1, 0x100
-	obj_tiles gFieldObjectPic_Liza_1, 0x100
-	obj_tiles gFieldObjectPic_Liza_2, 0x100
-	obj_tiles gFieldObjectPic_Liza_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Tate:: @ 85078E4
-	obj_tiles gFieldObjectPic_Tate_0, 0x100
-	obj_tiles gFieldObjectPic_Tate_1, 0x100
-	obj_tiles gFieldObjectPic_Tate_2, 0x100
-	obj_tiles gFieldObjectPic_Tate_0, 0x100
-	obj_tiles gFieldObjectPic_Tate_0, 0x100
-	obj_tiles gFieldObjectPic_Tate_1, 0x100
-	obj_tiles gFieldObjectPic_Tate_1, 0x100
-	obj_tiles gFieldObjectPic_Tate_2, 0x100
-	obj_tiles gFieldObjectPic_Tate_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Wallace:: @ 850792C
-	obj_tiles gFieldObjectPic_Wallace_0, 0x100
-	obj_tiles gFieldObjectPic_Wallace_1, 0x100
-	obj_tiles gFieldObjectPic_Wallace_2, 0x100
-	obj_tiles gFieldObjectPic_Wallace_3, 0x100
-	obj_tiles gFieldObjectPic_Wallace_4, 0x100
-	obj_tiles gFieldObjectPic_Wallace_5, 0x100
-	obj_tiles gFieldObjectPic_Wallace_6, 0x100
-	obj_tiles gFieldObjectPic_Wallace_7, 0x100
-	obj_tiles gFieldObjectPic_Wallace_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Steven:: @ 8507974
-	obj_tiles gFieldObjectPic_Steven_0, 0x100
-	obj_tiles gFieldObjectPic_Steven_1, 0x100
-	obj_tiles gFieldObjectPic_Steven_2, 0x100
-	obj_tiles gFieldObjectPic_Steven_3, 0x100
-	obj_tiles gFieldObjectPic_Steven_4, 0x100
-	obj_tiles gFieldObjectPic_Steven_5, 0x100
-	obj_tiles gFieldObjectPic_Steven_6, 0x100
-	obj_tiles gFieldObjectPic_Steven_7, 0x100
-	obj_tiles gFieldObjectPic_Steven_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Wally:: @ 85079BC
-	obj_tiles gFieldObjectPic_Wally_0, 0x100
-	obj_tiles gFieldObjectPic_Wally_1, 0x100
-	obj_tiles gFieldObjectPic_Wally_2, 0x100
-	obj_tiles gFieldObjectPic_Wally_3, 0x100
-	obj_tiles gFieldObjectPic_Wally_4, 0x100
-	obj_tiles gFieldObjectPic_Wally_5, 0x100
-	obj_tiles gFieldObjectPic_Wally_6, 0x100
-	obj_tiles gFieldObjectPic_Wally_7, 0x100
-	obj_tiles gFieldObjectPic_Wally_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RubySapphireLittleBoy:: @ 8507A04
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_0, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_1, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_2, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_3, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_4, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_5, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_6, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_7, 0x80
-	obj_tiles gFieldObjectPic_RubySapphireLittleBoy_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_BrendanFishing:: @ 8507A4C
-	obj_tiles gFieldObjectPic_BrendanFishing_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_6, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_7, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_8, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_9, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_10, 0x200
-	obj_tiles gFieldObjectPic_BrendanFishing_11, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayFishing:: @ 8507AAC
-	obj_tiles gFieldObjectPic_MayFishing_0, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_1, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_2, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_3, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_4, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_5, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_6, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_7, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_8, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_9, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_10, 0x200
-	obj_tiles gFieldObjectPic_MayFishing_11, 0x200
-
-	.align 2
-gFieldObjectPicTable_HotSpringsOldWoman:: @ 8507B0C
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_0, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_1, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_2, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_3, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_4, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_5, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_6, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_7, 0x100
-	obj_tiles gFieldObjectPic_HotSpringsOldWoman_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_SSTidal:: @ 8507B54
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-	obj_tiles gFieldObjectPic_SSTidal, 0x780
-
-	.align 2
-gFieldObjectPicTable_SubmarineShadow:: @ 8507B9C
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-	obj_tiles gFieldObjectPic_SubmarineShadow, 0x580
-
-	.align 2
-gFieldObjectPicTable_PichuDoll:: @ 8507BE4
-	obj_tiles gFieldObjectPic_PichuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_PikachuDoll:: @ 8507BEC
-	obj_tiles gFieldObjectPic_PikachuDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_MarillDoll:: @ 8507BF4
-	obj_tiles gFieldObjectPic_MarillDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TogepiDoll:: @ 8507BFC
-	obj_tiles gFieldObjectPic_TogepiDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_CyndaquilDoll:: @ 8507C04
-	obj_tiles gFieldObjectPic_CyndaquilDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_ChikoritaDoll:: @ 8507C0C
-	obj_tiles gFieldObjectPic_ChikoritaDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TotodileDoll:: @ 8507C14
-	obj_tiles gFieldObjectPic_TotodileDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_JigglypuffDoll:: @ 8507C1C
-	obj_tiles gFieldObjectPic_JigglypuffDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_MeowthDoll:: @ 8507C24
-	obj_tiles gFieldObjectPic_MeowthDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_ClefairyDoll:: @ 8507C2C
-	obj_tiles gFieldObjectPic_ClefairyDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_DittoDoll:: @ 8507C34
-	obj_tiles gFieldObjectPic_DittoDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SmoochumDoll:: @ 8507C3C
-	obj_tiles gFieldObjectPic_SmoochumDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TreeckoDoll:: @ 8507C44
-	obj_tiles gFieldObjectPic_TreeckoDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_TorchicDoll:: @ 8507C4C
-	obj_tiles gFieldObjectPic_TorchicDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_MudkipDoll:: @ 8507C54
-	obj_tiles gFieldObjectPic_MudkipDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_DuskullDoll:: @ 8507C5C
-	obj_tiles gFieldObjectPic_DuskullDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_WynautDoll:: @ 8507C64
-	obj_tiles gFieldObjectPic_WynautDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_BaltoyDoll:: @ 8507C6C
-	obj_tiles gFieldObjectPic_BaltoyDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_KecleonDoll:: @ 8507C74
-	obj_tiles gFieldObjectPic_KecleonDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_AzurillDoll:: @ 8507C7C
-	obj_tiles gFieldObjectPic_AzurillDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SkittyDoll:: @ 8507C84
-	obj_tiles gFieldObjectPic_SkittyDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SwabluDoll:: @ 8507C8C
-	obj_tiles gFieldObjectPic_SwabluDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_GulpinDoll:: @ 8507C94
-	obj_tiles gFieldObjectPic_GulpinDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_LotadDoll:: @ 8507C9C
-	obj_tiles gFieldObjectPic_LotadDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_SeedotDoll:: @ 8507CA4
-	obj_tiles gFieldObjectPic_SeedotDoll, 0x80
-
-	.align 2
-gFieldObjectPicTable_PikaCushion:: @ 8507CAC
-	obj_tiles gFieldObjectPic_PikaCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_RoundCushion:: @ 8507CB4
-	obj_tiles gFieldObjectPic_RoundCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_KissCushion:: @ 8507CBC
-	obj_tiles gFieldObjectPic_KissCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_ZigzagCushion:: @ 8507CC4
-	obj_tiles gFieldObjectPic_ZigzagCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_SpinCushion:: @ 8507CCC
-	obj_tiles gFieldObjectPic_SpinCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_DiamondCushion:: @ 8507CD4
-	obj_tiles gFieldObjectPic_DiamondCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_BallCushion:: @ 8507CDC
-	obj_tiles gFieldObjectPic_BallCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_GrassCushion:: @ 8507CE4
-	obj_tiles gFieldObjectPic_GrassCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_FireCushion:: @ 8507CEC
-	obj_tiles gFieldObjectPic_FireCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_WaterCushion:: @ 8507CF4
-	obj_tiles gFieldObjectPic_WaterCushion, 0x80
-
-	.align 2
-gFieldObjectPicTable_BigSnorlaxDoll:: @ 8507CFC
-	obj_tiles gFieldObjectPic_BigSnorlaxDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRhydonDoll:: @ 8507D04
-	obj_tiles gFieldObjectPic_BigRhydonDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigLaprasDoll:: @ 8507D0C
-	obj_tiles gFieldObjectPic_BigLaprasDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigVenusaurDoll:: @ 8507D14
-	obj_tiles gFieldObjectPic_BigVenusaurDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigCharizardDoll:: @ 8507D1C
-	obj_tiles gFieldObjectPic_BigCharizardDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigBlastoiseDoll:: @ 8507D24
-	obj_tiles gFieldObjectPic_BigBlastoiseDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigWailmerDoll:: @ 8507D2C
-	obj_tiles gFieldObjectPic_BigWailmerDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRegirockDoll:: @ 8507D34
-	obj_tiles gFieldObjectPic_BigRegirockDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRegiceDoll:: @ 8507D3C
-	obj_tiles gFieldObjectPic_BigRegiceDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_BigRegisteelDoll:: @ 8507D44
-	obj_tiles gFieldObjectPic_BigRegisteelDoll, 0x200
-
-	.align 2
-gFieldObjectPicTable_LatiasLatios:: @ 8507D4C
-	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200
-	obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200
-
-	.align 2
-gFieldObjectPicTable_Boy5:: @ 8507D94
-	obj_tiles gFieldObjectPic_Boy5_0, 0x100
-	obj_tiles gFieldObjectPic_Boy5_1, 0x100
-	obj_tiles gFieldObjectPic_Boy5_2, 0x100
-	obj_tiles gFieldObjectPic_Boy5_0, 0x100
-	obj_tiles gFieldObjectPic_Boy5_0, 0x100
-	obj_tiles gFieldObjectPic_Boy5_1, 0x100
-	obj_tiles gFieldObjectPic_Boy5_1, 0x100
-	obj_tiles gFieldObjectPic_Boy5_2, 0x100
-	obj_tiles gFieldObjectPic_Boy5_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_ContestOldMan:: @ 8507DDC
-	obj_tiles gFieldObjectPic_ContestOldMan_0, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_1, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_2, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_3, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_4, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_5, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_6, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_7, 0x100
-	obj_tiles gFieldObjectPic_ContestOldMan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_BrendanWatering:: @ 8507E24
-	obj_tiles gFieldObjectPic_BrendanWatering_0, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_1, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_2, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200
-	obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_MayWatering:: @ 8507E6C
-	obj_tiles gFieldObjectPic_MayWatering_0, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_1, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_2, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_3, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_3, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_4, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_4, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_5, 0x200
-	obj_tiles gFieldObjectPic_MayWatering_5, 0x200
-
-	.align 2
-gFieldObjectPicTable_BrendanDecorating:: @ 8507EB4
-	obj_tiles gFieldObjectPic_BrendanDecorating, 0x100
-
-	.align 2
-gFieldObjectPicTable_MayDecorating:: @ 8507EBC
-	obj_tiles gFieldObjectPic_MayDecorating, 0x100
-
-	.align 2
-gFieldObjectPicTable_Archie:: @ 8507EC4
-	obj_tiles gFieldObjectPic_Archie_0, 0x100
-	obj_tiles gFieldObjectPic_Archie_1, 0x100
-	obj_tiles gFieldObjectPic_Archie_2, 0x100
-	obj_tiles gFieldObjectPic_Archie_3, 0x100
-	obj_tiles gFieldObjectPic_Archie_4, 0x100
-	obj_tiles gFieldObjectPic_Archie_5, 0x100
-	obj_tiles gFieldObjectPic_Archie_6, 0x100
-	obj_tiles gFieldObjectPic_Archie_7, 0x100
-	obj_tiles gFieldObjectPic_Archie_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Maxie:: @ 8507F0C
-	obj_tiles gFieldObjectPic_Maxie_0, 0x100
-	obj_tiles gFieldObjectPic_Maxie_1, 0x100
-	obj_tiles gFieldObjectPic_Maxie_2, 0x100
-	obj_tiles gFieldObjectPic_Maxie_3, 0x100
-	obj_tiles gFieldObjectPic_Maxie_4, 0x100
-	obj_tiles gFieldObjectPic_Maxie_5, 0x100
-	obj_tiles gFieldObjectPic_Maxie_6, 0x100
-	obj_tiles gFieldObjectPic_Maxie_7, 0x100
-	obj_tiles gFieldObjectPic_Maxie_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_KyogreFront:: @ 8507F54
-	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreFront_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_GroudonFront:: @ 8507F9C
-	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonFront_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_KyogreSide:: @ 8507FE4
-	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_0, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-	obj_tiles gFieldObjectPic_KyogreSide_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_GroudonSide:: @ 850802C
-	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_0, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-	obj_tiles gFieldObjectPic_GroudonSide_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_Fossil:: @ 8508074
-	obj_tiles gFieldObjectPic_Fossil, 0x80
-
-	.align 2
-gFieldObjectPicTable_Regi:: @ 850807C
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-	obj_tiles gFieldObjectPic_Regi, 0x200
-
-	.align 2
-gFieldObjectPicTable_Skitty:: @ 85080C4
-	obj_tiles gFieldObjectPic_Skitty_0, 0x80
-	obj_tiles gFieldObjectPic_Skitty_1, 0x80
-	obj_tiles gFieldObjectPic_Skitty_2, 0x80
-	obj_tiles gFieldObjectPic_Skitty_0, 0x80
-	obj_tiles gFieldObjectPic_Skitty_0, 0x80
-	obj_tiles gFieldObjectPic_Skitty_1, 0x80
-	obj_tiles gFieldObjectPic_Skitty_1, 0x80
-	obj_tiles gFieldObjectPic_Skitty_2, 0x80
-	obj_tiles gFieldObjectPic_Skitty_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Kecleon:: @ 850810C
-	obj_tiles gFieldObjectPic_Kecleon_0, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_1, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_2, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_0, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_0, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_1, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_1, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_2, 0x80
-	obj_tiles gFieldObjectPic_Kecleon_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Rayquaza:: @ 8508154
-	obj_tiles gFieldObjectPic_Rayquaza_0, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_1, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_2, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_3, 0x800
-	obj_tiles gFieldObjectPic_Rayquaza_4, 0x800
-
-	.align 2
-gFieldObjectPicTable_RayquazaStill:: @ 850817C
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-	obj_tiles gFieldObjectPic_RayquazaStill, 0x800
-
-	.align 2
-gFieldObjectPicTable_Zigzagoon:: @ 85081C4
-	obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80
-	obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Pikachu:: @ 850820C
-	obj_tiles gFieldObjectPic_Pikachu_0, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_1, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_2, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_0, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_0, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_1, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_1, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_2, 0x80
-	obj_tiles gFieldObjectPic_Pikachu_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Azumarill:: @ 8508254
-	obj_tiles gFieldObjectPic_Azumarill_0, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_1, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_2, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_0, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_0, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_1, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_1, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_2, 0x80
-	obj_tiles gFieldObjectPic_Azumarill_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Wingull:: @ 850829C
-	obj_tiles gFieldObjectPic_Wingull_0, 0x80
-	obj_tiles gFieldObjectPic_Wingull_1, 0x80
-	obj_tiles gFieldObjectPic_Wingull_2, 0x80
-	obj_tiles gFieldObjectPic_Wingull_3, 0x80
-	obj_tiles gFieldObjectPic_Wingull_3, 0x80
-	obj_tiles gFieldObjectPic_Wingull_4, 0x80
-	obj_tiles gFieldObjectPic_Wingull_4, 0x80
-	obj_tiles gFieldObjectPic_Wingull_5, 0x80
-	obj_tiles gFieldObjectPic_Wingull_5, 0x80
-
-	.align 2
-gFieldObjectPicTable_TuberMSwimming:: @ 85082E4
-	obj_tiles gFieldObjectPic_TuberMSwimming_0, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_1, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_2, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_3, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_4, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_5, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_6, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_7, 0x80
-	obj_tiles gFieldObjectPic_TuberMSwimming_8, 0x80
-
-	.align 2
-gFieldObjectPicTable_Azurill:: @ 850832C
-	obj_tiles gFieldObjectPic_Azurill_0, 0x80
-	obj_tiles gFieldObjectPic_Azurill_1, 0x80
-	obj_tiles gFieldObjectPic_Azurill_2, 0x80
-	obj_tiles gFieldObjectPic_Azurill_0, 0x80
-	obj_tiles gFieldObjectPic_Azurill_0, 0x80
-	obj_tiles gFieldObjectPic_Azurill_1, 0x80
-	obj_tiles gFieldObjectPic_Azurill_1, 0x80
-	obj_tiles gFieldObjectPic_Azurill_2, 0x80
-	obj_tiles gFieldObjectPic_Azurill_2, 0x80
-
-	.align 2
-gFieldObjectPicTable_Mom:: @ 8508374
-	obj_tiles gFieldObjectPic_Mom_0, 0x100
-	obj_tiles gFieldObjectPic_Mom_1, 0x100
-	obj_tiles gFieldObjectPic_Mom_2, 0x100
-	obj_tiles gFieldObjectPic_Mom_3, 0x100
-	obj_tiles gFieldObjectPic_Mom_4, 0x100
-	obj_tiles gFieldObjectPic_Mom_5, 0x100
-	obj_tiles gFieldObjectPic_Mom_6, 0x100
-	obj_tiles gFieldObjectPic_Mom_7, 0x100
-	obj_tiles gFieldObjectPic_Mom_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Scott:: @ 85083BC
-	obj_tiles gFieldObjectPic_Scott_0, 0x100
-	obj_tiles gFieldObjectPic_Scott_1, 0x100
-	obj_tiles gFieldObjectPic_Scott_2, 0x100
-	obj_tiles gFieldObjectPic_Scott_3, 0x100
-	obj_tiles gFieldObjectPic_Scott_4, 0x100
-	obj_tiles gFieldObjectPic_Scott_5, 0x100
-	obj_tiles gFieldObjectPic_Scott_6, 0x100
-	obj_tiles gFieldObjectPic_Scott_7, 0x100
-	obj_tiles gFieldObjectPic_Scott_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Juan:: @ 8508404
-	obj_tiles gFieldObjectPic_Juan_0, 0x100
-	obj_tiles gFieldObjectPic_Juan_1, 0x100
-	obj_tiles gFieldObjectPic_Juan_2, 0x100
-	obj_tiles gFieldObjectPic_Juan_3, 0x100
-	obj_tiles gFieldObjectPic_Juan_4, 0x100
-	obj_tiles gFieldObjectPic_Juan_5, 0x100
-	obj_tiles gFieldObjectPic_Juan_6, 0x100
-	obj_tiles gFieldObjectPic_Juan_7, 0x100
-	obj_tiles gFieldObjectPic_Juan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_MysteryEventDeliveryman:: @ 850844C
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100
-	obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Statue:: @ 8508494
-	obj_tiles gFieldObjectPic_Statue, 0x100
-
-	.align 2
-gFieldObjectPicTable_Dusclops:: @ 850849C
-	obj_tiles gFieldObjectPic_Dusclops_0, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_1, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_2, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_3, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_4, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_5, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_6, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_7, 0x100
-	obj_tiles gFieldObjectPic_Dusclops_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Kirlia:: @ 85084E4
-	obj_tiles gFieldObjectPic_Kirlia_0, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_1, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_2, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_3, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_4, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_5, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_6, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_7, 0x100
-	obj_tiles gFieldObjectPic_Kirlia_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_UnionRoomAttendant:: @ 850852C
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100
-	obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Sudowoodo:: @ 8508574
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100
-	obj_tiles gFieldObjectPic_Sudowoodo_2, 0x100
-
-	.align 2
-gFieldObjectPicTable_Mew:: @ 85085BC
-	obj_tiles gFieldObjectPic_Mew_0, 0x100
-	obj_tiles gFieldObjectPic_Mew_1, 0x100
-	obj_tiles gFieldObjectPic_Mew_2, 0x100
-	obj_tiles gFieldObjectPic_Mew_3, 0x100
-	obj_tiles gFieldObjectPic_Mew_4, 0x100
-	obj_tiles gFieldObjectPic_Mew_5, 0x100
-	obj_tiles gFieldObjectPic_Mew_6, 0x100
-	obj_tiles gFieldObjectPic_Mew_7, 0x100
-	obj_tiles gFieldObjectPic_Mew_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Red:: @ 8508604
-	obj_tiles gFieldObjectPic_Red_0, 0x100
-	obj_tiles gFieldObjectPic_Red_1, 0x100
-	obj_tiles gFieldObjectPic_Red_2, 0x100
-	obj_tiles gFieldObjectPic_Red_3, 0x100
-	obj_tiles gFieldObjectPic_Red_4, 0x100
-	obj_tiles gFieldObjectPic_Red_5, 0x100
-	obj_tiles gFieldObjectPic_Red_6, 0x100
-	obj_tiles gFieldObjectPic_Red_7, 0x100
-	obj_tiles gFieldObjectPic_Red_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Leaf:: @ 850864C
-	obj_tiles gFieldObjectPic_Leaf_0, 0x100
-	obj_tiles gFieldObjectPic_Leaf_1, 0x100
-	obj_tiles gFieldObjectPic_Leaf_2, 0x100
-	obj_tiles gFieldObjectPic_Leaf_3, 0x100
-	obj_tiles gFieldObjectPic_Leaf_4, 0x100
-	obj_tiles gFieldObjectPic_Leaf_5, 0x100
-	obj_tiles gFieldObjectPic_Leaf_6, 0x100
-	obj_tiles gFieldObjectPic_Leaf_7, 0x100
-	obj_tiles gFieldObjectPic_Leaf_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Deoxys:: @ 8508694
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_1, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_1, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-	obj_tiles gFieldObjectPic_Deoxys_0, 0x200
-
-	.align 2
-gFieldObjectPicTable_BirthIslandStone:: @ 85086DC
-	obj_tiles gFieldObjectPic_BirthIslandStone, 0x200
-
-	.align 2
-gFieldObjectPicTable_Anabel:: @ 85086E4
-	obj_tiles gFieldObjectPic_Anabel_0, 0x100
-	obj_tiles gFieldObjectPic_Anabel_1, 0x100
-	obj_tiles gFieldObjectPic_Anabel_2, 0x100
-	obj_tiles gFieldObjectPic_Anabel_3, 0x100
-	obj_tiles gFieldObjectPic_Anabel_4, 0x100
-	obj_tiles gFieldObjectPic_Anabel_5, 0x100
-	obj_tiles gFieldObjectPic_Anabel_6, 0x100
-	obj_tiles gFieldObjectPic_Anabel_7, 0x100
-	obj_tiles gFieldObjectPic_Anabel_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Tucker:: @ 850872C
-	obj_tiles gFieldObjectPic_Tucker_0, 0x100
-	obj_tiles gFieldObjectPic_Tucker_1, 0x100
-	obj_tiles gFieldObjectPic_Tucker_2, 0x100
-	obj_tiles gFieldObjectPic_Tucker_3, 0x100
-	obj_tiles gFieldObjectPic_Tucker_4, 0x100
-	obj_tiles gFieldObjectPic_Tucker_5, 0x100
-	obj_tiles gFieldObjectPic_Tucker_6, 0x100
-	obj_tiles gFieldObjectPic_Tucker_7, 0x100
-	obj_tiles gFieldObjectPic_Tucker_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Spenser:: @ 8508774
-	obj_tiles gFieldObjectPic_Spenser_0, 0x100
-	obj_tiles gFieldObjectPic_Spenser_1, 0x100
-	obj_tiles gFieldObjectPic_Spenser_2, 0x100
-	obj_tiles gFieldObjectPic_Spenser_3, 0x100
-	obj_tiles gFieldObjectPic_Spenser_4, 0x100
-	obj_tiles gFieldObjectPic_Spenser_5, 0x100
-	obj_tiles gFieldObjectPic_Spenser_6, 0x100
-	obj_tiles gFieldObjectPic_Spenser_7, 0x100
-	obj_tiles gFieldObjectPic_Spenser_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Greta:: @ 85087BC
-	obj_tiles gFieldObjectPic_Greta_0, 0x100
-	obj_tiles gFieldObjectPic_Greta_1, 0x100
-	obj_tiles gFieldObjectPic_Greta_2, 0x100
-	obj_tiles gFieldObjectPic_Greta_3, 0x100
-	obj_tiles gFieldObjectPic_Greta_4, 0x100
-	obj_tiles gFieldObjectPic_Greta_5, 0x100
-	obj_tiles gFieldObjectPic_Greta_6, 0x100
-	obj_tiles gFieldObjectPic_Greta_7, 0x100
-	obj_tiles gFieldObjectPic_Greta_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Noland:: @ 8508804
-	obj_tiles gFieldObjectPic_Noland_0, 0x100
-	obj_tiles gFieldObjectPic_Noland_1, 0x100
-	obj_tiles gFieldObjectPic_Noland_2, 0x100
-	obj_tiles gFieldObjectPic_Noland_3, 0x100
-	obj_tiles gFieldObjectPic_Noland_4, 0x100
-	obj_tiles gFieldObjectPic_Noland_5, 0x100
-	obj_tiles gFieldObjectPic_Noland_6, 0x100
-	obj_tiles gFieldObjectPic_Noland_7, 0x100
-	obj_tiles gFieldObjectPic_Noland_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Lucy:: @ 850884C
-	obj_tiles gFieldObjectPic_Lucy_0, 0x100
-	obj_tiles gFieldObjectPic_Lucy_1, 0x100
-	obj_tiles gFieldObjectPic_Lucy_2, 0x100
-	obj_tiles gFieldObjectPic_Lucy_3, 0x100
-	obj_tiles gFieldObjectPic_Lucy_4, 0x100
-	obj_tiles gFieldObjectPic_Lucy_5, 0x100
-	obj_tiles gFieldObjectPic_Lucy_6, 0x100
-	obj_tiles gFieldObjectPic_Lucy_7, 0x100
-	obj_tiles gFieldObjectPic_Lucy_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Brandon:: @ 8508894
-	obj_tiles gFieldObjectPic_Brandon_0, 0x100
-	obj_tiles gFieldObjectPic_Brandon_1, 0x100
-	obj_tiles gFieldObjectPic_Brandon_2, 0x100
-	obj_tiles gFieldObjectPic_Brandon_3, 0x100
-	obj_tiles gFieldObjectPic_Brandon_4, 0x100
-	obj_tiles gFieldObjectPic_Brandon_5, 0x100
-	obj_tiles gFieldObjectPic_Brandon_6, 0x100
-	obj_tiles gFieldObjectPic_Brandon_7, 0x100
-	obj_tiles gFieldObjectPic_Brandon_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_Lugia:: @ 85088DC
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_1, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_1, 0x200
-	obj_tiles gFieldObjectPic_Lugia_0, 0x200
-	obj_tiles gFieldObjectPic_Lugia_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_HoOh:: @ 8508924
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_1, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_1, 0x200
-	obj_tiles gFieldObjectPic_HoOh_0, 0x200
-	obj_tiles gFieldObjectPic_HoOh_1, 0x200
-
-	.align 2
-gFieldObjectPicTable_RubySapphireBrendan:: @ 850896C
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_0, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_1, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_2, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_3, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_4, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_5, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_6, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_7, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireBrendan_8, 0x100
-
-	.align 2
-gFieldObjectPicTable_RubySapphireMay:: @ 85089B4
-	obj_tiles gFieldObjectPic_RubySapphireMay_0, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_1, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_2, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_3, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_4, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_5, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_6, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_7, 0x100
-	obj_tiles gFieldObjectPic_RubySapphireMay_8, 0x100
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 8784ee047..1d4813b73 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -1,528 +1,533 @@
+#include "constants/bg_event_constants.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/event_objects.h"
 #include "constants/flags.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/maps.h"
+#include "constants/secret_bases.h"
 #include "constants/vars.h"
+#include "constants/weather.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/map_obj_8097404.s b/data/map_obj_8097404.s
deleted file mode 100644
index 719a78266..000000000
--- a/data/map_obj_8097404.s
+++ /dev/null
@@ -1,130 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2
-gUnknown_0850E6C4:: @ 850E6C4
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-
-    .align 2
-gUnknown_0850E704:: @ 850E704
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-
-    .align 2
-gUnknown_0850E724:: @ 850E724
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-
-    .align 2
-gUnknown_0850E73C:: @ 850E73C
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-
-    .align 2
-gUnknown_0850E74C:: @ 850E74C
-	.4byte oct_little_steps
-	.4byte oct_little_steps
-
-    .align 2
-gUnknown_0850E754:: @ 850E754
-	.4byte gUnknown_0850E6C4
-	.4byte gUnknown_0850E704
-	.4byte gUnknown_0850E724
-	.4byte gUnknown_0850E73C
-	.4byte gUnknown_0850E74C
-
-    .align 1
-gUnknown_0850E768:: @ 850E768
-	.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
-
-gUnknown_0850E772:: @ 850E772
-	.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01
-	.byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_0850E7BA:: @ 850E7BA
-	.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe
-
-gUnknown_0850E802:: @ 850E802
-	.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
-
-gUnknown_0850E812:: @ 850E812
-	.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
-
-gUnknown_0850E822:: @ 850E822
-	.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
-
-    .align 2
-gUnknown_0850E834:: @ 850E834
-	.4byte gUnknown_0850E802
-	.4byte gUnknown_0850E812
-	.4byte gUnknown_0850E822
-
-    .align 1
-gUnknown_0850E840:: @ 850E840
-	.byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00
-
-    .align 1
-gUnknown_0850E846:: @ 850E846
-	.byte 0x00, 0x00, 0x01, 0x00
-
-    .align 1
-gUnknown_0850E84A:: @ 850E84A
-	.byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00
-
-    .align 1
-gUnknown_0850E850:: @ 850E850
-	.byte 0x01, 0x01, 0x02, 0x00
-
-// referenced in data/field_map_obj.s
-    .align 2
-gUnknown_0850E854::
-	.4byte sub_8097E50
-	.4byte sub_80964B8
-
-    .align 2
-gUnknown_0850E85C::
-	.4byte sub_8097EF0
-	.4byte sub_80964B8
-
-    .align 2
-gUnknown_0850E864::
-	.4byte sub_80980C0
-	.4byte sub_80980D0
-	.4byte sub_8098124
-
-    .align 2
-gUnknown_0850E870::
-	.4byte sub_80980F4
-	.4byte sub_8098108
-	.4byte sub_8098124
diff --git a/data/maps.s b/data/maps.s
index 8848ac242..56d957139 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -1,11 +1,16 @@
+#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/weather.h"
+#include "constants/region_map_sections.h"
 #include "constants/songs.h"
+#include "constants/weather.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..dfe6d84e0
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..21573c079 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -1,15 +1,15 @@
 AbandonedShip_CaptainsOffice: @ 84845A4
-	.4byte AbandonedShip_CaptainsOffice_MapAttributes
+	.4byte AbandonedShip_CaptainsOffice_Layout
 	.4byte AbandonedShip_CaptainsOffice_MapEvents
 	.4byte AbandonedShip_CaptainsOffice_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 195
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..665350915
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
+	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 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..0ffb5d1f7 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN02
 	.2byte 187
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..34bc41cf0
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, 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..5e4eb1dd6 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN02
 	.2byte 189
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a9f8945d9 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -1,15 +1,15 @@
 AbandonedShip_Deck: @ 84844A8
-	.4byte AbandonedShip_Deck_MapAttributes
+	.4byte AbandonedShip_Deck_Layout
 	.4byte AbandonedShip_Deck_MapEvents
 	.4byte AbandonedShip_Deck_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 186
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..54453b729
--- /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, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
+	bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
+	bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
+	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, 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..6645c9d96 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -1,15 +1,15 @@
 AbandonedShip_HiddenFloorCorridors: @ 84845DC
-	.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
+	.4byte AbandonedShip_HiddenFloorCorridors_Layout
 	.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
 	.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 289
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..07dd3558b
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31
+	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32
+	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33
+	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34
+	bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
+	bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, 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..5cc5bf0ad 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -1,15 +1,15 @@
 AbandonedShip_HiddenFloorRooms: @ 84845F8
-	.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
+	.4byte AbandonedShip_HiddenFloorRooms_Layout
 	.4byte AbandonedShip_HiddenFloorRooms_MapEvents
 	.4byte AbandonedShip_HiddenFloorRooms_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 310
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 7
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f3a1d3327
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..4e6212d01 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN02
 	.2byte 193
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..50debde1b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
+	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 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..8e004365e 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN02
 	.2byte 194
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..05d48a618
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..2f64a6315 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN02
 	.2byte 191
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3b6fc136e
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 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..9ee2f40bc 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN02
 	.2byte 188
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..97a8aa246
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..d6f656e3b 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN02
 	.2byte 190
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..82fbdc0e9 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -1,15 +1,15 @@
 AbandonedShip_Underwater1: @ 8484550
-	.4byte AbandonedShip_Underwater1_MapAttributes
+	.4byte AbandonedShip_Underwater1_Layout
 	.4byte AbandonedShip_Underwater1_MapEvents
 	.4byte AbandonedShip_Underwater1_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
 	.2byte 192
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c26d65df0 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -1,15 +1,15 @@
 AbandonedShip_Underwater2: @ 84845C0
-	.4byte AbandonedShip_Underwater2_MapAttributes
+	.4byte AbandonedShip_Underwater2_Layout
 	.4byte AbandonedShip_Underwater2_MapEvents
 	.4byte AbandonedShip_Underwater2_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
 	.2byte 196
-	.byte 61
+	.byte MAPSEC_ABANDONED_SHIP
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4796b37ff 100644
--- a/data/maps/AlteringCave/header.inc
+++ b/data/maps/AlteringCave/header.inc
@@ -1,15 +1,15 @@
 AlteringCave: @ 8484A58
-	.4byte AlteringCave_MapAttributes
+	.4byte AlteringCave_Layout
 	.4byte AlteringCave_MapEvents
 	.4byte AlteringCave_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 420
-	.byte 210
+	.byte MAPSEC_ALTERING_CAVE_2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..207744c30
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033
+	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
+	bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, 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..a314ad3ba 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -1,15 +1,15 @@
 AncientTomb: @ 8484630
-	.4byte AncientTomb_MapAttributes
+	.4byte AncientTomb_Layout
 	.4byte AncientTomb_MapEvents
 	.4byte AncientTomb_MapScripts
 	.4byte 0x0
 	.2byte MUS_MABOROSI
 	.2byte 281
-	.byte 83
+	.byte MAPSEC_ANCIENT_TOMB
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ab7c49b30
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 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..c632eb204 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,15 +1,15 @@
 AquaHideout_1F: @ 8484144
-	.4byte AquaHideout_1F_MapAttributes
+	.4byte AquaHideout_1F_Layout
 	.4byte AquaHideout_1F_MapEvents
 	.4byte AquaHideout_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 143
-	.byte 197
+	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 3
+	.byte MAP_BATTLE_SCENE_AQUA
 
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..bbada49f8
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 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..ba017fb56 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -1,15 +1,15 @@
 AquaHideout_B1F: @ 8484160
-	.4byte AquaHideout_B1F_MapAttributes
+	.4byte AquaHideout_B1F_Layout
 	.4byte AquaHideout_B1F_MapEvents
 	.4byte AquaHideout_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 144
-	.byte 197
+	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 3
+	.byte MAP_BATTLE_SCENE_AQUA
 
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..09846d401
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
+	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 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, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
+	coord_event 28, 16, 3, VAR_TEMP_1, 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..ea15240b9 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -1,15 +1,15 @@
 AquaHideout_B2F: @ 848417C
-	.4byte AquaHideout_B2F_MapAttributes
+	.4byte AquaHideout_B2F_Layout
 	.4byte AquaHideout_B2F_MapEvents
 	.4byte AquaHideout_B2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 145
-	.byte 197
+	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 3
+	.byte MAP_BATTLE_SCENE_AQUA
 
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
new file mode 100644
index 000000000..fd3868512
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -0,0 +1,160 @@
+AquaHideout_B2F_MapScripts:: @ 8233DCF
+	map_script 3, AquaHideout_B2F_MapScript1_233DD5
+	.byte 0
+
+AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
+	checkflag FLAG_0x070
+	call_if 1, AquaHideout_B2F_EventScript_233DDF
+	end
+
+AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF
+	setvar VAR_TEMP_1, 1
+	return
+
+AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
+	lockall
+	setvar VAR_0x8008, 1
+	playse SE_PIN
+	applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598
+	waitmovement 0
+	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	waitmovement 0
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+AquaHideout_B2F_EventScript_233E09:: @ 8233E09
+	trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
+	msgbox AquaHideout_B2F_Text_233FF2, 4
+	release
+	end
+
+AquaHideout_B2F_EventScript_233E25:: @ 8233E25
+	setvar VAR_0x8008, 1
+	setvar VAR_0x8009, 4
+	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
+	waitmovement 0
+	delay 20
+	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	waitmovement 0
+	msgbox AquaHideout_B2F_Text_233FA6, 4
+	closemessage
+	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
+	applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
+	waitmovement 0
+	removeobject VAR_0x8009
+	delay 20
+	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
+	waitmovement 0
+	msgbox AquaHideout_B2F_Text_233FF2, 4
+	setflag FLAG_0x070
+	setflag FLAG_0x354
+	release
+	end
+
+AquaHideout_B2F_Movement_233E80: @ 8233E80
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+AquaHideout_B2F_Movement_233E85: @ 8233E85
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A
+	trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
+	msgbox AquaHideout_B2F_Text_234112, 6
+	end
+
+AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5
+	msgbox AquaHideout_B2F_Text_234112, 4
+	release
+	end
+
+AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF
+	trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
+	msgbox AquaHideout_B2F_Text_2341FE, 6
+	end
+
+AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6
+	trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
+	msgbox AquaHideout_B2F_Text_2342FF, 6
+	end
+
+AquaHideout_B2F_Text_233EDD: @ 8233EDD
+	.string "Hehehe…\p"
+	.string "Got here already, did you?\n"
+	.string "We underestimated you!\p"
+	.string "But this is it!\p"
+	.string "I’m a cut above the GRUNTS you’ve seen\n"
+	.string "so far.\p"
+	.string "I’m not stalling for time.\n"
+	.string "I’m going to pulverize you!$"
+
+AquaHideout_B2F_Text_233F8D: @ 8233F8D
+	.string "Hehehe…\n"
+	.string "So, I lost, too…$"
+
+AquaHideout_B2F_Text_233FA6: @ 8233FA6
+	.string "Hehehe!\p"
+	.string "While I was toying with you, our BOSS\n"
+	.string "got through his preparations!$"
+
+AquaHideout_B2F_Text_233FF2: @ 8233FF2
+	.string "Hehehe!\p"
+	.string "Our BOSS has already gone on his way to\n"
+	.string "some cave under the sea!\p"
+	.string "If you’re going to give chase, you’d\n"
+	.string "better search the big, wide sea beyond\l"
+	.string "LILYCOVE.\p"
+	.string "But will you find it then?\n"
+	.string "Hehehe!$"
+
+AquaHideout_B2F_Text_2340B4: @ 82340B4
+	.string "Wahahah, I grew weary of waiting!\n"
+	.string "You owe me a battle, too!$"
+
+AquaHideout_B2F_Text_2340F0: @ 82340F0
+	.string "Tired of waiting…\n"
+	.string "Lost and dazed…$"
+
+AquaHideout_B2F_Text_234112: @ 8234112
+	.string "BOSS…\n"
+	.string "Is this good enough?$"
+
+AquaHideout_B2F_Text_23412D: @ 823412D
+	.string "Warp panels, the HIDEOUT’s pride\n"
+	.string "and joy!\p"
+	.string "You’re clueless about where you are,\n"
+	.string "aren’t you?\p"
+	.string "Fluster and tire out the enemy, then\n"
+	.string "lower the boom! That’s our plan!$"
+
+AquaHideout_B2F_Text_2341CE: @ 82341CE
+	.string "What’s wrong with you?\n"
+	.string "You’re not tired at all!$"
+
+AquaHideout_B2F_Text_2341FE: @ 82341FE
+	.string "That reminds me… I can’t remember\n"
+	.string "where I put the MASTER BALL.\p"
+	.string "If I fail to guard it, our BOSS will\n"
+	.string "chew me out…$"
+
+AquaHideout_B2F_Text_23426F: @ 823426F
+	.string "When I joined TEAM AQUA, the first\n"
+	.string "thing I had to learn was how these\l"
+	.string "warp panels connected.$"
+
+AquaHideout_B2F_Text_2342CC: @ 82342CC
+	.string "I was too occupied thinking about\n"
+	.string "the warp panels…$"
+
+AquaHideout_B2F_Text_2342FF: @ 82342FF
+	.string "I’ll have to learn about how I can\n"
+	.string "battle more effectively…$"
+
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..455941160 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc
@@ -1,15 +1,15 @@
 AquaHideout_UnusedRubyMap1: @ 84846D8
-	.4byte AquaHideout_UnusedRubyMap1_MapAttributes
+	.4byte AquaHideout_UnusedRubyMap1_Layout
 	.4byte AquaHideout_UnusedRubyMap1_MapEvents
 	.4byte AquaHideout_UnusedRubyMap1_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 316
-	.byte 197
+	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 2
+	.byte MAP_BATTLE_SCENE_MAGMA
 
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..b4e2e712e 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc
@@ -1,15 +1,15 @@
 AquaHideout_UnusedRubyMap2: @ 84846F4
-	.4byte AquaHideout_UnusedRubyMap2_MapAttributes
+	.4byte AquaHideout_UnusedRubyMap2_Layout
 	.4byte AquaHideout_UnusedRubyMap2_MapEvents
 	.4byte AquaHideout_UnusedRubyMap2_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 317
-	.byte 197
+	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 2
+	.byte MAP_BATTLE_SCENE_MAGMA
 
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..7abe192b6 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc
@@ -1,15 +1,15 @@
 AquaHideout_UnusedRubyMap3: @ 8484710
-	.4byte AquaHideout_UnusedRubyMap3_MapAttributes
+	.4byte AquaHideout_UnusedRubyMap3_Layout
 	.4byte AquaHideout_UnusedRubyMap3_MapEvents
 	.4byte AquaHideout_UnusedRubyMap3_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 318
-	.byte 197
+	.byte MAPSEC_AQUA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 2
+	.byte MAP_BATTLE_SCENE_MAGMA
 
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..7f7405a55
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..a69128ee7 100644
--- a/data/maps/ArtisanCave_1F/header.inc
+++ b/data/maps/ArtisanCave_1F/header.inc
@@ -1,15 +1,15 @@
 ArtisanCave_1F: @ 84849B0
-	.4byte ArtisanCave_1F_MapAttributes
+	.4byte ArtisanCave_1F_Layout
 	.4byte ArtisanCave_1F_MapEvents
 	.4byte ArtisanCave_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 401
-	.byte 202
+	.byte MAPSEC_ARTISAN_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5b47d72a5
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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_hidden_item_event 32, 29, 0, ITEM_ZINC, 102
+	bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101
+	bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103
+	bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104
+
+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..aba179fc6 100644
--- a/data/maps/ArtisanCave_B1F/header.inc
+++ b/data/maps/ArtisanCave_B1F/header.inc
@@ -1,15 +1,15 @@
 ArtisanCave_B1F: @ 8484994
-	.4byte ArtisanCave_B1F_MapAttributes
+	.4byte ArtisanCave_B1F_Layout
 	.4byte ArtisanCave_B1F_MapEvents
 	.4byte ArtisanCave_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 400
-	.byte 202
+	.byte MAPSEC_ARTISAN_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1a8216287
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..8332c4236 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleArenaBattleRoom: @ 8485484
-	.4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleArenaBattleRoom_Layout
 	.4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_ARENA
 	.2byte 356
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bfe28c339
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..2ed587f6e 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleArenaCorridor: @ 8485468
-	.4byte BattleFrontier_BattleArenaCorridor_MapAttributes
+	.4byte BattleFrontier_BattleArenaCorridor_Layout
 	.4byte BattleFrontier_BattleArenaCorridor_MapEvents
 	.4byte BattleFrontier_BattleArenaCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_ARENA
 	.2byte 355
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..20233160e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 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, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092
+	bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, 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..5c02e0c8a 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleArenaLobby: @ 848544C
-	.4byte BattleFrontier_BattleArenaLobby_MapAttributes
+	.4byte BattleFrontier_BattleArenaLobby_Layout
 	.4byte BattleFrontier_BattleArenaLobby_MapEvents
 	.4byte BattleFrontier_BattleArenaLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_ARENA
 	.2byte 354
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d33a3103c
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 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..3f1eb25b2 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleDomeBattleRoom: @ 8485388
-	.4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleDomeBattleRoom_Layout
 	.4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME
 	.2byte 335
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6bce917a0
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..940ba24e6 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleDomeCorridor: @ 8485350
-	.4byte BattleFrontier_BattleDomeCorridor_MapAttributes
+	.4byte BattleFrontier_BattleDomeCorridor_Layout
 	.4byte BattleFrontier_BattleDomeCorridor_MapEvents
 	.4byte BattleFrontier_BattleDomeCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME1
 	.2byte 333
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c24a47301
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
+	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52
+	bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84
+	bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B
+	bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, 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..5d1a7eb82 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleDomeLobby: @ 8485334
-	.4byte BattleFrontier_BattleDomeLobby_MapAttributes
+	.4byte BattleFrontier_BattleDomeLobby_Layout
 	.4byte BattleFrontier_BattleDomeLobby_MapEvents
 	.4byte BattleFrontier_BattleDomeLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME1
 	.2byte 332
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..559199b29
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..e35435b27 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleDomePreBattleRoom: @ 848536C
-	.4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleDomePreBattleRoom_Layout
 	.4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_DOME
 	.2byte 334
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..264c7d731
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 8, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 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..cef72bc09 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
-	.4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleFactoryBattleRoom_Layout
 	.4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_FACTORY
 	.2byte 348
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..063f49813
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
+	object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
+	bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
+	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, 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..d56a2a23d 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleFactoryLobby: @ 84854A0
-	.4byte BattleFrontier_BattleFactoryLobby_MapAttributes
+	.4byte BattleFrontier_BattleFactoryLobby_Layout
 	.4byte BattleFrontier_BattleFactoryLobby_MapEvents
 	.4byte BattleFrontier_BattleFactoryLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_FACTORY
 	.2byte 346
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d341250de
--- /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, MOVEMENT_TYPE_FACE_UP, 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..3dc5d23cc 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
-	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout
 	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_FACTORY
 	.2byte 347
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4c84a209f
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 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..d63d3b268 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
-	.4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattlePalaceBattleRoom_Layout
 	.4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
 	.4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_PALACE
 	.2byte 344
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bf06dcf34
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 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..ff8af8ca8 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePalaceCorridor: @ 84853C0
-	.4byte BattleFrontier_BattlePalaceCorridor_MapAttributes
+	.4byte BattleFrontier_BattlePalaceCorridor_Layout
 	.4byte BattleFrontier_BattlePalaceCorridor_MapEvents
 	.4byte BattleFrontier_BattlePalaceCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_PALACE
 	.2byte 343
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5dae24a71
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
+	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
+	bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
+	bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, 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..060013cce 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePalaceLobby: @ 84853A4
-	.4byte BattleFrontier_BattlePalaceLobby_MapAttributes
+	.4byte BattleFrontier_BattlePalaceLobby_Layout
 	.4byte BattleFrontier_BattlePalaceLobby_MapEvents
 	.4byte BattleFrontier_BattlePalaceLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_PALACE
 	.2byte 342
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8734e4dc8
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..574d0cbab 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePikeCorridor: @ 8485510
-	.4byte BattleFrontier_BattlePikeCorridor_MapAttributes
+	.4byte BattleFrontier_BattlePikeCorridor_Layout
 	.4byte BattleFrontier_BattlePikeCorridor_MapEvents
 	.4byte BattleFrontier_BattlePikeCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
 	.2byte 350
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1020cef3c
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80
+	bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, 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..239c31721 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePikeLobby: @ 84854F4
-	.4byte BattleFrontier_BattlePikeLobby_MapAttributes
+	.4byte BattleFrontier_BattlePikeLobby_Layout
 	.4byte BattleFrontier_BattlePikeLobby_MapEvents
 	.4byte BattleFrontier_BattlePikeLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
 	.2byte 349
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..580873720
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
+	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
+
+BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
+	coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
+	coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+	coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+	coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+	coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
+	coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
+	coord_event 5, 7, 3, VAR_TEMP_3, 1, 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..dcb088c27 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePikeRandomRoom1: @ 8485548
-	.4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes
+	.4byte BattleFrontier_BattlePikeRandomRoom1_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
 	.2byte 352
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3ce444a53
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..1ee69c077 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePikeRandomRoom2: @ 8485564
-	.4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes
+	.4byte BattleFrontier_BattlePikeRandomRoom2_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
 	.2byte 353
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
new file mode 100644
index 000000000..61cb8ede4
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
@@ -0,0 +1,12 @@
+BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
+	coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
+	coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
+	coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
+	coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
+	coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
+	coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
+	coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
+
+BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4
+	map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
index e3518c68b..68ca30546 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePikeRandomRoom3: @ 8485580
-	.4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes
+	.4byte BattleFrontier_BattlePikeRandomRoom3_Layout
 	.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
 	.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
 	.2byte 358
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..dbc3584a6
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
+
+BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
+	coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
+	coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
+	coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
+	coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+	coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
+	coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+	coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+	coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
+	coord_event 7, 10, 0, VAR_TEMP_3, 1, 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..5e0afedb5 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePikeThreePathRoom: @ 848552C
-	.4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes
+	.4byte BattleFrontier_BattlePikeThreePathRoom_Layout
 	.4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
 	.4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TUBE
 	.2byte 351
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2945034bc
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
+	object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0
+	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0
+	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
+	object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 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..ccaa1cbca 100644
--- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes
+	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout
 	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
 	.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 398
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3e66eec7d
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 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..a92f009dd 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePyramidEmptySquare: @ 8485414
-	.4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes
+	.4byte BattleFrontier_BattlePyramidEmptySquare_Layout
 	.4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents
 	.4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 361
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..521577c4c
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
+	object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42
+	bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, 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..6da314304 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePyramidLobby: @ 84853F8
-	.4byte BattleFrontier_BattlePyramidLobby_MapAttributes
+	.4byte BattleFrontier_BattlePyramidLobby_Layout
 	.4byte BattleFrontier_BattlePyramidLobby_MapEvents
 	.4byte BattleFrontier_BattlePyramidLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_PYRAMID
 	.2byte 360
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fbf4941ca
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
+	object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+
+BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
+	coord_event 17, 9, 4, VAR_TEMP_2, 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..28de39cad 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattlePyramidTop: @ 8485430
-	.4byte BattleFrontier_BattlePyramidTop_MapAttributes
+	.4byte BattleFrontier_BattlePyramidTop_Layout
 	.4byte BattleFrontier_BattlePyramidTop_MapEvents
 	.4byte BattleFrontier_BattlePyramidTop_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 378
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..55aed13a4
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 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..797022beb 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleTowerBattleRoom: @ 848521C
-	.4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
 	.2byte 268
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..505a903da
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
+	object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+	object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 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..90ae26c25 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleTowerBattleRoom2: @ 8485318
-	.4byte BattleFrontier_BattleTowerBattleRoom2_MapAttributes
+	.4byte BattleFrontier_BattleTowerBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
 	.4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
 	.2byte 268
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..ae3ca2575
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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..bd2d38b37 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleTowerCorridor: @ 8485200
-	.4byte BattleFrontier_BattleTowerCorridor_MapAttributes
+	.4byte BattleFrontier_BattleTowerCorridor_Layout
 	.4byte BattleFrontier_BattleTowerCorridor_MapEvents
 	.4byte BattleFrontier_BattleTowerCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
 	.2byte 267
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8f6a1e2f0
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 4, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 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..94e46b196 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleTowerCorridor2: @ 84852FC
-	.4byte BattleFrontier_BattleTowerCorridor2_MapAttributes
+	.4byte BattleFrontier_BattleTowerCorridor2_Layout
 	.4byte BattleFrontier_BattleTowerCorridor2_MapEvents
 	.4byte BattleFrontier_BattleTowerCorridor2_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
 	.2byte 391
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..671d6d434
--- /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, MOVEMENT_TYPE_FACE_UP, 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..fa1e08faf 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleTowerElevator: @ 84851E4
-	.4byte BattleFrontier_BattleTowerElevator_MapAttributes
+	.4byte BattleElevator_Layout
 	.4byte BattleFrontier_BattleTowerElevator_MapEvents
 	.4byte BattleFrontier_BattleTowerElevator_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
 	.2byte 266
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..73bdeeb2b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918
+	object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701
+	object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
+	object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
+	object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7
+	bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0
+	bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9
+	bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012
+	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..e16e2a700 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleTowerLobby: @ 84851C8
-	.4byte BattleFrontier_BattleTowerLobby_MapAttributes
+	.4byte BattleFrontier_BattleTowerLobby_Layout
 	.4byte BattleFrontier_BattleTowerLobby_MapEvents
 	.4byte BattleFrontier_BattleTowerLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
 	.2byte 264
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
new file mode 100644
index 000000000..1cd2ff74a
--- /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, IsWirelessAdapterConnected
+	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..533e6af8b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716
+	object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864
+	object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..727322b94 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
-	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes
+	.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
 	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents
 	.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_SATTOWER
 	.2byte 390
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1303c3c33
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 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..a4cf64a78 100644
--- a/data/maps/BattleFrontier_Lounge1/header.inc
+++ b/data/maps/BattleFrontier_Lounge1/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge1: @ 84855B8
-	.4byte BattleFrontier_Lounge1_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge1_MapEvents
 	.4byte BattleFrontier_Lounge1_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..cc32ddf42
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0
+	object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0
+	object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 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..c363d54bf 100644
--- a/data/maps/BattleFrontier_Lounge2/header.inc
+++ b/data/maps/BattleFrontier_Lounge2/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge2: @ 84855F0
-	.4byte BattleFrontier_Lounge2_MapAttributes
+	.4byte BattleFrontier_Lounge1_Layout
 	.4byte BattleFrontier_Lounge2_MapEvents
 	.4byte BattleFrontier_Lounge2_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 397
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..75f04250c
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 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..e5649a369 100644
--- a/data/maps/BattleFrontier_Lounge3/header.inc
+++ b/data/maps/BattleFrontier_Lounge3/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge3: @ 848560C
-	.4byte BattleFrontier_Lounge3_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge3_MapEvents
 	.4byte BattleFrontier_Lounge3_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c0dfbcf3e
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0
+	object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 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..a9da9677c 100644
--- a/data/maps/BattleFrontier_Lounge4/header.inc
+++ b/data/maps/BattleFrontier_Lounge4/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge4: @ 8485628
-	.4byte BattleFrontier_Lounge4_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge4_MapEvents
 	.4byte BattleFrontier_Lounge4_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..798deb1c2
--- /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, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 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..7f1142f2d 100644
--- a/data/maps/BattleFrontier_Lounge5/header.inc
+++ b/data/maps/BattleFrontier_Lounge5/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge5: @ 8485660
-	.4byte BattleFrontier_Lounge5_MapAttributes
+	.4byte BattleFrontier_Lounge1_Layout
 	.4byte BattleFrontier_Lounge5_MapEvents
 	.4byte BattleFrontier_Lounge5_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 397
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..24d7958ec
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 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..e07dd297f 100644
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge6: @ 848567C
-	.4byte BattleFrontier_Lounge6_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge6_MapEvents
 	.4byte BattleFrontier_Lounge6_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..901ac6641
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 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..22797d04e 100644
--- a/data/maps/BattleFrontier_Lounge7/header.inc
+++ b/data/maps/BattleFrontier_Lounge7/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge7: @ 8485698
-	.4byte BattleFrontier_Lounge7_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge7_MapEvents
 	.4byte BattleFrontier_Lounge7_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..92d27d765
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 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..5494c964f 100644
--- a/data/maps/BattleFrontier_Lounge8/header.inc
+++ b/data/maps/BattleFrontier_Lounge8/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge8: @ 84856D0
-	.4byte BattleFrontier_Lounge8_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge8_MapEvents
 	.4byte BattleFrontier_Lounge8_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6598e0229
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..5248720c7 100644
--- a/data/maps/BattleFrontier_Lounge9/header.inc
+++ b/data/maps/BattleFrontier_Lounge9/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge9: @ 84856EC
-	.4byte BattleFrontier_Lounge9_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge9_MapEvents
 	.4byte BattleFrontier_Lounge9_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3ca67e038
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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..4b3e7f79a 100644
--- a/data/maps/BattleFrontier_Mart/header.inc
+++ b/data/maps/BattleFrontier_Mart/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Mart: @ 8485740
-	.4byte BattleFrontier_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte BattleFrontier_Mart_MapEvents
 	.4byte BattleFrontier_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..526c53971
--- /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, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0
+	object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0
+	object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0
+	object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0
+	object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0
+	object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0
+	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0
+	object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 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, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43
+	bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C
+	bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55
+	bg_event 62, 15, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C5E
+	bg_event 7, 29, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DD7
+	bg_event 32, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DCE
+	bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73
+	bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, 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..a30a148c2 100644
--- a/data/maps/BattleFrontier_OutsideEast/header.inc
+++ b/data/maps/BattleFrontier_OutsideEast/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_OutsideEast: @ 84852C4
-	.4byte BattleFrontier_OutsideEast_MapAttributes
+	.4byte BattleFrontier_OutsideEast_Layout
 	.4byte BattleFrontier_OutsideEast_MapEvents
 	.4byte BattleFrontier_OutsideEast_MapScripts
 	.4byte BattleFrontier_OutsideEast_MapConnections
 	.2byte MUS_B_FRONTIER
 	.2byte 345
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
new file mode 100644
index 000000000..dff56322a
--- /dev/null
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -0,0 +1,444 @@
+BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
+	map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F
+	map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D
+	.byte 0
+
+BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, BattleFrontier_OutsideEast_EventScript_242C19
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
+	removeobject VAR_LAST_TALKED
+	return
+
+BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
+	setvar VAR_0x40BC, 0
+	setflag FLAG_0x396
+	checkflag FLAG_0x1C6
+	call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
+	clearflag FLAG_0x34A
+	return
+
+BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43
+	msgbox BattleFrontier_OutsideEast_Text_242E11, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C
+	msgbox BattleFrontier_OutsideEast_Text_242E58, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55
+	msgbox BattleFrontier_OutsideEast_Text_242E96, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E
+	msgbox BattleFrontier_OutsideEast_Text_242ECF, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67
+	msgbox BattleFrontier_OutsideEast_Text_242F8C, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70
+	msgbox BattleFrontier_OutsideEast_Text_242FDC, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79
+	msgbox BattleFrontier_OutsideEast_Text_24308C, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82
+	msgbox BattleFrontier_OutsideEast_Text_243106, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B
+	msgbox BattleFrontier_OutsideEast_Text_2431A5, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94
+	lock
+	msgbox BattleFrontier_OutsideEast_Text_2432DD, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_ZIGZAGOON, 0
+	msgbox BattleFrontier_OutsideEast_Text_24334B, 4
+	waitmoncry
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2
+	msgbox BattleFrontier_OutsideEast_Text_243363, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB
+	msgbox BattleFrontier_OutsideEast_Text_243425, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4
+	msgbox BattleFrontier_OutsideEast_Text_2434A0, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD
+	msgbox BattleFrontier_OutsideEast_Text_243504, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6
+	lock
+	msgbox BattleFrontier_OutsideEast_Text_243529, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1
+	msgbox BattleFrontier_OutsideEast_Text_243230, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA
+	lock
+	faceplayer
+	waitse
+	playse 269
+	applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
+	waitmovement 0
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
+	lock
+	faceplayer
+	special sub_80FAFF8
+	waitstate
+	waitse
+	playse 269
+	applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
+	waitmovement 0
+	msgbox gUnknown_082731BD, 4
+	closemessage
+	waitse
+	playmoncry SPECIES_SUDOWOODO, 2
+	delay 40
+	waitmoncry
+	setvar VAR_LAST_TALKED, 14
+	setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	dowildbattle
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq BattleFrontier_OutsideEast_EventScript_242D60
+	compare VAR_RESULT, 4
+	goto_eq BattleFrontier_OutsideEast_EventScript_242D60
+	compare VAR_RESULT, 5
+	goto_eq BattleFrontier_OutsideEast_EventScript_242D60
+	setflag FLAG_0x1C6
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60
+	setflag FLAG_0x1C6
+	goto IslandCave_EventScript_27376D
+	end
+
+BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69
+	face_right
+	delay_8
+	face_down
+	delay_8
+	face_left
+	delay_8
+	face_down
+	delay_8
+	face_right
+	delay_8
+	face_down
+	delay_8
+	face_left
+	delay_8
+	face_down
+	step_end
+
+BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79
+	msgbox BattleFrontier_OutsideEast_Text_243598, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82
+	msgbox BattleFrontier_OutsideEast_Text_243668, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B
+	msgbox BattleFrontier_OutsideEast_Text_2436F2, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94
+	msgbox BattleFrontier_OutsideEast_Text_243809, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D
+	msgbox BattleFrontier_OutsideEast_Text_243895, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6
+	msgbox BattleFrontier_OutsideEast_Text_243943, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF
+	msgbox BattleFrontier_OutsideEast_Text_2439A0, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8
+	lock
+	msgbox BattleFrontier_OutsideEast_Text_243A2B, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3
+	lock
+	msgbox BattleFrontier_OutsideEast_Text_243A53, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE
+	msgbox BattleFrontier_OutsideEast_Text_242F0D, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7
+	msgbox BattleFrontier_OutsideEast_Text_242F4A, 3
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
+	msgbox BattleFrontier_OutsideEast_Text_243B68, 2
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
+	lock
+	faceplayer
+	checkflag FLAG_0x1C6
+	goto_eq BattleFrontier_OutsideEast_EventScript_242DFE
+	msgbox BattleFrontier_OutsideEast_Text_243C2C, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE
+	msgbox BattleFrontier_OutsideEast_Text_243CA3, 4
+	release
+	end
+
+BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08
+	msgbox BattleFrontier_OutsideEast_Text_243D0B, 2
+	end
+
+BattleFrontier_OutsideEast_Text_242E11: @ 8242E11
+	.string "This is the BATTLE TOWER!\n"
+	.string "Keep the win streak as the toughest\l"
+	.string "TRAINER!$"
+
+BattleFrontier_OutsideEast_Text_242E58: @ 8242E58
+	.string "This is the BATTLE PALACE!\n"
+	.string "Keep your eyes on POKéMON battles!$"
+
+BattleFrontier_OutsideEast_Text_242E96: @ 8242E96
+	.string "This is the BATTLE ARENA!\n"
+	.string "Let the toughest teams gather!$"
+
+BattleFrontier_OutsideEast_Text_242ECF: @ 8242ECF
+	.string "This is the BATTLE PYRAMID!\n"
+	.string "Advance through the Battle Quest!$"
+
+BattleFrontier_OutsideEast_Text_242F0D: @ 8242F0D
+	.string "BATTLE FRONTIER RANKING HALL\n"
+	.string "Set your sights on new records!$"
+
+BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A
+	.string "BATTLE POINT EXCHANGE SERVICE CORNER\n"
+	.string "Exchange your Battle Points!$"
+
+BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C
+	.string "Wow!\n"
+	.string "It’s huge!\p"
+	.string "The BATTLE TOWER feels special.\n"
+	.string "It’s different from the others.$"
+
+BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC
+	.string "My grand ambition is to conquer both\n"
+	.string "the BATTLE FRONTIER and the POKéMON\l"
+	.string "LEAGUE.\p"
+	.string "And if my dream comes true…\p"
+	.string "I… I’m going to ask MIMI next door\n"
+	.string "if she will be friends with me!$"
+
+BattleFrontier_OutsideEast_Text_24308C: @ 824308C
+	.string "The BATTLE PYRAMID’s too harsh!\n"
+	.string "I just can’t make it to the top!\p"
+	.string "Since I’m out of options, maybe I can\n"
+	.string "climb the outside…$"
+
+BattleFrontier_OutsideEast_Text_243106: @ 8243106
+	.string "I thrive in darkness…\n"
+	.string "Yes… What is worthy of me?\l"
+	.string "None other than the BATTLE PYRAMID…\p"
+	.string "What say you to wandering in darkness\n"
+	.string "and in utter and total desperation?$"
+
+BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5
+	.string "I didn’t sleep for a week, but then\n"
+	.string "I put together the ultimate team!\p"
+	.string "I can’t see myself losing, no joke.\n"
+	.string "We’re storming the BATTLE ARENA!$"
+
+BattleFrontier_OutsideEast_Text_243230: @ 8243230
+	.string "Did SCOTT bring you here, too?\n"
+	.string "What is it with that guy?\p"
+	.string "It sounds like he really does know\n"
+	.string "how to spot talented TRAINERS, but…\p"
+	.string "I’ve never seen him battling in person\n"
+	.string "ever.$"
+
+BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD
+	.string "ZIGG!\n"
+	.string "I believe in you, little buddy!\p"
+	.string "I’ll make my little ZIGG any favorite\n"
+	.string "tasty treats you like if you win!$"
+
+BattleFrontier_OutsideEast_Text_24334B: @ 824334B
+	.string "ZIGZAGOON looks vacant…$"
+
+BattleFrontier_OutsideEast_Text_243363: @ 8243363
+	.string "People call me a busybody,\n"
+	.string "but I can’t help it.\p"
+	.string "Your hat’s on crooked!\n"
+	.string "Oh, no, trash on the ground!\l"
+	.string "Oops, it’s almost dinnertime!\p"
+	.string "I don’t know if I can stand to just\n"
+	.string "watch at the BATTLE PALACE…$"
+
+BattleFrontier_OutsideEast_Text_243425: @ 8243425
+	.string "I may not look that impressive now,\n"
+	.string "but I once beat a GYM LEADER.\p"
+	.string "Who knows, maybe I should give it\n"
+	.string "another shot at glory.$"
+
+BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0
+	.string "I’m fast on my BIKE, and that goes for\n"
+	.string "the way I battle, too.\p"
+	.string "I win matches in the blink of\n"
+	.string "an eye!$"
+
+BattleFrontier_OutsideEast_Text_243504: @ 8243504
+	.string "I’m better than my daddy\n"
+	.string "at POKéMON.$"
+
+BattleFrontier_OutsideEast_Text_243529: @ 8243529
+	.string "Go on, my baby sweetie!\n"
+	.string "Go rack up some wins for Daddy!\p"
+	.string "You’re just like your mother,\n"
+	.string "so you’ll be dominating!$"
+
+BattleFrontier_OutsideEast_Text_243598: @ 8243598
+	.string "It wasn’t easy getting here,\n"
+	.string "but I’d heard about this knockout\l"
+	.string "pretty girl at the BATTLE ARENA.\p"
+	.string "Instead of her, do you know what\n"
+	.string "I found?\p"
+	.string "A whole teeming mob of sweaty,\n"
+	.string "stinky, and primitive martial artists!$"
+
+BattleFrontier_OutsideEast_Text_243668: @ 8243668
+	.string "I sometimes see this really important-\n"
+	.string "looking old man going in there.\p"
+	.string "He has these really awesome POKéMON.\n"
+	.string "He seems really nice, though.$"
+
+BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2
+	.string "Do you know it?\n"
+	.string "The legend of the BATTLE PYRAMID?\p"
+	.string "When there comes a confident TRAINER\n"
+	.string "reaching for the golden pinnacle,\l"
+	.string "there shall appear a man among men.\p"
+	.string "Don’t know that legend?\n"
+	.string "Well, of course not!\l"
+	.string "I just made it up!\p"
+	.string "What’s it supposed to mean?\n"
+	.string "That, my friend, I can’t say!$"
+
+BattleFrontier_OutsideEast_Text_243809: @ 8243809
+	.string "Man! Oh man!\n"
+	.string "I’ve never lost once before!\p"
+	.string "But I got wiped out with no saving\n"
+	.string "grace at all!\p"
+	.string "And then I’m told I don’t have any\n"
+	.string "talent?! Man!$"
+
+BattleFrontier_OutsideEast_Text_243895: @ 8243895
+	.string "This guy ran into a horribly tough\n"
+	.string "TRAINER while he was on the BATTLE\l"
+	.string "TOWER challenge.\p"
+	.string "Now look at him…\p"
+	.string "You need to be cautious if you ever\n"
+	.string "decide to go to the BATTLE TOWER.$"
+
+BattleFrontier_OutsideEast_Text_243943: @ 8243943
+	.string "Yes!\n"
+	.string "I’ve finally got enough Battle Points!\p"
+	.string "I guess I’ll trade for another giant\n"
+	.string "plush DOLL!$"
+
+BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0
+	.string "Oh, yeah, okay!\n"
+	.string "So this is the RANKING HALL!\p"
+	.string "I’d like to go down in history as\n"
+	.string "a super champ and have my name\l"
+	.string "recorded here for posterity.$"
+
+BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B
+	.string "With you by my side, I can do anything.$"
+
+BattleFrontier_OutsideEast_Text_243A53: @ 8243A53
+	.string "Ooh, darling, you are so wonderful!\p"
+	.string "Ooh, I just can’t wait anymore!\p"
+	.string "Let’s go to a MULTI BATTLE ROOM\n"
+	.string "right this instant!\p"
+	.string "If we get together in the BATTLE SALON,\n"
+	.string "the power of our love will overcome\l"
+	.string "everyone we meet.\p"
+	.string "Why, before us, darling, everything\n"
+	.string "will topple like dominoes!$"
+
+BattleFrontier_OutsideEast_Text_243B68: @ 8243B68
+	.string "The BATTLE FRONTIER isn’t exclusively\n"
+	.string "for tough TRAINERS.\p"
+	.string "Many people with special abilities\n"
+	.string "have been invited, it seems.\p"
+	.string "That man SCOTT…\p"
+	.string "He may have built this place to serve\n"
+	.string "a bigger objective…$"
+
+BattleFrontier_OutsideEast_Text_243C2C: @ 8243C2C
+	.string "Excuse me, young one.\n"
+	.string "Have you good eyesight?\p"
+	.string "There is an odd tree past here, and to\n"
+	.string "my tired eyes it seems to wiggle.$"
+
+BattleFrontier_OutsideEast_Text_243CA3: @ 8243CA3
+	.string "Excuse me, young one.\n"
+	.string "Have you a good memory?\p"
+	.string "I have this feeling there once was\n"
+	.string "an odd tree past here.$"
+
+BattleFrontier_OutsideEast_Text_243D0B: @ 8243D0B
+	.string "I…\n"
+	.string "I saw it!\p"
+	.string "There was a sticky sort of a POKéMON\n"
+	.string "with a long tail up ahead!\p"
+	.string "It was hiding under a boulder, and\n"
+	.string "it kept staring at me!$"
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..8095b6d6c
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0
+	object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0
+	object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0
+	object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0
+	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0
+	object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0
+	object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0
+	object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0
+	object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0
+	object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0
+	object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 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, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2
+	bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4
+	bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB
+	bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A
+	bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, 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..a42ac30ff 100644
--- a/data/maps/BattleFrontier_OutsideWest/header.inc
+++ b/data/maps/BattleFrontier_OutsideWest/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_OutsideWest: @ 84851AC
-	.4byte BattleFrontier_OutsideWest_MapAttributes
+	.4byte BattleFrontier_OutsideWest_Layout
 	.4byte BattleFrontier_OutsideWest_MapEvents
 	.4byte BattleFrontier_OutsideWest_MapScripts
 	.4byte BattleFrontier_OutsideWest_MapConnections
 	.2byte MUS_B_FRONTIER
 	.2byte 265
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..cf0215573
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0
+	object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..a136e803d 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4d0b88090
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..4cd607aef 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..33069e0ca
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA
+	bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6
+	bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2
+	bg_event 29, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4CE
+	bg_event 42, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4DA
+	bg_event 46, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4E6
+	bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4F2
+	bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4FE
+	bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E50A
+	bg_event 44, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E516
+	bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538
+	bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, 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..6fcb187ed 100644
--- a/data/maps/BattleFrontier_RankingHall/header.inc
+++ b/data/maps/BattleFrontier_RankingHall/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_RankingHall: @ 848559C
-	.4byte BattleFrontier_RankingHall_MapAttributes
+	.4byte BattleFrontier_RankingHall_Layout
 	.4byte BattleFrontier_RankingHall_MapEvents
 	.4byte BattleFrontier_RankingHall_MapScripts
 	.4byte 0x0
 	.2byte MUS_BIJYUTU
 	.2byte 396
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c29718501
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 836
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 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..88f806e83 100644
--- a/data/maps/BattleFrontier_ReceptionGate/header.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_ReceptionGate: @ 84856B4
-	.4byte BattleFrontier_ReceptionGate_MapAttributes
+	.4byte BattleFrontier_ReceptionGate_Layout
 	.4byte BattleFrontier_ReceptionGate_MapEvents
 	.4byte BattleFrontier_ReceptionGate_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 399
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
new file mode 100644
index 000000000..ec38c3e9d
--- /dev/null
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -0,0 +1,505 @@
+BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
+	map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9
+	map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5
+	.byte 0
+
+BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
+	setflag FLAG_LANDMARK_BATTLE_FRONTIER
+	end
+
+BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
+	map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
+	.2byte 0
+
+BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
+	lockall
+	setvar VAR_0x40D0, 1
+	playse SE_PIN
+	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
+	waitmovement 0
+	applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A
+	waitmovement 0
+	msgbox BattleFrontier_ReceptionGate_Text_266580, 4
+	closemessage
+	applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2
+	waitmovement 0
+	goto BattleFrontier_ReceptionGate_EventScript_266229
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
+	msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4
+	msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4
+	playfanfare MUS_FANFA4
+	message BattleFrontier_ReceptionGate_Text_266676
+	waitfanfare
+	waitmessage
+	msgbox BattleFrontier_ReceptionGate_Text_266695, 4
+	setflag FLAG_SYS_FRONTIER_PASS
+	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
+	msgbox BattleFrontier_ReceptionGate_Text_266703, 4
+	closemessage
+	applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6
+	applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6
+	applymovement 255, BattleFrontier_ReceptionGate_Movement_2725A6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement 2, BattleFrontier_ReceptionGate_Movement_272598
+	applymovement 255, BattleFrontier_ReceptionGate_Movement_272598
+	waitmovement 0
+	msgbox BattleFrontier_ReceptionGate_Text_266733, 4
+	closemessage
+	applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0
+	applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6
+	applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7
+	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0
+	waitmovement 0
+	msgbox BattleFrontier_ReceptionGate_Text_266764, 4
+	closemessage
+	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8
+	waitmovement 0
+	removeobject 4
+	releaseall
+	end
+
+BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	step_end
+
+BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD
+	walk_down
+	walk_down
+	step_end
+
+BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	step_end
+
+BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	step_end
+
+BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC
+	lock
+	faceplayer
+	msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4
+	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
+	release
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310
+	lock
+	faceplayer
+	msgbox BattleFrontier_ReceptionGate_Text_266857, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
+	message BattleFrontier_ReceptionGate_Text_26689D
+	waitmessage
+	setvar VAR_0x8004, 8
+	special sub_813A128
+	waitstate
+	switch VAR_RESULT
+	case 0, BattleFrontier_ReceptionGate_EventScript_2663AE
+	case 1, BattleFrontier_ReceptionGate_EventScript_2663BC
+	case 2, BattleFrontier_ReceptionGate_EventScript_2663CA
+	case 3, BattleFrontier_ReceptionGate_EventScript_2663D8
+	case 4, BattleFrontier_ReceptionGate_EventScript_2663E6
+	case 5, BattleFrontier_ReceptionGate_EventScript_2663F4
+	case 6, BattleFrontier_ReceptionGate_EventScript_266402
+	case 7, BattleFrontier_ReceptionGate_EventScript_266410
+	case 8, BattleFrontier_ReceptionGate_EventScript_26641E
+	case 9, BattleFrontier_ReceptionGate_EventScript_26642C
+	case 127, BattleFrontier_ReceptionGate_EventScript_26642C
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE
+	msgbox BattleFrontier_ReceptionGate_Text_2668C2, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC
+	msgbox BattleFrontier_ReceptionGate_Text_26696F, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA
+	msgbox BattleFrontier_ReceptionGate_Text_266A34, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8
+	msgbox BattleFrontier_ReceptionGate_Text_266AC2, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6
+	msgbox BattleFrontier_ReceptionGate_Text_266B5D, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4
+	msgbox BattleFrontier_ReceptionGate_Text_266C24, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402
+	msgbox BattleFrontier_ReceptionGate_Text_266CBB, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410
+	msgbox BattleFrontier_ReceptionGate_Text_266D1C, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E
+	msgbox BattleFrontier_ReceptionGate_Text_266DCB, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266320
+	end
+
+BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C
+	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
+	release
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436
+	lock
+	faceplayer
+	msgbox BattleFrontier_ReceptionGate_Text_266E66, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266446
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446
+	message BattleFrontier_ReceptionGate_Text_266EE0
+	waitmessage
+	multichoice 15, 0, 95, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_ReceptionGate_EventScript_2664A4
+	case 1, BattleFrontier_ReceptionGate_EventScript_2664B2
+	case 2, BattleFrontier_ReceptionGate_EventScript_2664C0
+	case 3, BattleFrontier_ReceptionGate_EventScript_2664CE
+	case 4, BattleFrontier_ReceptionGate_EventScript_2664DC
+	case 5, BattleFrontier_ReceptionGate_EventScript_2664EA
+	case 127, BattleFrontier_ReceptionGate_EventScript_2664EA
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4
+	msgbox BattleFrontier_ReceptionGate_Text_266F04, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266446
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2
+	msgbox BattleFrontier_ReceptionGate_Text_266F69, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266446
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0
+	msgbox BattleFrontier_ReceptionGate_Text_267080, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266446
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE
+	msgbox BattleFrontier_ReceptionGate_Text_26716A, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266446
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC
+	msgbox BattleFrontier_ReceptionGate_Text_267298, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266446
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA
+	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
+	release
+	end
+
+BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4
+	lock
+	faceplayer
+	msgbox BattleFrontier_ReceptionGate_Text_267357, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266504
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504
+	message BattleFrontier_ReceptionGate_Text_26737C
+	waitmessage
+	multichoice 16, 4, 11, 0
+	switch VAR_RESULT
+	case 0, BattleFrontier_ReceptionGate_EventScript_26654C
+	case 1, BattleFrontier_ReceptionGate_EventScript_26655A
+	case 2, BattleFrontier_ReceptionGate_EventScript_266568
+	case 3, BattleFrontier_ReceptionGate_EventScript_266576
+	case 127, BattleFrontier_ReceptionGate_EventScript_266576
+	end
+
+BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C
+	msgbox BattleFrontier_ReceptionGate_Text_2673A1, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266504
+	end
+
+BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A
+	msgbox BattleFrontier_ReceptionGate_Text_2674F3, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266504
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568
+	msgbox BattleFrontier_ReceptionGate_Text_26761C, 4
+	goto BattleFrontier_ReceptionGate_EventScript_266504
+	end
+
+BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576
+	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
+	release
+	end
+
+BattleFrontier_ReceptionGate_Text_266580: @ 8266580
+	.string "Is it your first time here?\n"
+	.string "Please step this way!$"
+
+BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2
+	.string "The front lines of POKéMON battling!\n"
+	.string "Welcome to the BATTLE FRONTIER!$"
+
+BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7
+	.string "For a first-time visitor, we issue\n"
+	.string "the FRONTIER PASS.\p"
+	.string "It’s for use at all the facilities\n"
+	.string "in the BATTLE FRONTIER.\p"
+	.string "Here you are!$"
+
+BattleFrontier_ReceptionGate_Text_266676: @ 8266676
+	.string "{PLAYER} obtained\n"
+	.string "the FRONTIER PASS.$"
+
+BattleFrontier_ReceptionGate_Text_266695: @ 8266695
+	.string "{PLAYER} placed the TRAINER CARD\n"
+	.string "in the FRONTIER PASS.$"
+
+BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6
+	.string "We hope you enjoy all that the BATTLE\n"
+	.string "FRONTIER has to offer!$"
+
+BattleFrontier_ReceptionGate_Text_266703: @ 8266703
+	.string "???: Well, if it isn’t {PLAYER}{KUN}!\n"
+	.string "You came out here!$"
+
+BattleFrontier_ReceptionGate_Text_266733: @ 8266733
+	.string "GUIDE: Oh! MR. SCOTT, sir!\n"
+	.string "Good day to you, sir!$"
+
+BattleFrontier_ReceptionGate_Text_266764: @ 8266764
+	.string "SCOTT: It’s great to see you here,\n"
+	.string "it really is!\p"
+	.string "I hope you’ll take your time and\n"
+	.string "explore everywhere.\p"
+	.string "Naturally, I hope you’ll also experience\n"
+	.string "the pure essence of battling.\p"
+	.string "I also have my quarters here, so feel\n"
+	.string "free to visit if you have time.$"
+
+BattleFrontier_ReceptionGate_Text_266857: @ 8266857
+	.string "I’m your guide to the various facilities\n"
+	.string "here in the BATTLE FRONTIER.$"
+
+BattleFrontier_ReceptionGate_Text_26689D: @ 826689D
+	.string "Which would you like to learn about?$"
+
+BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2
+	.string "It is the gigantic tower considered\n"
+	.string "to be the BATTLE FRONTIER’s symbol.\p"
+	.string "There are four kinds of BATTLE ROOMS\n"
+	.string "in the tower for SINGLE, DOUBLE, MULTI,\l"
+	.string "and LINK MULTI BATTLES.$"
+
+BattleFrontier_ReceptionGate_Text_26696F: @ 826696F
+	.string "The BATTLE DOME is the large building\n"
+	.string "shaped like a huge egg.\p"
+	.string "Events named Battle Tourneys are held\n"
+	.string "in this facility.\p"
+	.string "The Battle Tourneys are offered in\n"
+	.string "two courses--for SINGLE and DOUBLE\l"
+	.string "BATTLES.$"
+
+BattleFrontier_ReceptionGate_Text_266A34: @ 8266A34
+	.string "The BATTLE PALACE is the red building\n"
+	.string "on the right of the BATTLE FRONTIER.\p"
+	.string "There are two kinds of BATTLE HALLS\n"
+	.string "for SINGLE and DOUBLE BATTLES.$"
+
+BattleFrontier_ReceptionGate_Text_266AC2: @ 8266AC2
+	.string "The BATTLE ARENA is the dojo-like\n"
+	.string "building at the center-right of\l"
+	.string "the BATTLE FRONTIER.\p"
+	.string "An event called the Set KO Tourney\n"
+	.string "takes place at the BATTLE ARENA.$"
+
+BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D
+	.string "The BATTLE FACTORY is the large\n"
+	.string "building that is the closest to us.\p"
+	.string "An event called the Battle Swap\n"
+	.string "is conducted there.\p"
+	.string "The Battle Swap event is offered in\n"
+	.string "two courses for SINGLE and DOUBLE\l"
+	.string "BATTLES.$"
+
+BattleFrontier_ReceptionGate_Text_266C24: @ 8266C24
+	.string "The BATTLE PIKE is the building shaped\n"
+	.string "like a POKéMON at the center-left of\l"
+	.string "the BATTLE FRONTIER.\p"
+	.string "An event called the Battle Choice\n"
+	.string "is conducted there.$"
+
+BattleFrontier_ReceptionGate_Text_266CBB: @ 8266CBB
+	.string "The BATTLE PYRAMID is the enormous\n"
+	.string "pyramid.\p"
+	.string "An event called the Battle Quest\n"
+	.string "is conducted there.$"
+
+BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C
+	.string "The RANKING HALL is located near\n"
+	.string "the BATTLE TOWER.\p"
+	.string "There, you may see the most fantastic\n"
+	.string "records left by the TRAINERS that\l"
+	.string "took on the many challenges of\l"
+	.string "the BATTLE FRONTIER.$"
+
+BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB
+	.string "The EXCHANGE SERVICE CORNER is near\n"
+	.string "the BATTLE TOWER.\p"
+	.string "The Battle Points you have earned in\n"
+	.string "the BATTLE FRONTIER may be exchanged\l"
+	.string "for fabulous prizes there.$"
+
+BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66
+	.string "I’m your guide to the basic rules that\n"
+	.string "are common to all the challenges\l"
+	.string "offered by the facilities in the BATTLE\l"
+	.string "FRONTIER.$"
+
+BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0
+	.string "What would you like to learn about?$"
+
+BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04
+	.string "All the challenges at the BATTLE\n"
+	.string "FRONTIER’s facilities come in\l"
+	.string "two courses--Level 50 and Open Level.$"
+
+BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69
+	.string "The Level 50 course is open to POKéMON\n"
+	.string "up to and including Level 50.\p"
+	.string "Please keep in mind, however, that\n"
+	.string "no TRAINER you face will have any\l"
+	.string "POKéMON below Level 50.\p"
+	.string "This course is the entry level for\n"
+	.string "battles at the BATTLE FRONTIER.\p"
+	.string "To begin, we hope you will challenge\n"
+	.string "this course.$"
+
+BattleFrontier_ReceptionGate_Text_267080: @ 8267080
+	.string "The Open Level course places no limit\n"
+	.string "on the levels of POKéMON entering\l"
+	.string "challenges.\p"
+	.string "The levels of your opponents will\n"
+	.string "be adjusted to match the levels of\l"
+	.string "your POKéMON.\p"
+	.string "However, no TRAINER you face will\n"
+	.string "have any POKéMON below Level 60.$"
+
+BattleFrontier_ReceptionGate_Text_26716A: @ 826716A
+	.string "Virtually any kind of POKéMON may take\n"
+	.string "on the challenges at all facilities.\p"
+	.string "EGGS and certain kinds of POKéMON,\n"
+	.string "however, are not permitted.\p"
+	.string "The numbers of POKéMON required for\n"
+	.string "challenges will depend on the facility.\p"
+	.string "At all facilities, however, two or more\n"
+	.string "of the same kind of POKéMON are not\l"
+	.string "permitted.$"
+
+BattleFrontier_ReceptionGate_Text_267298: @ 8267298
+	.string "When entering a challenge at a BATTLE\n"
+	.string "FRONTIER facility, POKéMON may not\l"
+	.string "be holding the same kind of item.\p"
+	.string "Please make sure that all POKéMON\n"
+	.string "entering a challenge are holding\l"
+	.string "different items.$"
+
+BattleFrontier_ReceptionGate_Text_267357: @ 8267357
+	.string "I’m your guide to the FRONTIER PASS.$"
+
+BattleFrontier_ReceptionGate_Text_26737C: @ 826737C
+	.string "Which would you like to learn about?$"
+
+BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1
+	.string "There are seven facilities at\n"
+	.string "the BATTLE FRONTIER.\p"
+	.string "TRAINERS who gain recognition for\n"
+	.string "their abilities may be rewarded with\l"
+	.string "symbols from each of the facilities.\p"
+	.string "To earn a symbol, TRAINERS may need\n"
+	.string "to defeat other TRAINERS in a row,\l"
+	.string "and may need to win events repeatedly.\p"
+	.string "It’s certainly not easy to win symbols.\n"
+	.string "I wish you the best of luck!$"
+
+BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3
+	.string "It is possible to record one battle\n"
+	.string "on your FRONTIER PASS.\p"
+	.string "You may record a battle you had with\n"
+	.string "a friend or friends.\p"
+	.string "Or you may record a battle conducted\n"
+	.string "at the BATTLE FRONTIER excluding\l"
+	.string "matches at the BATTLE PIKE or\l"
+	.string "the BATTLE PYRAMID.\p"
+	.string "You may choose to record your match\n"
+	.string "at the end of a battle.$"
+
+BattleFrontier_ReceptionGate_Text_26761C: @ 826761C
+	.string "Battle Points are rewards given to\n"
+	.string "TRAINERS who battled outstandingly\l"
+	.string "at the BATTLE FRONTIER.\p"
+	.string "You may trade in your Battle Points\n"
+	.string "for prizes at the EXCHANGE SERVICE\l"
+	.string "CORNER.$"
+
diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc
new file mode 100644
index 000000000..3f4dcff86
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..0fbbb55e3 100644
--- a/data/maps/BattleFrontier_ScottsHouse/header.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_ScottsHouse: @ 8485644
-	.4byte BattleFrontier_ScottsHouse_MapAttributes
+	.4byte BattleFrontier_ScottsHouse_Layout
 	.4byte BattleFrontier_ScottsHouse_MapEvents
 	.4byte BattleFrontier_ScottsHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 430
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bd6b45b82
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..bcbc06c90 100644
--- a/data/maps/BattlePyramidSquare01/header.inc
+++ b/data/maps/BattlePyramidSquare01/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare01: @ 8484F60
-	.4byte BattlePyramidSquare01_MapAttributes
+	.4byte BattlePyramidSquare01_Layout
 	.4byte BattlePyramidSquare01_MapEvents
 	.4byte BattlePyramidSquare01_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 362
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..67f235026
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..24255ea1a 100644
--- a/data/maps/BattlePyramidSquare02/header.inc
+++ b/data/maps/BattlePyramidSquare02/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare02: @ 8484F7C
-	.4byte BattlePyramidSquare02_MapAttributes
+	.4byte BattlePyramidSquare02_Layout
 	.4byte BattlePyramidSquare02_MapEvents
 	.4byte BattlePyramidSquare02_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 363
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..1f38240c5
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..21e15dc82 100644
--- a/data/maps/BattlePyramidSquare03/header.inc
+++ b/data/maps/BattlePyramidSquare03/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare03: @ 8484F98
-	.4byte BattlePyramidSquare03_MapAttributes
+	.4byte BattlePyramidSquare03_Layout
 	.4byte BattlePyramidSquare03_MapEvents
 	.4byte BattlePyramidSquare03_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 364
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..f44a6e14c
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..fae10152a 100644
--- a/data/maps/BattlePyramidSquare04/header.inc
+++ b/data/maps/BattlePyramidSquare04/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare04: @ 8484FB4
-	.4byte BattlePyramidSquare04_MapAttributes
+	.4byte BattlePyramidSquare04_Layout
 	.4byte BattlePyramidSquare04_MapEvents
 	.4byte BattlePyramidSquare04_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 365
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..472178c56
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..17e05fc19 100644
--- a/data/maps/BattlePyramidSquare05/header.inc
+++ b/data/maps/BattlePyramidSquare05/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare05: @ 8484FD0
-	.4byte BattlePyramidSquare05_MapAttributes
+	.4byte BattlePyramidSquare05_Layout
 	.4byte BattlePyramidSquare05_MapEvents
 	.4byte BattlePyramidSquare05_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 366
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..3363f6d43
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..9a1543a33 100644
--- a/data/maps/BattlePyramidSquare06/header.inc
+++ b/data/maps/BattlePyramidSquare06/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare06: @ 8484FEC
-	.4byte BattlePyramidSquare06_MapAttributes
+	.4byte BattlePyramidSquare06_Layout
 	.4byte BattlePyramidSquare06_MapEvents
 	.4byte BattlePyramidSquare06_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 367
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..2891e92df
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..78d3cf7f4 100644
--- a/data/maps/BattlePyramidSquare07/header.inc
+++ b/data/maps/BattlePyramidSquare07/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare07: @ 8485008
-	.4byte BattlePyramidSquare07_MapAttributes
+	.4byte BattlePyramidSquare07_Layout
 	.4byte BattlePyramidSquare07_MapEvents
 	.4byte BattlePyramidSquare07_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 368
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..f095c3972
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..de960bab0 100644
--- a/data/maps/BattlePyramidSquare08/header.inc
+++ b/data/maps/BattlePyramidSquare08/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare08: @ 8485024
-	.4byte BattlePyramidSquare08_MapAttributes
+	.4byte BattlePyramidSquare08_Layout
 	.4byte BattlePyramidSquare08_MapEvents
 	.4byte BattlePyramidSquare08_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 369
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..265b9b1b6
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..96b2beb37 100644
--- a/data/maps/BattlePyramidSquare09/header.inc
+++ b/data/maps/BattlePyramidSquare09/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare09: @ 8485040
-	.4byte BattlePyramidSquare09_MapAttributes
+	.4byte BattlePyramidSquare09_Layout
 	.4byte BattlePyramidSquare09_MapEvents
 	.4byte BattlePyramidSquare09_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 370
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..b697a7d02
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..37901889f 100644
--- a/data/maps/BattlePyramidSquare10/header.inc
+++ b/data/maps/BattlePyramidSquare10/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare10: @ 848505C
-	.4byte BattlePyramidSquare10_MapAttributes
+	.4byte BattlePyramidSquare10_Layout
 	.4byte BattlePyramidSquare10_MapEvents
 	.4byte BattlePyramidSquare10_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 371
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..6210faa6f
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..c188ecb86 100644
--- a/data/maps/BattlePyramidSquare11/header.inc
+++ b/data/maps/BattlePyramidSquare11/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare11: @ 8485078
-	.4byte BattlePyramidSquare11_MapAttributes
+	.4byte BattlePyramidSquare11_Layout
 	.4byte BattlePyramidSquare11_MapEvents
 	.4byte BattlePyramidSquare11_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 372
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..cad871e8d
--- /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, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..11e6c7b98 100644
--- a/data/maps/BattlePyramidSquare12/header.inc
+++ b/data/maps/BattlePyramidSquare12/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare12: @ 8485094
-	.4byte BattlePyramidSquare12_MapAttributes
+	.4byte BattlePyramidSquare12_Layout
 	.4byte BattlePyramidSquare12_MapEvents
 	.4byte BattlePyramidSquare12_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 373
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..af56598c3
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..2f5746143 100644
--- a/data/maps/BattlePyramidSquare13/header.inc
+++ b/data/maps/BattlePyramidSquare13/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare13: @ 84850B0
-	.4byte BattlePyramidSquare13_MapAttributes
+	.4byte BattlePyramidSquare13_Layout
 	.4byte BattlePyramidSquare13_MapEvents
 	.4byte BattlePyramidSquare13_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 374
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..48b98a361
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..5926a9d2a 100644
--- a/data/maps/BattlePyramidSquare14/header.inc
+++ b/data/maps/BattlePyramidSquare14/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare14: @ 84850CC
-	.4byte BattlePyramidSquare14_MapAttributes
+	.4byte BattlePyramidSquare14_Layout
 	.4byte BattlePyramidSquare14_MapEvents
 	.4byte BattlePyramidSquare14_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 375
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..50d0addf2
--- /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, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..e65db912d 100644
--- a/data/maps/BattlePyramidSquare15/header.inc
+++ b/data/maps/BattlePyramidSquare15/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare15: @ 84850E8
-	.4byte BattlePyramidSquare15_MapAttributes
+	.4byte BattlePyramidSquare15_Layout
 	.4byte BattlePyramidSquare15_MapEvents
 	.4byte BattlePyramidSquare15_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 376
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..84bb566c2
--- /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, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..f8f97b671 100644
--- a/data/maps/BattlePyramidSquare16/header.inc
+++ b/data/maps/BattlePyramidSquare16/header.inc
@@ -1,15 +1,15 @@
 BattlePyramidSquare16: @ 8485104
-	.4byte BattlePyramidSquare16_MapAttributes
+	.4byte BattlePyramidSquare16_Layout
 	.4byte BattlePyramidSquare16_MapEvents
 	.4byte BattlePyramidSquare16_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 377
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..4093e4086
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764
+	object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 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..dabad3a71 100644
--- a/data/maps/BirthIsland_Exterior/header.inc
+++ b/data/maps/BirthIsland_Exterior/header.inc
@@ -1,15 +1,15 @@
 BirthIsland_Exterior: @ 8485794
-	.4byte BirthIsland_Exterior_MapAttributes
+	.4byte BirthIsland_Exterior_Layout
 	.4byte BirthIsland_Exterior_MapEvents
 	.4byte BirthIsland_Exterior_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 404
-	.byte 200
+	.byte MAPSEC_BIRTH_ISLAND_2
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
new file mode 100644
index 000000000..b2427e95d
--- /dev/null
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -0,0 +1,125 @@
+BirthIsland_Exterior_MapScripts:: @ 8267F15
+	map_script 3, BirthIsland_Exterior_MapScript1_267F29
+	map_script 5, BirthIsland_Exterior_MapScript1_267F65
+	map_script 7, BirthIsland_Exterior_MapScript1_267F25
+	.byte 0
+
+BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
+	special sub_813B1D0
+	end
+
+BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
+	setflag FLAG_0x8D3
+	setvar VAR_OBJ_GFX_ID_0, 100
+	setvar VAR_0x4034, 0
+	setvar VAR_0x4035, 0
+	checkflag FLAG_0x1AD
+	call_if 1, BirthIsland_Exterior_EventScript_267F4E
+	checkflag FLAG_0x1AD
+	call_if 0, BirthIsland_Exterior_EventScript_267F55
+	end
+
+BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
+	setflag FLAG_0x2FB
+	setflag FLAG_0x2FC
+	return
+
+BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
+	checkflag FLAG_0x1AC
+	goto_eq BirthIsland_Exterior_EventScript_27374E
+	clearflag FLAG_0x2FC
+	clearflag FLAG_0x8D4
+	return
+
+BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, BirthIsland_Exterior_EventScript_267F6F
+	end
+
+BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, BirthIsland_Exterior_EventScript_27374E
+	removeobject 2
+	return
+
+BirthIsland_Exterior_EventScript_267F83:: @ 8267F83
+	lock
+	faceplayer
+	special sub_813AFC8
+	waitstate
+	switch VAR_RESULT
+	case 0, BirthIsland_Exterior_EventScript_267FBB
+	case 1, BirthIsland_Exterior_EventScript_267FBD
+	case 2, BirthIsland_Exterior_EventScript_267FC1
+	case 3, BirthIsland_Exterior_EventScript_267FBF
+	end
+
+BirthIsland_Exterior_EventScript_267FBB:: @ 8267FBB
+	release
+	end
+
+BirthIsland_Exterior_EventScript_267FBD:: @ 8267FBD
+	release
+	end
+
+BirthIsland_Exterior_EventScript_267FBF:: @ 8267FBF
+	release
+	end
+
+BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
+	waitse
+	setfieldeffectargument 0, 1
+	setfieldeffectargument 1, 58
+	setfieldeffectargument 2, 26
+	dofieldeffect 65
+	playbgm MUS_RG_DEOEYE, 0
+	waitfieldeffect 65
+	addobject 2
+	applymovement 2, BirthIsland_Exterior_Movement_268054
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_DEOXYS, 2
+	delay 40
+	waitmoncry
+	setvar VAR_LAST_TALKED, 2
+	setvar VAR_0x8004, 410
+	setvar VAR_0x8005, 30
+	setvar VAR_0x8006, 0
+	special CreateObedientEnemyMon
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special BattleSetup_StartLegendaryBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq BirthIsland_Exterior_EventScript_26803B
+	compare VAR_RESULT, 4
+	goto_eq BirthIsland_Exterior_EventScript_268049
+	compare VAR_RESULT, 5
+	goto_eq BirthIsland_Exterior_EventScript_268049
+	setflag FLAG_0x1AD
+	release
+	end
+
+BirthIsland_Exterior_EventScript_26803B:: @ 826803B
+	setflag FLAG_0x1AC
+	setvar VAR_0x8004, 410
+	goto BirthIsland_Exterior_EventScript_273776
+	end
+
+BirthIsland_Exterior_EventScript_268049:: @ 8268049
+	setvar VAR_0x8004, 410
+	goto BirthIsland_Exterior_EventScript_273776
+	end
+
+BirthIsland_Exterior_Movement_268054: @ 8268054
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	step_end
+
diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc
new file mode 100644
index 000000000..8b8fe4660
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 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..f2493d738 100644
--- a/data/maps/BirthIsland_Harbor/header.inc
+++ b/data/maps/BirthIsland_Harbor/header.inc
@@ -1,15 +1,15 @@
 BirthIsland_Harbor: @ 84857B0
-	.4byte BirthIsland_Harbor_MapAttributes
+	.4byte IslandHarbor_Layout
 	.4byte BirthIsland_Harbor_MapEvents
 	.4byte BirthIsland_Harbor_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 405
-	.byte 200
+	.byte MAPSEC_BIRTH_ISLAND_2
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..384d08bd7 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -1,15 +1,15 @@
 CaveOfOrigin_1F: @ 84842E8
-	.4byte CaveOfOrigin_1F_MapAttributes
+	.4byte CaveOfOrigin_1F_Layout
 	.4byte CaveOfOrigin_1F_MapEvents
 	.4byte CaveOfOrigin_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN03
 	.2byte 158
-	.byte 72
+	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bd1b79bc0
--- /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, MOVEMENT_TYPE_FACE_UP, 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..d8dab3bea 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -1,15 +1,15 @@
 CaveOfOrigin_B1F: @ 8484358
-	.4byte CaveOfOrigin_B1F_MapAttributes
+	.4byte CaveOfOrigin_B1F_Layout
 	.4byte CaveOfOrigin_B1F_MapEvents
 	.4byte CaveOfOrigin_B1F_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 162
-	.byte 72
+	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 0
-	.byte 6
-	.byte 4
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 14
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d42f912da 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -1,15 +1,15 @@
 CaveOfOrigin_Entrance: @ 84842CC
-	.4byte CaveOfOrigin_Entrance_MapAttributes
+	.4byte CaveOfOrigin_Entrance_Layout
 	.4byte CaveOfOrigin_Entrance_MapEvents
 	.4byte CaveOfOrigin_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN03
 	.2byte 157
-	.byte 72
+	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b8edb52bc 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc
@@ -1,15 +1,15 @@
 CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
-	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes
+	.4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout
 	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents
 	.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN03
 	.2byte 159
-	.byte 72
+	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 1
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8d0f83892 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc
@@ -1,15 +1,15 @@
 CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
-	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes
+	.4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout
 	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents
 	.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN03
 	.2byte 160
-	.byte 72
+	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 1
-	.byte 6
-	.byte 4
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..00e07549e 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc
@@ -1,15 +1,15 @@
 CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
-	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes
+	.4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout
 	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents
 	.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN03
 	.2byte 161
-	.byte 72
+	.byte MAPSEC_CAVE_OF_ORIGIN
 	.byte 1
-	.byte 6
-	.byte 4
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..036127ca8
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB
+	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8
+	bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, 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..16e2ce55a 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -1,15 +1,15 @@
 DesertRuins: @ 8483F68
-	.4byte DesertRuins_MapAttributes
+	.4byte DesertRuins_Layout
 	.4byte DesertRuins_MapEvents
 	.4byte DesertRuins_MapScripts
 	.4byte 0x0
 	.2byte MUS_MABOROSI
 	.2byte 131
-	.byte 82
+	.byte MAPSEC_DESERT_RUINS
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..76215c65a
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..c4f3a05c7 100644
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -1,15 +1,15 @@
 DesertUnderpass: @ 8484978
-	.4byte DesertUnderpass_MapAttributes
+	.4byte DesertUnderpass_Layout
 	.4byte DesertUnderpass_MapEvents
 	.4byte DesertUnderpass_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 389
-	.byte 209
+	.byte MAPSEC_DESERT_UNDERPASS
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fadd3b282
--- /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, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, 740
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0
+	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 743
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA
+	bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3
+	bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73
+	bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73
+	bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, 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..c905fd606 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -1,15 +1,15 @@
 DewfordTown: @ 84825EC
-	.4byte DewfordTown_MapAttributes
+	.4byte DewfordTown_Layout
 	.4byte DewfordTown_MapEvents
 	.4byte DewfordTown_MapScripts
 	.4byte DewfordTown_MapConnections
 	.2byte MUS_HIGHTOWN
 	.2byte 12
-	.byte 2
+	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a4c45c2cb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0
+	object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2
+	bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2
+	bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2
+	bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..4463cc40e 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -1,15 +1,15 @@
 DewfordTown_Gym: @ 8482C60
-	.4byte DewfordTown_Gym_MapAttributes
+	.4byte DewfordTown_Gym_Layout
 	.4byte DewfordTown_Gym_MapEvents
 	.4byte DewfordTown_Gym_MapScripts
 	.4byte 0x0
 	.2byte MUS_GIM
 	.2byte 65
-	.byte 2
+	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..cd6fb5e8f
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0
+	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0
+	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590
+	bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, 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..1ba44b49d 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -1,15 +1,15 @@
 DewfordTown_Hall: @ 8482C7C
-	.4byte DewfordTown_Hall_MapAttributes
+	.4byte DewfordTown_Hall_Layout
 	.4byte DewfordTown_Hall_MapEvents
 	.4byte DewfordTown_Hall_MapScripts
 	.4byte 0x0
 	.2byte MUS_HIGHTOWN
 	.2byte 66
-	.byte 2
+	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc
new file mode 100644
index 000000000..37122a640
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -0,0 +1,453 @@
+DewfordTown_Hall_MapScripts:: @ 81FD4CF
+	.byte 0
+
+DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_271E8B
+	special TrendyPhraseIsOld
+	compare VAR_RESULT, 1
+	goto_eq DewfordTown_Hall_EventScript_1FD4EF
+	msgbox DewfordTown_Hall_Text_1FD818, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF
+	msgbox DewfordTown_Hall_Text_1FD877, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_271E8B
+	msgbox DewfordTown_Hall_Text_1FD8ED, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_271E8B
+	special sub_811EF6C
+	msgbox DewfordTown_Hall_Text_1FD948, 5
+	compare VAR_RESULT, 1
+	goto_eq DewfordTown_Hall_EventScript_1FD533
+	compare VAR_RESULT, 0
+	goto_eq DewfordTown_Hall_EventScript_1FD53D
+	end
+
+DewfordTown_Hall_EventScript_1FD533:: @ 81FD533
+	msgbox DewfordTown_Hall_Text_1FD9B3, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D
+	msgbox DewfordTown_Hall_Text_1FDA06, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_271E8B
+	msgbox DewfordTown_Hall_Text_1FDA5C, 4
+	closemessage
+	applymovement 4, DewfordTown_Hall_Movement_2725A6
+	waitmovement 0
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_271E8B
+	msgbox DewfordTown_Hall_Text_1FDA99, 4
+	closemessage
+	applymovement 5, DewfordTown_Hall_Movement_2725A6
+	waitmovement 0
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_271E8B
+	msgbox DewfordTown_Hall_Text_1FDAC4, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD590:: @ 81FD590
+	lockall
+	call DewfordTown_Hall_EventScript_271E8B
+	msgbox DewfordTown_Hall_Text_1FDB89, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0
+	lockall
+	call DewfordTown_Hall_EventScript_271E8B
+	special GetDewfordHallPaintingNameIndex
+	switch VAR_RESULT
+	case 0, DewfordTown_Hall_EventScript_1FD607
+	case 4, DewfordTown_Hall_EventScript_1FD607
+	case 1, DewfordTown_Hall_EventScript_1FD611
+	case 5, DewfordTown_Hall_EventScript_1FD607
+	case 2, DewfordTown_Hall_EventScript_1FD61B
+	case 6, DewfordTown_Hall_EventScript_1FD61B
+	case 3, DewfordTown_Hall_EventScript_1FD625
+	case 7, DewfordTown_Hall_EventScript_1FD61B
+	end
+
+DewfordTown_Hall_EventScript_1FD607:: @ 81FD607
+	msgbox DewfordTown_Hall_Text_1FDC05, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD611:: @ 81FD611
+	msgbox DewfordTown_Hall_Text_1FDC21, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B
+	msgbox DewfordTown_Hall_Text_1FDC3C, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD625:: @ 81FD625
+	msgbox DewfordTown_Hall_Text_1FDC57, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F
+	lockall
+	setvar VAR_0x8008, 0
+	goto DewfordTown_Hall_EventScript_1FD647
+	end
+
+DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B
+	lockall
+	setvar VAR_0x8008, 1
+	goto DewfordTown_Hall_EventScript_1FD647
+	end
+
+DewfordTown_Hall_EventScript_1FD647:: @ 81FD647
+	call DewfordTown_Hall_EventScript_271E8B
+	special GetDewfordHallPaintingNameIndex
+	switch VAR_RESULT
+	case 0, DewfordTown_Hall_EventScript_1FD6AD
+	case 1, DewfordTown_Hall_EventScript_1FD6AD
+	case 2, DewfordTown_Hall_EventScript_1FD6C9
+	case 3, DewfordTown_Hall_EventScript_1FD6C9
+	case 4, DewfordTown_Hall_EventScript_1FD6E5
+	case 5, DewfordTown_Hall_EventScript_1FD6E5
+	case 6, DewfordTown_Hall_EventScript_1FD701
+	case 7, DewfordTown_Hall_EventScript_1FD71D
+	end
+
+DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD
+	call DewfordTown_Hall_EventScript_1FD73A
+	msgbox DewfordTown_Hall_Text_1FDC76, 4
+	call DewfordTown_Hall_EventScript_1FD772
+	msgbox DewfordTown_Hall_Text_1FDCE2, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9
+	call DewfordTown_Hall_EventScript_1FD73A
+	msgbox DewfordTown_Hall_Text_1FDD95, 4
+	call DewfordTown_Hall_EventScript_1FD772
+	msgbox DewfordTown_Hall_Text_1FDE0E, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5
+	call DewfordTown_Hall_EventScript_1FD73A
+	msgbox DewfordTown_Hall_Text_1FDE77, 4
+	call DewfordTown_Hall_EventScript_1FD772
+	msgbox DewfordTown_Hall_Text_1FDED8, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD701:: @ 81FD701
+	call DewfordTown_Hall_EventScript_1FD73A
+	msgbox DewfordTown_Hall_Text_1FDF72, 4
+	call DewfordTown_Hall_EventScript_1FD772
+	msgbox DewfordTown_Hall_Text_1FDFF1, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D
+	call DewfordTown_Hall_EventScript_1FD73A
+	msgbox DewfordTown_Hall_Text_1FE09A, 4
+	call DewfordTown_Hall_EventScript_1FD772
+	msgbox DewfordTown_Hall_Text_1FE0F2, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1FD739:: @ 81FD739
+	return
+
+DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
+	applymovement 8, DewfordTown_Hall_Movement_1FD7D6
+	waitmovement 0
+	compare VAR_0x8008, 0
+	goto_eq DewfordTown_Hall_EventScript_1FD75B
+	compare VAR_0x8008, 1
+	goto_eq DewfordTown_Hall_EventScript_1FD771
+	end
+
+DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
+	compare VAR_FACING, 4
+	goto_eq DewfordTown_Hall_EventScript_1FD739
+	applymovement 255, DewfordTown_Hall_Movement_2725A8
+	waitmovement 0
+	return
+
+DewfordTown_Hall_EventScript_1FD771:: @ 81FD771
+	return
+
+DewfordTown_Hall_EventScript_1FD772:: @ 81FD772
+	applymovement 7, DewfordTown_Hall_Movement_1FD7D8
+	waitmovement 0
+	compare VAR_0x8008, 0
+	goto_eq DewfordTown_Hall_EventScript_1FD793
+	compare VAR_0x8008, 1
+	goto_eq DewfordTown_Hall_EventScript_1FD7C0
+	end
+
+DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
+	compare VAR_FACING, 2
+	call_if 1, DewfordTown_Hall_EventScript_1FD7AA
+	compare VAR_FACING, 1
+	call_if 1, DewfordTown_Hall_EventScript_1FD7B5
+	return
+
+DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
+	applymovement 255, DewfordTown_Hall_Movement_2725A6
+	waitmovement 0
+	return
+
+DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
+	applymovement 255, DewfordTown_Hall_Movement_2725AA
+	waitmovement 0
+	return
+
+DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
+	compare VAR_FACING, 3
+	goto_eq DewfordTown_Hall_EventScript_1FD739
+	applymovement 255, DewfordTown_Hall_Movement_2725A4
+	waitmovement 0
+	return
+
+DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6
+	walk_in_place_left
+	step_end
+
+DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8
+	walk_in_place_right
+	step_end
+
+DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_271E8B
+	checkflag FLAG_0x0E6
+	goto_eq DewfordTown_Hall_EventScript_1FD80E
+	msgbox DewfordTown_Hall_Text_1FE142, 4
+	giveitem_std ITEM_TM36
+	compare VAR_RESULT, 0
+	goto_eq DewfordTown_Hall_EventScript_272054
+	setflag FLAG_0x0E6
+	release
+	end
+
+DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E
+	msgbox DewfordTown_Hall_Text_1FE1ED, 4
+	release
+	end
+
+DewfordTown_Hall_Text_1FD818: @ 81FD818
+	.string "What’s in vogue? Why, it has to be\n"
+	.string "“{STR_VAR_1}”!\p"
+	.string "I can’t imagine what life would be like\n"
+	.string "without “{STR_VAR_1}”!$"
+
+DewfordTown_Hall_Text_1FD877: @ 81FD877
+	.string "What’s in vogue? Why, it has to be\n"
+	.string "“{STR_VAR_1}”!\p"
+	.string "But I’m getting kind of bored with it.\p"
+	.string "I should look for the next big thing.$"
+
+DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED
+	.string "I’m teaching my POKéMON about\n"
+	.string "“{STR_VAR_1},”\l"
+	.string "but it’s not going well.\p"
+	.string "It’s a bit too much, I think.$"
+
+DewfordTown_Hall_Text_1FD948: @ 81FD948
+	.string "I’m studying up on the hip and trendy\n"
+	.string "“{STR_VAR_1}” now.\p"
+	.string "Is it true that there’s a deep link\n"
+	.string "between “{STR_VAR_1}”\l"
+	.string "and “{STR_VAR_2}”?$"
+
+DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3
+	.string "Oh!\n"
+	.string "So, my hunch was right!\p"
+	.string "I’m one step closer to being hip and\n"
+	.string "happening, yowza!$"
+
+DewfordTown_Hall_Text_1FDA06: @ 81FDA06
+	.string "What?!\n"
+	.string "Is that so?!\p"
+	.string "It’s not easy for an older fellow like\n"
+	.string "me to keep up with trends!$"
+
+DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C
+	.string "This whole business about\n"
+	.string "“{STR_VAR_1}”…\l"
+	.string "Isn’t there a TV show on it?$"
+
+DewfordTown_Hall_Text_1FDA99: @ 81FDA99
+	.string "Across the sea…\p"
+	.string "Is “{STR_VAR_1}”\n"
+	.string "even more popular?$"
+
+DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4
+	.string "I collect official\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "licensed merchandise.\p"
+	.string "I have official\n"
+	.string "“{STR_VAR_1}” DOLLS…\p"
+	.string "Official “{STR_VAR_1}”\n"
+	.string "brand clothing…\p"
+	.string "And officially licensed\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "picture books.\p"
+	.string "Heheh, I own!\n"
+	.string "I’m not sharing anything with you!$"
+
+DewfordTown_Hall_Text_1FDB89: @ 81FDB89
+	.string "IDENTIFYING GOOD\n"
+	.string "“{STR_VAR_1}” &\l"
+	.string "BAD “{STR_VAR_1}”…\p"
+	.string "THE LINK BETWEEN\n"
+	.string "“{STR_VAR_1}” AND\l"
+	.string "POKéMON…\p"
+	.string "USEFUL\n"
+	.string "“{STR_VAR_1}”…\p"
+	.string "It’s neatly jammed with books about\n"
+	.string "“{STR_VAR_1}.”$"
+
+DewfordTown_Hall_Text_1FDC05: @ 81FDC05
+	.string "“{STR_VAR_1}’S\n"
+	.string "SCREAM” is the title.$"
+
+DewfordTown_Hall_Text_1FDC21: @ 81FDC21
+	.string "“{STR_VAR_1}’S\n"
+	.string "SMILE” is the title.$"
+
+DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C
+	.string "It’s titled “THE LAST\n"
+	.string "{STR_VAR_1}”.$"
+
+DewfordTown_Hall_Text_1FDC57: @ 81FDC57
+	.string "It’s titled “THE BIRTH OF\n"
+	.string "{STR_VAR_1}”.$"
+
+DewfordTown_Hall_Text_1FDC76: @ 81FDC76
+	.string "I saw “{STR_VAR_1}”!\n"
+	.string "Cool, huh?\p"
+	.string "It’s, like, the coolest thing going!\p"
+	.string "It was awesome!\n"
+	.string "It was the real thing, oh yeah!$"
+
+DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2
+	.string "Oh, no, no, no.\p"
+	.string "That alleged\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "you claim to have seen--it’s not.\p"
+	.string "The authentic article is much…\n"
+	.string "How should I say it?\l"
+	.string "Sharper, yet more mellow!\p"
+	.string "Ah, no matter. It’s astonishing!$"
+
+DewfordTown_Hall_Text_1FDD95: @ 81FDD95
+	.string "Hey, listen, I composed a theme song\n"
+	.string "for “{STR_VAR_1}.”\p"
+	.string "“{STR_VAR_1}”\n"
+	.string "is really popular right now.\p"
+	.string "Okay, listen!\n"
+	.string "… …\p"
+	.string "Oh!\n"
+	.string "{STR_VAR_1}!\p"
+	.string "Wonderful\n"
+	.string "{STR_VAR_1}!$"
+
+DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E
+	.string "… …\p"
+	.string "I dare say, chap, it would pay for you\n"
+	.string "to work on your singing before you\l"
+	.string "trifle yourself with\l"
+	.string "“{STR_VAR_1}.”$"
+
+DewfordTown_Hall_Text_1FDE77: @ 81FDE77
+	.string "Anyway, as I was saying earlier, we\n"
+	.string "should get together and organize a\l"
+	.string "“{STR_VAR_1}” party\l"
+	.string "on the island.$"
+
+DewfordTown_Hall_Text_1FDED8: @ 81FDED8
+	.string "Oh, a smashing good idea!\p"
+	.string "It will settle once and for all\n"
+	.string "who is the best at\l"
+	.string "“{STR_VAR_1}.”\l"
+	.string "Brilliant, indeed!\p"
+	.string "Starting today, our lives will revolve\n"
+	.string "around “{STR_VAR_1}”!$"
+
+DewfordTown_Hall_Text_1FDF72: @ 81FDF72
+	.string "I was thinking, though…\p"
+	.string "Wouldn’t you agree that\n"
+	.string "“{STR_VAR_1}” has\l"
+	.string "grown from being something trendy to\l"
+	.string "being a part of our daily lives?$"
+
+DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1
+	.string "Beg pardon?\n"
+	.string "That much, what?\p"
+	.string "However, it’s true that\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "weighs heavily on your mind, whether\l"
+	.string "you’re awake or asleep.\p"
+	.string "Absolutely, you’re the\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "PROFESSOR, old sport!$"
+
+DewfordTown_Hall_Text_1FE09A: @ 81FE09A
+	.string "If you and me team up as a combo,\n"
+	.string "we’ll be invincible when it comes to all\l"
+	.string "things “{STR_VAR_1}”!$"
+
+DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2
+	.string "Spot on, my friend!\p"
+	.string "We shall be the\n"
+	.string "“{STR_VAR_1}” DUO!\p"
+	.string "Isn’t that a ripe image?\n"
+	.string "Hahahah!$"
+
+DewfordTown_Hall_Text_1FE142: @ 81FE142
+	.string "For me, SLUDGE BOMB is at the peak\n"
+	.string "of popularity. It’s the one.\p"
+	.string "Hunh? You’re telling me that you don’t\n"
+	.string "know about SLUDGE BOMB?\p"
+	.string "That’s outright pitiful.\n"
+	.string "I’ll give you one.$"
+
+DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED
+	.string "I love SLUDGE BOMB.\p"
+	.string "But POKéMON with the move\n"
+	.string "“{STR_VAR_1}”\l"
+	.string "are in, too.$"
+
diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc
new file mode 100644
index 000000000..72a8dc305
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0
+	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 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..219c70fc3 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -1,15 +1,15 @@
 DewfordTown_House1: @ 8482C0C
-	.4byte DewfordTown_House1_MapAttributes
+	.4byte House3_Layout
 	.4byte DewfordTown_House1_MapEvents
 	.4byte DewfordTown_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_HIGHTOWN
 	.2byte 64
-	.byte 2
+	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..9c03f4ce4
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..248b7a990 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -1,15 +1,15 @@
 DewfordTown_House2: @ 8482C98
-	.4byte DewfordTown_House2_MapAttributes
+	.4byte House4_Layout
 	.4byte DewfordTown_House2_MapEvents
 	.4byte DewfordTown_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_HIGHTOWN
 	.2byte 67
-	.byte 2
+	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2e43a2239
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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..6813134f9 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 2
+	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f9d67ecbf
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..43485dcad 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 2
+	.byte MAPSEC_DEWFORD_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ffea67228
--- /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, VAR_TEMP_0, 0, gUnknown_08277388
+	coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE
+	coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3
+	coord_event 10, 6, 3, VAR_TEMP_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..6bfc00393 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -1,15 +1,15 @@
 DoubleBattleColosseum: @ 8484D84
-	.4byte DoubleBattleColosseum_MapAttributes
+	.4byte DoubleBattleColosseum_Layout
 	.4byte DoubleBattleColosseum_MapEvents
 	.4byte DoubleBattleColosseum_MapScripts
 	.4byte 0x0
 	.2byte MUS_RAINBOW
 	.2byte 224
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..e6bc7a10a
--- /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, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+	coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46
+
+EverGrandeCity_MapBGEvents: @ 8527658
+	bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B
+	bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73
+	bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34
+	bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D
+	bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..2bebe5d12 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity: @ 8482598
-	.4byte EverGrandeCity_MapAttributes
+	.4byte EverGrandeCity_Layout
 	.4byte EverGrandeCity_MapEvents
 	.4byte EverGrandeCity_MapScripts
 	.4byte EverGrandeCity_MapConnections
 	.2byte MUS_RAINBOW
 	.2byte 9
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b09221dca
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 920
+	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 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..03ab762db 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_ChampionsRoom: @ 8483C3C
-	.4byte EverGrandeCity_ChampionsRoom_MapAttributes
+	.4byte EverGrandeCity_ChampionsRoom_Layout
 	.4byte EverGrandeCity_ChampionsRoom_MapEvents
 	.4byte EverGrandeCity_ChampionsRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 115
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4f61f50ea
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..fedc35c76 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_DrakesRoom: @ 8483C20
-	.4byte EverGrandeCity_DrakesRoom_MapAttributes
+	.4byte EverGrandeCity_DrakesRoom_Layout
 	.4byte EverGrandeCity_DrakesRoom_MapEvents
 	.4byte EverGrandeCity_DrakesRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 114
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 7
+	.byte MAP_BATTLE_SCENE_DRAKE
 
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..63dfbc0df
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..dd23d11ef 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_GlaciasRoom: @ 8483C04
-	.4byte EverGrandeCity_GlaciasRoom_MapAttributes
+	.4byte EverGrandeCity_GlaciasRoom_Layout
 	.4byte EverGrandeCity_GlaciasRoom_MapEvents
 	.4byte EverGrandeCity_GlaciasRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 113
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 6
+	.byte MAP_BATTLE_SCENE_GLACIA
 
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..b055ba8b1 100644
--- a/data/maps/EverGrandeCity_Hall1/header.inc
+++ b/data/maps/EverGrandeCity_Hall1/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_Hall1: @ 8483C58
-	.4byte EverGrandeCity_Hall1_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall1_MapEvents
 	.4byte EverGrandeCity_Hall1_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 116
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a80a688e0 100644
--- a/data/maps/EverGrandeCity_Hall2/header.inc
+++ b/data/maps/EverGrandeCity_Hall2/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_Hall2: @ 8483C74
-	.4byte EverGrandeCity_Hall2_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall2_MapEvents
 	.4byte EverGrandeCity_Hall2_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 116
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..18a9d90dc 100644
--- a/data/maps/EverGrandeCity_Hall3/header.inc
+++ b/data/maps/EverGrandeCity_Hall3/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_Hall3: @ 8483C90
-	.4byte EverGrandeCity_Hall3_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall3_MapEvents
 	.4byte EverGrandeCity_Hall3_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 116
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1aeb8e6a2 100644
--- a/data/maps/EverGrandeCity_Hall4/header.inc
+++ b/data/maps/EverGrandeCity_Hall4/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_Hall4: @ 8483CAC
-	.4byte EverGrandeCity_Hall4_MapAttributes
+	.4byte EverGrandeCity_Hall4_Layout
 	.4byte EverGrandeCity_Hall4_MapEvents
 	.4byte EverGrandeCity_Hall4_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 315
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..dd82e6b56 100644
--- a/data/maps/EverGrandeCity_Hall5/header.inc
+++ b/data/maps/EverGrandeCity_Hall5/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_Hall5: @ 8483CC8
-	.4byte EverGrandeCity_Hall5_MapAttributes
+	.4byte EverGrandeCity_ShortHall_Layout
 	.4byte EverGrandeCity_Hall5_MapEvents
 	.4byte EverGrandeCity_Hall5_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 116
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ad5f088c5
--- /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, MOVEMENT_TYPE_FACE_UP, 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..c575b2f08 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_HallOfFame: @ 8483D00
-	.4byte EverGrandeCity_HallOfFame_MapAttributes
+	.4byte EverGrandeCity_HallOfFame_Layout
 	.4byte EverGrandeCity_HallOfFame_MapEvents
 	.4byte EverGrandeCity_HallOfFame_MapScripts
 	.4byte 0x0
 	.2byte MUS_EIKOU_R
 	.2byte 298
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
new file mode 100644
index 000000000..60f0dd1ad
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -0,0 +1,99 @@
+EverGrandeCity_HallOfFame_MapScripts:: @ 822982C
+	map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846
+	map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837
+	.byte 0
+
+EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841
+	.2byte 0
+
+EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
+	turnobject 255, 2
+	end
+
+EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850
+	.2byte 0
+
+EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
+	lockall
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_229901
+	waitmovement 0
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4
+	waitmovement 0
+	msgbox EverGrandeCity_HallOfFame_Text_22990E, 4
+	closemessage
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_229908
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_229908
+	waitmovement 0
+	delay 20
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4
+	waitmovement 0
+	msgbox EverGrandeCity_HallOfFame_Text_2299A3, 4
+	closemessage
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6
+	waitmovement 0
+	delay 20
+	dofieldeffect 62
+	waitfieldeffect 62
+	delay 40
+	setvar VAR_TEMP_1, 1
+	call EverGrandeCity_HallOfFame_EventScript_2717C1
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9
+	compare VAR_RESULT, 1
+	goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5
+	end
+
+EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
+	setrespawn 1
+	fadescreenspeed 1, 24
+	special GameClear
+	waitstate
+	releaseall
+	end
+
+EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
+	setrespawn 2
+	fadescreenspeed 1, 24
+	special GameClear
+	waitstate
+	releaseall
+	end
+
+EverGrandeCity_HallOfFame_Movement_229901: @ 8229901
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+EverGrandeCity_HallOfFame_Movement_229908: @ 8229908
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+EverGrandeCity_HallOfFame_Text_22990E: @ 822990E
+	.string "WALLACE: This room…\p"
+	.string "This is where we keep records of\n"
+	.string "POKéMON that prevailed through\l"
+	.string "harsh battles.\p"
+	.string "It is here that the LEAGUE CHAMPIONS\n"
+	.string "are honored.$"
+
+EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3
+	.string "WALLACE: Come on, let’s record your\n"
+	.string "name as a TRAINER who triumphed over\l"
+	.string "the POKéMON LEAGUE, and the names of\l"
+	.string "the partners who battled with you.$"
+
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
new file mode 100644
index 000000000..abaa81622
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..64bcaec0d 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_PhoebesRoom: @ 8483BE8
-	.4byte EverGrandeCity_PhoebesRoom_MapAttributes
+	.4byte EverGrandeCity_PhoebesRoom_Layout
 	.4byte EverGrandeCity_PhoebesRoom_MapEvents
 	.4byte EverGrandeCity_PhoebesRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 112
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 5
+	.byte MAP_BATTLE_SCENE_PHOEBE
 
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..7e90c35c7
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0
+	object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 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..46af6f51e 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..ed6e6a497
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,104 @@
+EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
+	map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
+	map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
+	.byte 0
+
+EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
+	setrespawn 11
+	checkflag FLAG_0x1CF
+	call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
+	end
+
+EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
+	checkflag FLAG_BADGE06_GET
+	goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
+	clearflag FLAG_0x319
+	return
+
+EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
+	setvar VAR_0x800B, 1
+	call EverGrandeCity_PokemonCenter_1F_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, 2
+	end
+
+EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, 2
+	end
+
+EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
+	lock
+	faceplayer
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6
+	compare VAR_FACING, 4
+	call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
+	compare VAR_FACING, 3
+	call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
+	addvar VAR_0x40D1, 1
+	setflag FLAG_0x1CF
+	playse SE_KAIDAN
+	waitse
+	removeobject 4
+	release
+	end
+
+EverGrandeCity_PokemonCenter_1F_EventScript_229AB6:: @ 8229AB6
+	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229ACC
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1
+	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229AD3
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_down
+	walk_down
+	step_end
+
+EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	step_end
+
+EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA
+	.string "The POKéMON LEAGUE is only a short\n"
+	.string "distance after the VICTORY ROAD.\p"
+	.string "If you’ve come this far, what choice\n"
+	.string "do you have but to keep going?$"
+
+EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62
+	.string "The long and harrowing VICTORY ROAD…\p"
+	.string "It’s like reliving the path one has\n"
+	.string "traveled in life…\p"
+	.string "Believe in your POKéMON and give it\n"
+	.string "your very best!$"
+
+EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1
+	.string "SCOTT: {PLAYER}{KUN}, you’ve clawed your\n"
+	.string "way up to face the POKéMON LEAGUE!\p"
+	.string "I’m happy for you!\n"
+	.string "You made my cheering worthwhile!\p"
+	.string "{PLAYER}{KUN}, if you were to become\n"
+	.string "the POKéMON LEAGUE CHAMPION…\p"
+	.string "I’ll get in touch with you then.\p"
+	.string "Okay, {PLAYER}{KUN}.\n"
+	.string "Go for greatness!$"
+
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..08dbeb5c6
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..163663bb9 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c04a0f30d
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 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..c6a86baa5 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 270
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
new file mode 100644
index 000000000..f1a6ce17f
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -0,0 +1,142 @@
+EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
+	map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
+	map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
+	.byte 0
+
+EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
+	setrespawn 20
+	setflag FLAG_LANDMARK_POKEMON_LEAGUE
+	checkflag FLAG_0x107
+	call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
+	end
+
+EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
+	setobjectxyperm 3, 9, 2
+	setobjectxyperm 4, 10, 2
+	return
+
+EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
+	setvar VAR_0x800B, 1
+	call EverGrandeCity_PokemonLeague_1F_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A
+	lock
+	faceplayer
+	message gUnknown_08272A21
+	waitmessage
+	pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624
+	msgbox gUnknown_08272A3F, 4
+	release
+	end
+
+	.align 2
+EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_REVIVE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
+	lockall
+	checkflag FLAG_0x107
+	goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_0, 11
+	call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698
+	compare VAR_TEMP_0, 8
+	call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3
+	message EverGrandeCity_PokemonLeague_1F_Text_2296E8
+	waitmessage
+	delay 120
+	checkflag FLAG_BADGE06_GET
+	goto_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE
+	closemessage
+	applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2
+	applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5
+	waitmovement 0
+	delay 10
+	playfanfare MUS_ME_BACHI
+	message EverGrandeCity_PokemonLeague_1F_Text_2297EF
+	waitmessage
+	waitfanfare
+	closemessage
+	moveobjectoffscreen 3
+	moveobjectoffscreen 4
+	setflag FLAG_0x107
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698
+	applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DA
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3
+	applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DE
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE
+	playse SE_HAZURE
+	msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, 4
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
+	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E
+	waitmovement 0
+	msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA
+	walk_down
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE
+	walk_down
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8
+	.string "Beyond this point, only those TRAINERS\n"
+	.string "who have collected all the GYM BADGES\l"
+	.string "are permitted to enter.\p"
+	.string "TRAINER, let us confirm that you have\n"
+	.string "all the GYM BADGES.$"
+
+EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787
+	.string "You haven’t obtained all the BADGES.\p"
+	.string "If you’re bound for the POKéMON\n"
+	.string "LEAGUE, you must return with them.$"
+
+EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF
+	.string "TRAINER! Believe in yourself and your\n"
+	.string "POKéMON, and go forth!$"
+
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc
new file mode 100644
index 000000000..18d45eef9
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..61370c18d 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a1446aef8
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..ce3356a95 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -1,15 +1,15 @@
 EverGrandeCity_SidneysRoom: @ 8483BCC
-	.4byte EverGrandeCity_SidneysRoom_MapAttributes
+	.4byte EverGrandeCity_SidneysRoom_Layout
 	.4byte EverGrandeCity_SidneysRoom_MapEvents
 	.4byte EverGrandeCity_SidneysRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 111
-	.byte 15
+	.byte MAPSEC_EVER_GRANDE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 4
+	.byte MAP_BATTLE_SCENE_SIDNEY
 
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..fae6f714e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
+	bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
+	bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250
+	bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
+	bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259
+	bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
+	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262
+	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, 28
+
+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..0c2053b8b 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,15 +1,15 @@
 FallarborTown: @ 8482624
-	.4byte FallarborTown_MapAttributes
+	.4byte FallarborTown_Layout
 	.4byte FallarborTown_MapEvents
 	.4byte FallarborTown_MapScripts
 	.4byte FallarborTown_MapConnections
 	.2byte MUS_TONEKUSA
 	.2byte 14
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f3c8838e6
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 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..81dbad44a 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc
@@ -1,15 +1,15 @@
 FallarborTown_BattleTentBattleRoom: @ 8482DCC
-	.4byte FallarborTown_BattleTentBattleRoom_MapAttributes
+	.4byte BattleTentBattleRoom_Layout
 	.4byte FallarborTown_BattleTentBattleRoom_MapEvents
 	.4byte FallarborTown_BattleTentBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 386
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4af82f353
--- /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, MOVEMENT_TYPE_FACE_UP, 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..4e9484d11 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/header.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc
@@ -1,15 +1,15 @@
 FallarborTown_BattleTentCorridor: @ 8482DB0
-	.4byte FallarborTown_BattleTentCorridor_MapAttributes
+	.4byte BattleTentCorridor_Layout
 	.4byte FallarborTown_BattleTentCorridor_MapEvents
 	.4byte FallarborTown_BattleTentCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 385
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..cdf9c79b9
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, 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..416d700d0 100644
--- a/data/maps/FallarborTown_BattleTentLobby/header.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/header.inc
@@ -1,15 +1,15 @@
 FallarborTown_BattleTentLobby: @ 8482D94
-	.4byte FallarborTown_BattleTentLobby_MapAttributes
+	.4byte BattleTentLobby_Layout
 	.4byte FallarborTown_BattleTentLobby_MapEvents
 	.4byte FallarborTown_BattleTentLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 384
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8f16a7869
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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..aa182e2ed 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -1,15 +1,15 @@
 FallarborTown_House1: @ 8482E20
-	.4byte FallarborTown_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte FallarborTown_House1_MapEvents
 	.4byte FallarborTown_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_TONEKUSA
 	.2byte 59
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1b4e1c96e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..c8c22eacf 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -1,15 +1,15 @@
 FallarborTown_House2: @ 8482E3C
-	.4byte FallarborTown_House2_MapAttributes
+	.4byte House2_Layout
 	.4byte FallarborTown_House2_MapEvents
 	.4byte FallarborTown_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_TONEKUSA
 	.2byte 60
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f2ec25c13
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0
+	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 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..3119638bf 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -1,15 +1,15 @@
 FallarborTown_Mart: @ 8482D78
-	.4byte FallarborTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte FallarborTown_Mart_MapEvents
 	.4byte FallarborTown_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fffc618eb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 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..65df98a81 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..15f5d2b9e
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,111 @@
+FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
+	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
+	map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30
+	.byte 0
+
+FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
+	setrespawn 17
+	call FallarborTown_PokemonCenter_1F_EventScript_2718DE
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
+	setvar VAR_0x800B, 1
+	call FallarborTown_PokemonCenter_1F_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF
+	msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8
+	msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01
+	lock
+	faceplayer
+	msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4
+	closemessage
+	switch VAR_FACING
+	case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28
+	case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
+	playse SE_JIDO_DOA
+	removeobject 4
+	clearflag FLAG_0x366
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	step_end
+
+FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	step_end
+
+FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
+	.string "Oh, hello.\n"
+	.string "You are?\p"
+	.string "Okay, your name’s {PLAYER}{KUN}.\n"
+	.string "I can see that you’re a TRAINER.\p"
+	.string "So that means you use the POKéMON\n"
+	.string "Storage System I developed.\p"
+	.string "How I arrived at that conclusion is\n"
+	.string "a simple deductive process.\p"
+	.string "You spoke to me because you wanted\n"
+	.string "to access something on this PC.\p"
+	.string "Oh, I’m sorry. I’m LANETTE.\p"
+	.string "Honestly, I’m glad to meet you--it’s\n"
+	.string "great you’re using the Storage System.\p"
+	.string "If you could, please visit me at home.\n"
+	.string "My house is on ROUTE 114.$"
+
+FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22
+	.string "I wonder what POKéMON looked like\n"
+	.string "long, long ago?\p"
+	.string "Maybe the FOSSIL MANIAC at the edge\n"
+	.string "of town will know.$"
+
+FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B
+	.string "In the fields of FALLARBOR, we plant\n"
+	.string "seedlings of hardy trees that thrive\l"
+	.string "even in volcanic ash.$"
+
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..563b6bc50
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..5308b4e09 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6c2a8ebe3
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 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, FarawayIsland_Entrance_EventScript_267C98
+	coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D
+	coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98
+
+FarawayIsland_Entrance_MapBGEvents: @ 853D780
+	bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..e06051d7e 100644
--- a/data/maps/FarawayIsland_Entrance/header.inc
+++ b/data/maps/FarawayIsland_Entrance/header.inc
@@ -1,15 +1,15 @@
 FarawayIsland_Entrance: @ 848575C
-	.4byte FarawayIsland_Entrance_MapAttributes
+	.4byte FarawayIsland_Entrance_Layout
 	.4byte FarawayIsland_Entrance_MapEvents
 	.4byte FarawayIsland_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 402
-	.byte 201
+	.byte MAPSEC_FARAWAY_ISLAND
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b9242b5be
--- /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, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 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..b45ac71c3 100644
--- a/data/maps/FarawayIsland_Interior/header.inc
+++ b/data/maps/FarawayIsland_Interior/header.inc
@@ -1,15 +1,15 @@
 FarawayIsland_Interior: @ 8485778
-	.4byte FarawayIsland_Interior_MapAttributes
+	.4byte FarawayIsland_Interior_Layout
 	.4byte FarawayIsland_Interior_MapEvents
 	.4byte FarawayIsland_Interior_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 403
-	.byte 201
+	.byte MAPSEC_FARAWAY_ISLAND
 	.byte 0
-	.byte 11
-	.byte 8
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
new file mode 100644
index 000000000..e7d67431d
--- /dev/null
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -0,0 +1,207 @@
+FarawayIsland_Interior_MapScripts:: @ 8267CFA
+	map_script 5, FarawayIsland_Interior_MapScript1_267D54
+	map_script 3, FarawayIsland_Interior_MapScript1_267D72
+	map_script 2, FarawayIsland_Interior_MapScript2_267D98
+	map_script 7, FarawayIsland_Interior_MapScript1_267D0F
+	.byte 0
+
+FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, FarawayIsland_Interior_EventScript_267D19
+	end
+
+FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq FarawayIsland_Interior_EventScript_267D4B
+	compare VAR_RESULT, 4
+	goto_eq FarawayIsland_Interior_EventScript_267D4B
+	compare VAR_RESULT, 5
+	goto_eq FarawayIsland_Interior_EventScript_267D4B
+	compare VAR_RESULT, 10
+	goto_eq FarawayIsland_Interior_EventScript_267D4B
+	return
+
+FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B
+	setvar VAR_0x8004, 1
+	special sub_81D4A90
+	return
+
+FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, FarawayIsland_Interior_EventScript_267D5E
+	end
+
+FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, FarawayIsland_Interior_EventScript_27374E
+	removeobject VAR_LAST_TALKED
+	return
+
+FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
+	setvar VAR_0x403A, 0
+	setvar VAR_TEMP_1, 1
+	checkflag FLAG_0x1CA
+	call_if 0, FarawayIsland_Interior_EventScript_267D86
+	end
+
+FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
+	checkflag FLAG_0x1C7
+	goto_eq FarawayIsland_Interior_EventScript_27374E
+	clearflag FLAG_0x2CE
+	setvar VAR_TEMP_1, 0
+	return
+
+FarawayIsland_Interior_MapScript2_267D98: @ 8267D98
+	map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_267DA2
+	.2byte 0
+
+FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
+	lockall
+	playse SE_PIN
+	applymovement 1, FarawayIsland_Interior_Movement_272598
+	waitmovement 0
+	applymovement 1, FarawayIsland_Interior_Movement_27259A
+	waitmovement 0
+	applymovement 1, FarawayIsland_Interior_Movement_267DCE
+	waitmovement 0
+	moveobjectoffscreen 1
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+FarawayIsland_Interior_Movement_267DCE: @ 8267DCE
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	set_invisible
+	step_end
+
+FarawayIsland_Interior_Movement_267DD4: @ 8267DD4
+	set_visible
+	step_end
+
+FarawayIsland_Interior_Movement_267DD6: @ 8267DD6
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_down
+	walk_in_place_down
+	step_end
+
+FarawayIsland_Interior_Movement_267DDD: @ 8267DDD
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_up
+	walk_in_place_up
+	step_end
+
+FarawayIsland_Interior_Movement_267DE4: @ 8267DE4
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_right
+	walk_in_place_right
+	step_end
+
+FarawayIsland_Interior_Movement_267DEB: @ 8267DEB
+	lock_facing_direction
+	walk_fast_up
+	walk_fast_up
+	unlock_facing_direction
+	walk_in_place_left
+	walk_in_place_left
+	step_end
+
+FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
+	lock
+	faceplayer
+	applymovement 1, FarawayIsland_Interior_Movement_267DD4
+	waitmovement 0
+	setvar VAR_0x8004, 0
+	special sub_81D4A90
+	message FarawayIsland_Interior_Text_2C6DFF
+	waitse
+	playmoncry SPECIES_MEW, 2
+	compare VAR_FACING, 2
+	call_if 1, FarawayIsland_Interior_EventScript_267EAF
+	compare VAR_FACING, 1
+	call_if 1, FarawayIsland_Interior_EventScript_267EBA
+	compare VAR_FACING, 3
+	call_if 1, FarawayIsland_Interior_EventScript_267EC5
+	compare VAR_FACING, 4
+	call_if 1, FarawayIsland_Interior_EventScript_267ED0
+	special sub_81D4BEC
+	delay 40
+	waitmoncry
+	setvar VAR_0x8004, 151
+	setvar VAR_0x8005, 30
+	setvar VAR_0x8006, 0
+	special CreateObedientEnemyMon
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special BattleSetup_StartLegendaryBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq FarawayIsland_Interior_EventScript_267E96
+	compare VAR_RESULT, 4
+	goto_eq FarawayIsland_Interior_EventScript_267EA4
+	compare VAR_RESULT, 5
+	goto_eq FarawayIsland_Interior_EventScript_267EA4
+	compare VAR_RESULT, 10
+	goto_eq FarawayIsland_Interior_EventScript_267EA4
+	setflag FLAG_0x1CA
+	release
+	end
+
+FarawayIsland_Interior_EventScript_267E96:: @ 8267E96
+	setflag FLAG_0x1C7
+	setvar VAR_0x8004, 151
+	goto FarawayIsland_Interior_EventScript_273776
+	end
+
+FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4
+	setvar VAR_0x8004, 151
+	goto FarawayIsland_Interior_EventScript_273776
+	end
+
+FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF
+	applymovement 1, FarawayIsland_Interior_Movement_267DD6
+	waitmovement 0
+	return
+
+FarawayIsland_Interior_EventScript_267EBA:: @ 8267EBA
+	applymovement 1, FarawayIsland_Interior_Movement_267DDD
+	waitmovement 0
+	return
+
+FarawayIsland_Interior_EventScript_267EC5:: @ 8267EC5
+	applymovement 1, FarawayIsland_Interior_Movement_267DE4
+	waitmovement 0
+	return
+
+FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0
+	applymovement 1, FarawayIsland_Interior_Movement_267DEB
+	waitmovement 0
+	return
+
+FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB
+	lockall
+	fadescreenswapbuffers 1
+	setflag FLAG_0x2CE
+	removeobject 1
+	fadescreenswapbuffers 0
+	msgbox FarawayIsland_Interior_Text_267EF1, 4
+	closemessage
+	releaseall
+	end
+
+FarawayIsland_Interior_Text_267EF1: @ 8267EF1
+	.string "The feeling of being watched faded…$"
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
new file mode 100644
index 000000000..3b3985325
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, 1091
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..3c9f51bc1 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,15 +1,15 @@
 FieryPath: @ 8484048
-	.4byte FieryPath_MapAttributes
+	.4byte FieryPath_Layout
 	.4byte FieryPath_MapEvents
 	.4byte FieryPath_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 293
-	.byte 74
+	.byte MAPSEC_FIERY_PATH
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..914c4901c
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0
+	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 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, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602
+	bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73
+	bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A
+	bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E260B
+	bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73
+	bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..3f671fb6c 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -1,15 +1,15 @@
 FortreeCity: @ 8482528
-	.4byte FortreeCity_MapAttributes
+	.4byte FortreeCity_Layout
 	.4byte FortreeCity_MapEvents
 	.4byte FortreeCity_MapScripts
 	.4byte FortreeCity_MapConnections
 	.2byte MUS_MACHI_S3
 	.2byte 5
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
new file mode 100644
index 000000000..4a28a180b
--- /dev/null
+++ b/data/maps/FortreeCity/scripts.inc
@@ -0,0 +1,159 @@
+FortreeCity_MapScripts:: @ 81E25A4
+	map_script 3, FortreeCity_MapScript1_1E25AF
+	map_script 5, FortreeCity_MapScript1_1E25B3
+	.byte 0
+
+FortreeCity_MapScript1_1E25AF: @ 81E25AF
+	setflag FLAG_VISITED_FORTREE_CITY
+	end
+
+FortreeCity_MapScript1_1E25B3: @ 81E25B3
+	setstepcallback 2
+	end
+
+FortreeCity_EventScript_1E25B6:: @ 81E25B6
+	msgbox FortreeCity_Text_1E2676, 2
+	end
+
+FortreeCity_EventScript_1E25BF:: @ 81E25BF
+	lock
+	faceplayer
+	checkflag FLAG_0x127
+	goto_eq FortreeCity_EventScript_1E25D4
+	msgbox FortreeCity_Text_1E2738, 4
+	release
+	end
+
+FortreeCity_EventScript_1E25D4:: @ 81E25D4
+	msgbox FortreeCity_Text_1E27B6, 4
+	release
+	end
+
+FortreeCity_EventScript_1E25DE:: @ 81E25DE
+	msgbox FortreeCity_Text_1E27FE, 2
+	end
+
+FortreeCity_EventScript_1E25E7:: @ 81E25E7
+	msgbox FortreeCity_Text_1E2880, 2
+	end
+
+FortreeCity_EventScript_1E25F0:: @ 81E25F0
+	msgbox FortreeCity_Text_1E292E, 2
+	end
+
+FortreeCity_EventScript_1E25F9:: @ 81E25F9
+	msgbox FortreeCity_Text_1E299D, 2
+	end
+
+FortreeCity_EventScript_1E2602:: @ 81E2602
+	msgbox FortreeCity_Text_1E2AAC, 3
+	end
+
+FortreeCity_EventScript_1E260B:: @ 81E260B
+	msgbox FortreeCity_Text_1E2AE6, 3
+	end
+
+FortreeCity_EventScript_1E2614:: @ 81E2614
+	lock
+	faceplayer
+	checkitem ITEM_DEVON_SCOPE, 1
+	compare VAR_RESULT, 1
+	goto_eq FortreeCity_EventScript_1E2630
+	msgbox FortreeCity_Text_1E29E5, 4
+	release
+	end
+
+FortreeCity_EventScript_1E2630:: @ 81E2630
+	msgbox FortreeCity_Text_1E2A08, 5
+	compare VAR_RESULT, 1
+	goto_eq FortreeCity_EventScript_1E2645
+	release
+	end
+
+FortreeCity_EventScript_1E2645:: @ 81E2645
+	msgbox FortreeCity_Text_1E2A48, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KECLEON, 2
+	delay 40
+	waitmoncry
+	applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674
+	waitmovement 0
+	removeobject VAR_LAST_TALKED
+	setflag FLAG_0x127
+	release
+	end
+
+FortreeCity_Movement_1E2674: @ 81E2674
+	walk_right
+	step_end
+
+FortreeCity_Text_1E2676: @ 81E2676
+	.string "No one believes me, but I saw this\n"
+	.string "gigantic POKéMON in the sky.\p"
+	.string "It seemed to squirm as it flew toward\n"
+	.string "ROUTE 131.\p"
+	.string "By the way… Sniff…\n"
+	.string "Um… You, uh…smell singed.\p"
+	.string "Were you at a volcano or something?$"
+
+FortreeCity_Text_1E2738: @ 81E2738
+	.string "I want to go to the POKéMON GYM,\n"
+	.string "but something’s blocking the way.\p"
+	.string "After all the bother I went through\n"
+	.string "training on ROUTE 120…$"
+
+FortreeCity_Text_1E27B6: @ 81E27B6
+	.string "I’ve got my pride-and-joy POKéMON\n"
+	.string "with me. This time, I’ll beat WINONA.$"
+
+FortreeCity_Text_1E27FE: @ 81E27FE
+	.string "The ground absorbs rainwater, and\n"
+	.string "trees grow by drinking that water…\p"
+	.string "Our FORTREE CITY exists because\n"
+	.string "there’s both water and soil.$"
+
+FortreeCity_Text_1E2880: @ 81E2880
+	.string "The CITY consists of homes built on\n"
+	.string "trees.\p"
+	.string "Perhaps because of that lifestyle,\n"
+	.string "everyone is healthy and lively.\p"
+	.string "Why, even myself--I feel as if I’ve\n"
+	.string "grown thirty years younger.$"
+
+FortreeCity_Text_1E292E: @ 81E292E
+	.string "Living on top of trees is okay.\p"
+	.string "But sometimes BUG POKéMON come in\n"
+	.string "through windows.\l"
+	.string "It can be really startling.$"
+
+FortreeCity_Text_1E299D: @ 81E299D
+	.string "There are POKéMON that evolve when\n"
+	.string "you trade them! That’s what I heard.$"
+
+FortreeCity_Text_1E29E5: @ 81E29E5
+	.string "Something unseeable is in the way.$"
+
+FortreeCity_Text_1E2A08: @ 81E2A08
+	.string "Something unseeable is in the way.\p"
+	.string "Want to use the DEVON SCOPE?$"
+
+FortreeCity_Text_1E2A48: @ 81E2A48
+	.string "{PLAYER} used the DEVON SCOPE.\p"
+	.string "An invisible POKéMON became completely\n"
+	.string "visible!\p"
+	.string "The startled POKéMON fled!$"
+
+FortreeCity_Text_1E2AAC: @ 81E2AAC
+	.string "FORTREE CITY\n"
+	.string "“The treetop city that frolics with\l"
+	.string "nature.”$"
+
+FortreeCity_Text_1E2AE6: @ 81E2AE6
+	.string "FORTREE CITY POKéMON GYM\n"
+	.string "LEADER: WINONA\p"
+	.string "“The bird user taking flight into\n"
+	.string "the world.”$"
+
diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc
new file mode 100644
index 000000000..22abe3103
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0
+	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 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..651b37488 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_DecorationShop: @ 848361C
-	.4byte FortreeCity_DecorationShop_MapAttributes
+	.4byte FortreeCity_DecorationShop_Layout
 	.4byte FortreeCity_DecorationShop_MapEvents
 	.4byte FortreeCity_DecorationShop_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 255
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5cc222c4e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 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, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751
+	bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..54a45633d 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_Gym: @ 848353C
-	.4byte FortreeCity_Gym_MapAttributes
+	.4byte FortreeCity_Gym_Layout
 	.4byte FortreeCity_Gym_MapEvents
 	.4byte FortreeCity_Gym_MapScripts
 	.4byte 0x0
 	.2byte MUS_GIM
 	.2byte 100
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..35ed2acaf
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..1c106b8f5 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_House1: @ 8483520
-	.4byte FortreeCity_House1_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House1_MapEvents
 	.4byte FortreeCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 99
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..43bc1fdfc
--- /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, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 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..1e20a0227 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_House2: @ 84835AC
-	.4byte FortreeCity_House2_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House2_MapEvents
 	.4byte FortreeCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 101
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..23ae10688
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..f2d53219a 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_House3: @ 84835C8
-	.4byte FortreeCity_House3_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House3_MapEvents
 	.4byte FortreeCity_House3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 99
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c038066e4
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 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..efc5f06be 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_House4: @ 84835E4
-	.4byte FortreeCity_House4_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House4_MapEvents
 	.4byte FortreeCity_House4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 101
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
new file mode 100644
index 000000000..27ead9ec2
--- /dev/null
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -0,0 +1,99 @@
+FortreeCity_House4_MapScripts:: @ 8217C80
+	.byte 0
+
+FortreeCity_House4_EventScript_217C81:: @ 8217C81
+	msgbox FortreeCity_House4_Text_217D33, 2
+	end
+
+FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
+	lockall
+	checkflag FLAG_0x0DF
+	goto_eq FortreeCity_House4_EventScript_217D06
+	checkflag FLAG_0x0E0
+	goto_eq FortreeCity_House4_EventScript_217CD8
+	checkflag FLAG_0x0DE
+	goto_eq FortreeCity_House4_EventScript_217CC4
+	msgbox FortreeCity_House4_Text_217DB9, 4
+	closemessage
+	setflag FLAG_0x0DE
+	clearflag FLAG_0x3A6
+	applymovement 3, FortreeCity_House4_Movement_217D1A
+	waitmovement 0
+	removeobject 3
+	releaseall
+	end
+
+FortreeCity_House4_EventScript_217CC4:: @ 8217CC4
+	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	waitmovement 0
+	msgbox FortreeCity_House4_Text_217DD2, 4
+	releaseall
+	end
+
+FortreeCity_House4_EventScript_217CD8:: @ 8217CD8
+	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	waitmovement 0
+	msgbox FortreeCity_House4_Text_217E05, 4
+	giveitem_std ITEM_MENTAL_HERB
+	compare VAR_RESULT, 0
+	goto_eq FortreeCity_House4_EventScript_272054
+	setflag FLAG_0x0DF
+	releaseall
+	end
+
+FortreeCity_House4_EventScript_217D06:: @ 8217D06
+	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
+	waitmovement 0
+	msgbox FortreeCity_House4_Text_217EA8, 4
+	releaseall
+	end
+
+FortreeCity_House4_Movement_217D1A: @ 8217D1A
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_down
+	delay_8
+	step_end
+
+FortreeCity_House4_EventScript_217D20:: @ 8217D20
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox FortreeCity_House4_Text_217EE0, 4
+	waitmoncry
+	release
+	end
+
+FortreeCity_House4_Text_217D33: @ 8217D33
+	.string "By being together with POKéMON,\n"
+	.string "people make more and more friends.\p"
+	.string "And that brings the world closer\n"
+	.string "together. I think it’s wonderful!$"
+
+FortreeCity_House4_Text_217DB9: @ 8217DB9
+	.string "There!\n"
+	.string "Go, BIRD POKéMON!$"
+
+FortreeCity_House4_Text_217DD2: @ 8217DD2
+	.string "Heheh, I asked my WINGULL to run\n"
+	.string "an errand for me.$"
+
+FortreeCity_House4_Text_217E05: @ 8217E05
+	.string "Good!\n"
+	.string "Welcome back, WINGULL!\p"
+	.string "Huh? What is this?\n"
+	.string "What is it holding?\p"
+	.string "A MENTAL HERB?\n"
+	.string "It must have picked it up somewhere.\p"
+	.string "But I’m not a TRAINER, so you can\n"
+	.string "have it.$"
+
+FortreeCity_House4_Text_217EA8: @ 8217EA8
+	.string "Thanks to my WINGULL, I have friends\n"
+	.string "who live far away.$"
+
+FortreeCity_House4_Text_217EE0: @ 8217EE0
+	.string "WINGULL: Pihyoh!$"
+
diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc
new file mode 100644
index 000000000..0c716961a
--- /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, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..c4d07f46b 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_House5: @ 8483600
-	.4byte FortreeCity_House5_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House5_MapEvents
 	.4byte FortreeCity_House5_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 99
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5335df01d
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..5179187be 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -1,15 +1,15 @@
 FortreeCity_Mart: @ 8483590
-	.4byte FortreeCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte FortreeCity_Mart_MapEvents
 	.4byte FortreeCity_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e63b6eabb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 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..9f2b78dd4 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..43e74e0d7
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..ccfc5bd09 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 11
+	.byte MAPSEC_FORTREE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bba8bbe40
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 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..4a754207b 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -1,15 +1,15 @@
 GraniteCave_1F: @ 8483F84
-	.4byte GraniteCave_1F_MapAttributes
+	.4byte GraniteCave_1F_Layout
 	.4byte GraniteCave_1F_MapEvents
 	.4byte GraniteCave_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 132
-	.byte 55
+	.byte MAPSEC_GRANITE_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4b4a08870
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..beb7fdb83 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -1,15 +1,15 @@
 GraniteCave_B1F: @ 8483FA0
-	.4byte GraniteCave_B1F_MapAttributes
+	.4byte GraniteCave_B1F_Layout
 	.4byte GraniteCave_B1F_MapEvents
 	.4byte GraniteCave_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 133
-	.byte 55
+	.byte MAPSEC_GRANITE_CAVE
 	.byte 1
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e128b40b2
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, 48
+	bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, 49
+
+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..0eb017bc4 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -1,15 +1,15 @@
 GraniteCave_B2F: @ 8483FBC
-	.4byte GraniteCave_B2F_MapAttributes
+	.4byte GraniteCave_B2F_Layout
 	.4byte GraniteCave_B2F_MapEvents
 	.4byte GraniteCave_B2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 134
-	.byte 55
+	.byte MAPSEC_GRANITE_CAVE
 	.byte 1
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..43cc6e444
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..78df1ff83 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -1,15 +1,15 @@
 GraniteCave_StevensRoom: @ 8483FD8
-	.4byte GraniteCave_StevensRoom_MapAttributes
+	.4byte GraniteCave_StevensRoom_Layout
 	.4byte GraniteCave_StevensRoom_MapEvents
 	.4byte GraniteCave_StevensRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 288
-	.byte 55
+	.byte MAPSEC_GRANITE_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
new file mode 100644
index 000000000..b057a0548
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -0,0 +1,124 @@
+GraniteCave_StevensRoom_MapScripts:: @ 822DC7A
+	.byte 0
+
+GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
+	lock
+	faceplayer
+	msgbox GraniteCave_StevensRoom_Text_22DD5A, 4
+	setvar VAR_0x8004, 274
+	call GraniteCave_StevensRoom_EventScript_2723E4
+	setflag FLAG_0x0BD
+	msgbox GraniteCave_StevensRoom_Text_22DDBD, 4
+	giveitem_std ITEM_TM47
+	compare VAR_RESULT, 0
+	call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C
+	msgbox GraniteCave_StevensRoom_Text_22DE6B, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox GraniteCave_StevensRoom_Text_22DF6A, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x131
+	msgbox GraniteCave_StevensRoom_Text_22DF8C, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D
+	compare VAR_FACING, 1
+	call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A
+	compare VAR_FACING, 3
+	call_if 1, GraniteCave_StevensRoom_EventScript_22DD18
+	compare VAR_FACING, 4
+	call_if 1, GraniteCave_StevensRoom_EventScript_22DD18
+	playse SE_KAIDAN
+	removeobject 1
+	release
+	end
+
+GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D
+	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
+	waitmovement 0
+	return
+
+GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18
+	applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C
+	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
+	waitmovement 0
+	return
+
+GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A
+	applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C
+	applymovement 1, GraniteCave_StevensRoom_Movement_22DD51
+	waitmovement 0
+	return
+
+GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C
+	msgbox GraniteCave_StevensRoom_Text_22DFAA, 4
+	return
+
+GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	step_end
+
+GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
+	step_end
+
+GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	delay_8
+	step_end
+
+GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A
+	.string "My name is STEVEN.\p"
+	.string "I’m interested in rare stones,\n"
+	.string "so I travel here and there.\p"
+	.string "Oh?\n"
+	.string "A LETTER for me?$"
+
+GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD
+	.string "STEVEN: Okay, thank you.\p"
+	.string "You went through all this trouble to\n"
+	.string "deliver that. I need to thank you.\p"
+	.string "Let me see…\n"
+	.string "I’ll give you this TM.\p"
+	.string "It contains my favorite move,\n"
+	.string "STEEL WING.$"
+
+GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B
+	.string "STEVEN: Your POKéMON appear quite\n"
+	.string "capable.\p"
+	.string "If you keep training, you could even\n"
+	.string "become the CHAMPION of the POKéMON\l"
+	.string "LEAGUE one day. That’s what I think.\p"
+	.string "I know, since we’ve gotten to know each\n"
+	.string "other, let’s register one another in\l"
+	.string "our POKéNAVS.\p"
+	.string "… … … … … …$"
+
+GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A
+	.string "Registered STEVEN\n"
+	.string "in the POKéNAV.$"
+
+GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C
+	.string "Now, I’ve got to hurry along.$"
+
+GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA
+	.string "Oh, your BAG is full…\n"
+	.string "That’s too bad, then.$"
+
diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc
new file mode 100644
index 000000000..f8dbe9ad7
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
+	object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0
+	object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04
+	coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04
+	coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04
+
+InsideOfTruck_MapBGEvents: @ 853A108
+	bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
+	bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
+	bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
+	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C
+	bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, 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..51f499ee4 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -1,15 +1,15 @@
 InsideOfTruck: @ 8484EF0
-	.4byte InsideOfTruck_MapAttributes
+	.4byte InsideOfTruck_Layout
 	.4byte InsideOfTruck_MapEvents
 	.4byte InsideOfTruck_MapScripts
 	.4byte 0x0
 	.2byte 65535
 	.2byte 237
-	.byte 84
+	.byte MAPSEC_INSIDE_OF_TRUCK
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..01283e146
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF
+	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D
+	bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, 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..a56a3e4d0 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -1,15 +1,15 @@
 IslandCave: @ 8484614
-	.4byte IslandCave_MapAttributes
+	.4byte IslandCave_Layout
 	.4byte IslandCave_MapEvents
 	.4byte IslandCave_MapScripts
 	.4byte 0x0
 	.2byte MUS_MABOROSI
 	.2byte 280
-	.byte 81
+	.byte MAPSEC_ISLAND_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b1028c978
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, 847
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0
+	object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 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_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_event 21, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
+	coord_event 22, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
+	coord_event 21, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
+	coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
+	coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB
+
+JaggedPass_MapBGEvents: @ 8534C54
+	bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, 77
+	bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, 76
+
+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..797760e91 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -1,15 +1,15 @@
 JaggedPass: @ 848402C
-	.4byte JaggedPass_MapAttributes
+	.4byte JaggedPass_Layout
 	.4byte JaggedPass_MapEvents
 	.4byte JaggedPass_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 292
-	.byte 76
+	.byte MAPSEC_JAGGED_PASS
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..184bed05e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
+	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0
+	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0
+	object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 930
+	object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 929
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 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, LavaridgeTown_EventScript_1EA6FA
+
+LavaridgeTown_MapBGEvents: @ 8527B6C
+	bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7
+	bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE
+	bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A
+	bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7A5
+	bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
+	bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A
+	bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73
+	bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, 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..006896453 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -1,15 +1,15 @@
 LavaridgeTown: @ 8482608
-	.4byte LavaridgeTown_MapAttributes
+	.4byte LavaridgeTown_Layout
 	.4byte LavaridgeTown_MapEvents
 	.4byte LavaridgeTown_MapScripts
 	.4byte LavaridgeTown_MapConnections
 	.2byte MUS_MACHI_S4
 	.2byte 13
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
new file mode 100644
index 000000000..5670d9b6e
--- /dev/null
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -0,0 +1,425 @@
+LavaridgeTown_MapScripts:: @ 81EA4D3
+	map_script 3, LavaridgeTown_MapScript1_1EA4DE
+	map_script 2, LavaridgeTown_MapScript2_1EA547
+	.byte 0
+
+LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
+	setflag FLAG_VISITED_LAVARIDGE_TOWN
+	checkflag FLAG_0x06C
+	call_if 1, LavaridgeTown_EventScript_1EA514
+	checkflag FLAG_0x08B
+	call_if 1, LavaridgeTown_EventScript_1EA53F
+	call LavaridgeTown_EventScript_271ED7
+	call LavaridgeTown_EventScript_271EFB
+	compare VAR_0x4053, 1
+	call_if 1, LavaridgeTown_EventScript_1EA518
+	compare VAR_0x4053, 1
+	call_if 1, LavaridgeTown_EventScript_1EA543
+	end
+
+LavaridgeTown_EventScript_1EA514:: @ 81EA514
+	clearflag FLAG_0x06C
+	return
+
+LavaridgeTown_EventScript_1EA518:: @ 81EA518
+	getplayerxy VAR_0x8004, VAR_0x8005
+	compare VAR_0x8004, 9
+	goto_eq LavaridgeTown_EventScript_1EA529
+	return
+
+LavaridgeTown_EventScript_1EA529:: @ 81EA529
+	setobjectxyperm 8, 11, 9
+	setobjectxyperm 7, 9, 8
+	setobjectmovementtype 7, 7
+	clearflag FLAG_0x3A1
+	return
+
+LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
+	clearflag FLAG_0x36D
+	return
+
+LavaridgeTown_EventScript_1EA543:: @ 81EA543
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	return
+
+LavaridgeTown_MapScript2_1EA547: @ 81EA547
+	map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551
+	.2byte 0
+
+LavaridgeTown_EventScript_1EA551:: @ 81EA551
+	lockall
+	getplayerxy VAR_0x8008, VAR_0x8009
+	compare VAR_0x8008, 9
+	call_if 1, LavaridgeTown_EventScript_1EA63A
+	compare VAR_0x8008, 9
+	call_if 5, LavaridgeTown_EventScript_1EA65C
+	delay 20
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LavaridgeTown_EventScript_1EA630
+	compare VAR_RESULT, 1
+	call_if 1, LavaridgeTown_EventScript_1EA635
+	compare VAR_0x8008, 9
+	call_if 1, LavaridgeTown_EventScript_1EA6A1
+	compare VAR_0x8008, 9
+	call_if 5, LavaridgeTown_EventScript_1EA6AC
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LavaridgeTown_EventScript_1EA5B5
+	compare VAR_RESULT, 1
+	goto_eq LavaridgeTown_EventScript_1EA5DA
+	end
+
+LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
+	msgbox LavaridgeTown_Text_1EA7C0, 4
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_0x0DD
+	msgbox LavaridgeTown_Text_1EA897, 4
+	goto LavaridgeTown_EventScript_1EA5FF
+	end
+
+LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA
+	msgbox LavaridgeTown_Text_1EA9A2, 4
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_0x0DD
+	msgbox LavaridgeTown_Text_1EAA2E, 4
+	goto LavaridgeTown_EventScript_1EA5FF
+	end
+
+LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
+	closemessage
+	removeobject 8
+	addobject 7
+	delay 30
+	compare VAR_0x8008, 9
+	call_if 1, LavaridgeTown_EventScript_1EA6B7
+	compare VAR_0x8008, 9
+	call_if 5, LavaridgeTown_EventScript_1EA6C9
+	removeobject 7
+	setvar VAR_0x4053, 2
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	releaseall
+	end
+
+LavaridgeTown_EventScript_1EA630:: @ 81EA630
+	playbgm MUS_GIRL_SUP, 1
+	return
+
+LavaridgeTown_EventScript_1EA635:: @ 81EA635
+	playbgm MUS_BOY_SUP, 1
+	return
+
+LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
+	applymovement 8, LavaridgeTown_Movement_2725A6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 8, LavaridgeTown_Movement_272598
+	waitmovement 0
+	applymovement 8, LavaridgeTown_Movement_27259A
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
+	opendoor 12, 15
+	waitdooranim
+	addobject 8
+	applymovement 8, LavaridgeTown_Movement_1EA6F8
+	waitmovement 0
+	closedoor 12, 15
+	waitdooranim
+	applymovement 8, LavaridgeTown_Movement_2725A4
+	waitmovement 0
+	playse SE_PIN
+	applymovement 8, LavaridgeTown_Movement_272598
+	waitmovement 0
+	applymovement 8, LavaridgeTown_Movement_27259A
+	waitmovement 0
+	applymovement 255, LavaridgeTown_Movement_2725A8
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1
+	applymovement 8, LavaridgeTown_Movement_1EA6F4
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC
+	applymovement 8, LavaridgeTown_Movement_1EA6ED
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7
+	applymovement 255, LavaridgeTown_Movement_1EA6DF
+	applymovement 7, LavaridgeTown_Movement_1EA6E3
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9
+	applymovement 7, LavaridgeTown_Movement_1EA6D4
+	waitmovement 0
+	return
+
+LavaridgeTown_Movement_1EA6D4: @ 81EA6D4
+	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
+	step_end
+
+LavaridgeTown_Movement_1EA6DF: @ 81EA6DF
+	delay_16
+	delay_8
+	walk_in_place_fastest_right
+	step_end
+
+LavaridgeTown_Movement_1EA6E3: @ 81EA6E3
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	step_end
+
+LavaridgeTown_Movement_1EA6ED: @ 81EA6ED
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+LavaridgeTown_Movement_1EA6F4: @ 81EA6F4
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+LavaridgeTown_Movement_1EA6F8: @ 81EA6F8
+	walk_down
+	step_end
+
+LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA
+	specialvar VAR_RESULT, GetPlayerFacingDirection
+	compare VAR_RESULT, 1
+	goto_eq LavaridgeTown_EventScript_1EA70B
+	end
+
+LavaridgeTown_EventScript_1EA70B:: @ 81EA70B
+	incrementgamestat 49
+	end
+
+LavaridgeTown_EventScript_1EA70E:: @ 81EA70E
+	msgbox LavaridgeTown_Text_1EAE03, 2
+	end
+
+LavaridgeTown_EventScript_1EA717:: @ 81EA717
+	msgbox LavaridgeTown_Text_1EAEE1, 3
+	end
+
+LavaridgeTown_EventScript_1EA720:: @ 81EA720
+	msgbox LavaridgeTown_Text_1EAF9B, 2
+	end
+
+LavaridgeTown_EventScript_1EA729:: @ 81EA729
+	msgbox LavaridgeTown_Text_1EB003, 2
+	end
+
+LavaridgeTown_EventScript_1EA732:: @ 81EA732
+	msgbox LavaridgeTown_Text_1EB092, 2
+	end
+
+LavaridgeTown_EventScript_1EA73B:: @ 81EA73B
+	msgbox LavaridgeTown_Text_1EAF4E, 2
+	end
+
+LavaridgeTown_EventScript_1EA744:: @ 81EA744
+	lock
+	faceplayer
+	checkflag FLAG_0x10A
+	goto_eq LavaridgeTown_EventScript_1EA787
+	msgbox LavaridgeTown_Text_1EAB80, 5
+	compare VAR_RESULT, 0
+	goto_eq LavaridgeTown_EventScript_1EA79B
+	getpartysize
+	compare VAR_RESULT, 6
+	goto_eq LavaridgeTown_EventScript_1EA791
+	msgbox LavaridgeTown_Text_1EACC0, 4
+	setflag FLAG_0x10A
+	playfanfare MUS_FANFA4
+	message LavaridgeTown_Text_1EACF4
+	waitfanfare
+	giveegg SPECIES_WYNAUT
+	release
+	end
+
+LavaridgeTown_EventScript_1EA787:: @ 81EA787
+	msgbox LavaridgeTown_Text_1EAD9E, 4
+	release
+	end
+
+LavaridgeTown_EventScript_1EA791:: @ 81EA791
+	msgbox LavaridgeTown_Text_1EAD09, 4
+	release
+	end
+
+LavaridgeTown_EventScript_1EA79B:: @ 81EA79B
+	msgbox LavaridgeTown_Text_1EAD44, 4
+	release
+	end
+
+LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5
+	msgbox LavaridgeTown_Text_1EB12B, 3
+	end
+
+LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE
+	msgbox LavaridgeTown_Text_1EB178, 3
+	end
+
+LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7
+	msgbox LavaridgeTown_Text_1EB1CB, 3
+	end
+
+LavaridgeTown_Text_1EA7C0: @ 81EA7C0
+	.string "MAY: {PLAYER}{KUN}! Long time no see!\p"
+	.string "Oh? While I visited the hot springs,\n"
+	.string "you got the LAVARIDGE GYM BADGE.\p"
+	.string "You must have collected\n"
+	.string "good POKéMON…\l"
+	.string "No, I believe you raised some.\p"
+	.string "I guess it would be okay for you to\n"
+	.string "have this.$"
+
+LavaridgeTown_Text_1EA897: @ 81EA897
+	.string "MAY: With those GO-GOGGLES, you’ll\n"
+	.string "have no trouble getting through the\l"
+	.string "desert near ROUTE 111.\p"
+	.string "But, wow, {PLAYER}{KUN}…\n"
+	.string "Challenging GYMS…\p"
+	.string "You’re trying hard because you don’t\n"
+	.string "want to lose to me, I bet!\p"
+	.string "{PLAYER}{KUN}, I think I should challenge\n"
+	.string "your dad in PETALBURG GYM.\p"
+	.string "See you again!$"
+
+LavaridgeTown_Text_1EA9A2: @ 81EA9A2
+	.string "BRENDAN: {PLAYER}, hey, it’s been a while.\n"
+	.string "How’s it going?\p"
+	.string "Hmm…\n"
+	.string "That’s a decent collection of BADGES.\p"
+	.string "All right, then.\n"
+	.string "You may as well have this.$"
+
+LavaridgeTown_Text_1EAA2E: @ 81EAA2E
+	.string "BRENDAN: Keep those with you if you’re\n"
+	.string "planning on going into that desert near\l"
+	.string "ROUTE 111.\p"
+	.string "There should be some POKéMON that\n"
+	.string "are exclusively desert-dwellers.\l"
+	.string "You might look around for those.\p"
+	.string "As for me…\n"
+	.string "I’m considering challenging NORMAN,\l"
+	.string "the GYM LEADER of PETALBURG.\p"
+	.string "Unlike you, {PLAYER}, your dad looks like\n"
+	.string "he really is tough.\p"
+	.string "See you around!$"
+
+LavaridgeTown_Text_1EAB80: @ 81EAB80
+	.string "I have here an EGG.\p"
+	.string "I’d hoped to hatch it by covering it in\n"
+	.string "hot sand by the hot springs.\l"
+	.string "But that doesn’t seem to be enough…\p"
+	.string "I’ve heard it would be best if it were\n"
+	.string "kept together with POKéMON and\l"
+	.string "carried about.\p"
+	.string "You are a TRAINER, yes?\n"
+	.string "And your POKéMON radiate vitality.\p"
+	.string "So, what say you?\n"
+	.string "Will you take this EGG to hatch?$"
+
+LavaridgeTown_Text_1EACC0: @ 81EACC0
+	.string "Good! I hope you’ll walk plenty with\n"
+	.string "this here EGG!$"
+
+LavaridgeTown_Text_1EACF4: @ 81EACF4
+	.string "{PLAYER} received the EGG.$"
+
+LavaridgeTown_Text_1EAD09: @ 81EAD09
+	.string "Oh? You’ve too many POKéMON.\n"
+	.string "There’s no room for this EGG…$"
+
+LavaridgeTown_Text_1EAD44: @ 81EAD44
+	.string "As you wish, then…\p"
+	.string "If you have a change of heart about\n"
+	.string "hatching this EGG, I will be here.$"
+
+LavaridgeTown_Text_1EAD9E: @ 81EAD9E
+	.string "Every so often, an EGG will be found at\n"
+	.string "the POKéMON DAY CARE.\p"
+	.string "Or at least that’s how the rumor goes.$"
+
+LavaridgeTown_Text_1EAE03: @ 81EAE03
+	.string "We draw as much hot water as we need,\n"
+	.string "and yet the hot springs never run dry.\p"
+	.string "Isn’t it magical?\p"
+	.string "These hot springs appear near active\n"
+	.string "volcanoes. Veins of water under the\l"
+	.string "ground are heated by magma to well up\l"
+	.string "as hot springs.$"
+
+LavaridgeTown_Text_1EAEE1: @ 81EAEE1
+	.string "Being buried in this hot sand is…\n"
+	.string "Sigh…\p"
+	.string "So warm and heavenly…\p"
+	.string "Eh? Gyaah! Ouch!\p"
+	.string "A POKéMON nipped my backside!$"
+
+LavaridgeTown_Text_1EAF4E: @ 81EAF4E
+	.string "Oh, you like hot springs, do you?\p"
+	.string "That’s surprising for one as young\n"
+	.string "as you.$"
+
+LavaridgeTown_Text_1EAF9B: @ 81EAF9B
+	.string "I bathe in the hot springs every day.\p"
+	.string "I want to become a beautiful and strong\n"
+	.string "GYM LEADER like FLANNERY.$"
+
+LavaridgeTown_Text_1EB003: @ 81EB003
+	.string "If people put POKéMON in hot springs,\n"
+	.string "it might be seriously strange.\p"
+	.string "Why, it might be an electric bath, or\n"
+	.string "a bubble bath, or even a lava bath…$"
+
+LavaridgeTown_Text_1EB092: @ 81EB092
+	.string "They’re claiming that these hot springs\n"
+	.string "are good for calming nervous tension,\l"
+	.string "relieving aching muscles, solving\l"
+	.string "romantic problems, and attracting\l"
+	.string "money…$"
+
+LavaridgeTown_Text_1EB12B: @ 81EB12B
+	.string "LAVARIDGE TOWN\p"
+	.string "“POKéMON CENTER HOT SPRINGS\n"
+	.string "An excellent place for relaxing!”$"
+
+LavaridgeTown_Text_1EB178: @ 81EB178
+	.string "LAVARIDGE TOWN POKéMON GYM\n"
+	.string "LEADER: FLANNERY\l"
+	.string "“One with a fiery passion that burns!”$"
+
+LavaridgeTown_Text_1EB1CB: @ 81EB1CB
+	.string "POKéMON HERB SHOP\n"
+	.string "“Bitter taste--better cure!”$"
+
diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
new file mode 100644
index 000000000..d8aa6daa4
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B
+	bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..6ea20174c 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GIM
 	.2byte 69
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 6
-	.byte 8
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..cccd9cb14
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 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..579c1dd3e 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GIM
 	.2byte 70
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 6
-	.byte 8
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..8a80c4f75
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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..418632b28 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -1,15 +1,15 @@
 LavaridgeTown_HerbShop: @ 8482CB4
-	.4byte LavaridgeTown_HerbShop_MapAttributes
+	.4byte LavaridgeTown_HerbShop_Layout
 	.4byte LavaridgeTown_HerbShop_MapEvents
 	.4byte LavaridgeTown_HerbShop_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S4
 	.2byte 68
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..85a9d859e
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..9a350db79 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -1,15 +1,15 @@
 LavaridgeTown_House: @ 8482D08
-	.4byte LavaridgeTown_House_MapAttributes
+	.4byte House3_Layout
 	.4byte LavaridgeTown_House_MapEvents
 	.4byte LavaridgeTown_House_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S4
 	.2byte 64
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a5537f9ca
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..30683052b 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -1,15 +1,15 @@
 LavaridgeTown_Mart: @ 8482D24
-	.4byte LavaridgeTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte LavaridgeTown_Mart_MapEvents
 	.4byte LavaridgeTown_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1586553f2
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..e657a688a 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 71
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e55b08e7b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..3d40c93cf 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 3
+	.byte MAPSEC_LAVARIDGE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..240de9cd4
--- /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, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852
+	object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852
+	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
+	object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, 971
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
+	object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0
+	object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0
+	object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 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, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A
+	bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73
+	bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B
+	bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73
+	bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2CFF
+	bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D08
+	bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D11
+	bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44
+	bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62
+	bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74
+	bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, 27
+	bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, 43
+	bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, 75
+
+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..dafbfaccd 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity: @ 8482544
-	.4byte LilycoveCity_MapAttributes
+	.4byte LilycoveCity_Layout
 	.4byte LilycoveCity_MapEvents
 	.4byte LilycoveCity_MapScripts
 	.4byte LilycoveCity_MapConnections
 	.2byte MUS_MINAMO
 	.2byte 6
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..751bc0fc7
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0
+	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0
+	object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0
+	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0
+	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0
+	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0
+	object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0
+	object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0
+	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0
+	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0
+	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0
+	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0
+	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0
+	object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0
+	object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0
+	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0
+	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0
+	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733
+	bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C
+	bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745
+	bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745
+	bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733
+	bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, 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..2049fd74c 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_ContestHall: @ 84836C4
-	.4byte LilycoveCity_ContestHall_MapAttributes
+	.4byte LilycoveCity_ContestHall_Layout
 	.4byte LilycoveCity_ContestHall_MapEvents
 	.4byte LilycoveCity_ContestHall_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONLOBBY
 	.2byte 106
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..be94bfb7b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 774
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0
+	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0
+	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 895
+	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0
+	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0
+	object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832
+	object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832
+	object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832
+	object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832
+	object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832
+	object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832
+	object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832
+	object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink
+	bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E
+	bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753
+	bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A
+	bg_event 27, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A761
+	bg_event 30, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A77A
+	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E
+	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745
+	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C
+	bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask
+	bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D
+	bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, 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..6aba3e416 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_ContestLobby: @ 84836A8
-	.4byte LilycoveCity_ContestLobby_MapAttributes
+	.4byte LilycoveCity_ContestLobby_Layout
 	.4byte LilycoveCity_ContestLobby_MapEvents
 	.4byte LilycoveCity_ContestLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONLOBBY
 	.2byte 105
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
new file mode 100644
index 000000000..956766395
--- /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, IsWirelessAdapterConnected
+	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 Text_DecideLinkLeader
+	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..66fd112c4
--- /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, MOVEMENT_TYPE_FACE_UP, 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, VAR_TEMP_1, 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..a2737b05b 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_MINAMO
 	.2byte 299
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
new file mode 100644
index 000000000..3468299a9
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
@@ -0,0 +1,131 @@
+LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188
+	.byte 0
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189
+	lockall
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA
+	checkflag FLAG_BADGE07_GET
+	goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, 4
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, 4
+	closemessage
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, 4
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, 4
+	closemessage
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, 4
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, 4
+	closemessage
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
+	lockall
+	playse SE_PIN
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598
+	waitmovement 0
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A
+	waitmovement 0
+	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, 4
+	closemessage
+	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E
+	waitmovement 0
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260
+	waitmovement 0
+	release
+	end
+
+LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259
+	face_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	step_end
+
+LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E
+	walk_up
+	step_end
+
+LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260
+	face_down
+	walk_down
+	face_up
+	step_end
+
+LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264
+	.string "Hm, so they doubled the guests by\n"
+	.string "using POKéMON as attractions?\p"
+	.string "Hm, well, maybe I should make a cute\n"
+	.string "POKéMON our inn’s mascot.\p"
+	.string "I wonder if that will attract more\n"
+	.string "guests to stay with us?$"
+
+LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E
+	.string "Oh, sorry, sorry!\n"
+	.string "I was too involved in watching TV!\p"
+	.string "Since that TEAM AQUA came to town,\n"
+	.string "the tourists have been staying away.$"
+
+LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B
+	.string "Hey, down in front!\n"
+	.string "I can’t see the TV!$"
+
+LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3
+	.string "Amazing! You’re telling me a POKéMON\n"
+	.string "found someone’s lost item?\p"
+	.string "That’s something. If we had some smart\n"
+	.string "POKéMON like that…\p"
+	.string "We could recover anything that our\n"
+	.string "guests mislaid…$"
+
+LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470
+	.string "Oh, sorry, sorry!\n"
+	.string "I was too involved in watching TV!\p"
+	.string "I heard that someone busted\n"
+	.string "the TEAM AQUA HIDEOUT.\p"
+	.string "Thanks to that, we just booked\n"
+	.string "a reservation from a big group.\p"
+	.string "It was a company called… Uh…\n"
+	.string "GAME something…$"
+
+LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544
+	.string "Amazing! A house-sitting POKéMON\n"
+	.string "caught a burglar?\p"
+	.string "That’s something. If we had a tough\n"
+	.string "POKéMON as a security guard…\p"
+	.string "We would be able to provide our guests\n"
+	.string "with greater safety.$"
+
+LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4
+	.string "Oh, sorry, sorry!\n"
+	.string "I was too involved in watching TV.\p"
+	.string "Oh, yes. A big group of guests arrived\n"
+	.string "a little while ago.\p"
+	.string "They booked in as GAME FREAK,\n"
+	.string "so I guess they must make games.\p"
+	.string "Uh-oh, I’d better get working on\n"
+	.string "their dinner!$"
+
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
new file mode 100644
index 000000000..c0869f319
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..112a6e8d7 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_MINAMO
 	.2byte 300
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..adafc5b61
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..0c8cc574d 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_DepartmentStoreElevator: @ 84838A0
-	.4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreElevator_Layout
 	.4byte LilycoveCity_DepartmentStoreElevator_MapEvents
 	.4byte LilycoveCity_DepartmentStoreElevator_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 273
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..279772204
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0
+	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295
+	bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..cd6ded7d6 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_DepartmentStoreRooftop: @ 8483884
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapEvents
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 262
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b2771391b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_NORTH, 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..bae2b837d 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_MINAMO
 	.2byte 257
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..11fd1c403
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 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..88ca3ece3 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FRIENDLY
 	.2byte 258
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7042a1483
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 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..1753be637 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FRIENDLY
 	.2byte 259
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8fe1ec45e
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 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..c9b0870fa 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FRIENDLY
 	.2byte 260
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..9b56742a2
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..62d836d56 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FRIENDLY
 	.2byte 261
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6a157a1ad
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 861
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 909
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 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..7f970b463 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_Harbor: @ 8483750
-	.4byte LilycoveCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte LilycoveCity_Harbor_MapEvents
 	.4byte LilycoveCity_Harbor_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 88
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d5768e01c
--- /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, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..4cc0a8061 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_House1: @ 8483788
-	.4byte LilycoveCity_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House1_MapEvents
 	.4byte LilycoveCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 59
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e4839eb5c
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..988b7fa4c 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_House2: @ 84837A4
-	.4byte LilycoveCity_House2_MapAttributes
+	.4byte LilycoveCity_House2_Layout
 	.4byte LilycoveCity_House2_MapEvents
 	.4byte LilycoveCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 74
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..89f48e9f3
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 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..41f01234c 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_House3: @ 84837C0
-	.4byte LilycoveCity_House3_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_House3_MapEvents
 	.4byte LilycoveCity_House3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 60
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6e447bf9c
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..656e60bf3 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_House4: @ 84837DC
-	.4byte LilycoveCity_House4_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House4_MapEvents
 	.4byte LilycoveCity_House4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 59
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f24ede1b9
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775
+	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776
+	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779
+	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780
+	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
+	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD
+	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
+	bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1
+	bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
+	bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
+	bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6
+	bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA
+	bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4
+	bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8
+	bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+	bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
+	bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF
+	bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC
+	bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3
+	bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, 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..0d6faebe8 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_BIJYUTU
 	.2byte 103
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d88bae478
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
+	bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B
+	bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
+	bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E
+	bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
+	bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951
+	bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
+	bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964
+	bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
+	bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977
+	bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA
+	bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, 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..641859ac6 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_BIJYUTU
 	.2byte 104
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
new file mode 100644
index 000000000..6b4f0f3da
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -0,0 +1,340 @@
+LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
+	map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745
+	map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE
+	.byte 0
+
+LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745
+	checkflag FLAG_0x0A0
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754
+	checkflag FLAG_0x0A1
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763
+	checkflag FLAG_0x0A2
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772
+	checkflag FLAG_0x0A3
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
+	checkflag FLAG_0x0A4
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
+	setmetatile 10, 6, 606, 1
+	setmetatile 11, 6, 607, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3
+	setmetatile 18, 6, 604, 1
+	setmetatile 19, 6, 605, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB
+	setmetatile 14, 10, 608, 1
+	setmetatile 15, 10, 609, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3
+	setmetatile 6, 10, 602, 1
+	setmetatile 7, 10, 603, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
+	setmetatile 2, 6, 610, 1
+	setmetatile 3, 6, 611, 1
+	end
+
+LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
+	map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
+	.2byte 0
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
+	lockall
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, 3
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
+	waitmovement 0
+	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, 3
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	waitmovement 0
+	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, 3
+	copyvar VAR_0x4094, 0x1
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861
+	walk_in_place_fastest_left
+	step_end
+
+LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
+	face_up
+	delay_16
+	step_end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
+	lockall
+	checkflag FLAG_0x0EC
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219921
+	specialvar VAR_0x8004, sub_80F8940
+	switch VAR_0x8004
+	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
+	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
+	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
+	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
+	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, 4
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, 4
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4
+	givedecoration_std 44
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
+	setflag FLAG_0x0EC
+	closemessage
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911
+	call LilycoveCity_LilycoveMuseum_2F_EventScript_272071
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, 4
+	closemessage
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, 2
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B
+	lockall
+	checkflag FLAG_0x0A2
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E
+	lockall
+	checkflag FLAG_0x0A4
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951
+	lockall
+	checkflag FLAG_0x0A0
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964
+	lockall
+	checkflag FLAG_0x0A1
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977
+	lockall
+	checkflag FLAG_0x0A3
+	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
+	fadescreen 1
+	drawcontestwinner 9
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
+	fadescreen 1
+	drawcontestwinner 10
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
+	fadescreen 1
+	drawcontestwinner 11
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
+	fadescreen 1
+	drawcontestwinner 12
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
+	fadescreen 1
+	drawcontestwinner 13
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB
+	.string "This is our special exhibit hall.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D
+	.string "As you can plainly see, there is not\n"
+	.string "a single painting on exhibit.\p"
+	.string "Here, I don’t wish to exhibit works of\n"
+	.string "so-called classical art.\p"
+	.string "Such classical works you can see on\n"
+	.string "our ground floor.\p"
+	.string "I wish to exhibit work that is far\n"
+	.string "different from the classics.\p"
+	.string "Art, after all, is not restricted to old,\n"
+	.string "famous works!\p"
+	.string "This exhibit hall, I wish to fill it with…\p"
+	.string "Modern and vibrant artworks of\n"
+	.string "POKéMON seemingly ready to spring\l"
+	.string "forth into glorious life!$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4
+	.string "I beg your pardon. I didn’t intend\n"
+	.string "to monopolize the conversation.\p"
+	.string "Now, as you are young, and yet\n"
+	.string "obviously well traveled…\p"
+	.string "You must encounter lively POKéMON\n"
+	.string "and works of art depicting them.\p"
+	.string "If you were to come across such\n"
+	.string "a painting, may we ask you to obtain\l"
+	.string "the artist’s permission to exhibit\l"
+	.string "it here?$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3
+	.string "I wish to fill this exhibit hall with\n"
+	.string "modern and vibrant paintings of\l"
+	.string "POKéMON.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42
+	.string "Thanks to you, we’ve added a new\n"
+	.string "painting to our collection!\p"
+	.string "I’ve heard it depicts your POKéMON.\n"
+	.string "Truly magnificent!\p"
+	.string "Thank you so very, very much!$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4
+	.string "Ah! It’s you!\n"
+	.string "{PLAYER}!$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6
+	.string "Isn’t this marvelous?\n"
+	.string "This collection of paintings!\p"
+	.string "Each one of them flawless!\n"
+	.string "None better than another!\p"
+	.string "These paintings have attracted\n"
+	.string "more guests to our ART MUSEUM.\p"
+	.string "Sincerely, I thank you, {PLAYER}.\n"
+	.string "This is my dream come true!$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219EC5: @ 8219EC5
+	.string "This is merely a token of my gratitude.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED
+	.string "I will keep this for you until we\n"
+	.string "meet again.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B
+	.string "Ah, so good to see you, {PLAYER}!\p"
+	.string "It’s an honor to have you visit us\n"
+	.string "on your busy journeys.\p"
+	.string "Please, relax and do enjoy your\n"
+	.string "visit with us.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0
+	.string "It’s a picture frame with pink-colored\n"
+	.string "adornments.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3
+	.string "It’s a picture frame with\n"
+	.string "yellow-colored adornments.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008
+	.string "It’s a picture frame with\n"
+	.string "blue-colored adornments.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B
+	.string "It’s a picture frame with\n"
+	.string "red-colored adornments.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D
+	.string "It’s a picture frame with\n"
+	.string "green-colored adornments.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1
+	.string "It’s a painting of POKéMON.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD
+	.string "I’ve been away awhile, so the new\n"
+	.string "paintings up here surprised me.\p"
+	.string "I wish someone would paint my POKéMON\n"
+	.string "this pretty.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132
+	.string "Well… So this is where they show\n"
+	.string "the topical POKéMON paintings.\p"
+	.string "I see, these new paintings are indeed\n"
+	.string "rather amusing.$"
+
+LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8
+	.string "Wow, is that right?\n"
+	.string "These paintings are of your POKéMON.\p"
+	.string "Isn’t that just the ultimate joy for\n"
+	.string "a TRAINER?$"
+
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
new file mode 100644
index 000000000..a1be3924f
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..6a0ddfebc 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_MoveDeletersHouse: @ 848376C
-	.4byte LilycoveCity_MoveDeletersHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_MoveDeletersHouse_MapEvents
 	.4byte LilycoveCity_MoveDeletersHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 60
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..42b4949a2
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0
+	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0
+	object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 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..c040d7715 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..910dd36ab
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..e9c27fd81 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..be478e45c
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790
+	object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 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..78102855c 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_PokemonTrainerFanClub: @ 8483734
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
+	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapEvents
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 107
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
new file mode 100644
index 000000000..74146fc7e
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -0,0 +1,864 @@
+LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
+	map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
+	map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D
+	.byte 0
+
+LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
+	map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
+	.2byte 0
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
+	lockall
+	applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA
+	waitmovement 0
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, 4
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
+	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
+	waitmovement 0
+	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8
+	waitmovement 0
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, 4
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
+	waitmovement 0
+	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4
+	waitmovement 0
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
+	waitmovement 0
+	setvar VAR_0x4095, 2
+	releaseall
+	end
+
+LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5
+	delay_8
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	step_end
+
+LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
+	step_end
+
+LilycoveCity_PokemonTrainerFanClub_Movement_21C804: @ 821C804
+	walk_down
+	walk_in_place_fastest_right
+	step_end
+
+LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
+	jump_in_place_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_in_place_fastest_down
+	step_end
+
+LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
+	compare VAR_0x4095, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8
+	compare VAR_0x4095, 2
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
+	special sub_813BCE8
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
+	setvar VAR_0x8004, 8
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
+	setvar VAR_0x8004, 9
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
+	setvar VAR_0x8004, 10
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
+	setvar VAR_0x8004, 11
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
+	setvar VAR_0x8004, 12
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
+	setvar VAR_0x8004, 13
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
+	setvar VAR_0x8004, 14
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
+	setvar VAR_0x8004, 15
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA
+	specialvar VAR_RESULT, sub_80EE7C0
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1
+	clearflag FLAG_0x2DA
+	clearflag FLAG_0x0D2
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
+	setflag FLAG_0x2DA
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
+	setvar VAR_0x8005, 8
+	setvar VAR_0x8004, 8
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	setvar VAR_0x8004, 9
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	setvar VAR_0x8004, 10
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	setvar VAR_0x8004, 11
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	setvar VAR_0x8004, 12
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	setvar VAR_0x8004, 13
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	setvar VAR_0x8004, 14
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	setvar VAR_0x8004, 15
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 0
+	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
+	compare VAR_0x8005, 5
+	goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE:: @ 821C9AE
+	subvar VAR_0x8005, 1
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4:: @ 821C9B4
+	special sub_80EE72C
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8:: @ 821C9B8
+	setobjectxyperm 1, 7, 5
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0:: @ 821C9C0
+	setobjectxyperm 3, 3, 4
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8:: @ 821C9C8
+	setobjectxyperm 4, 7, 2
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0:: @ 821C9D0
+	setobjectxyperm 5, 5, 5
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8:: @ 821C9D8
+	setobjectxyperm 6, 5, 2
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0:: @ 821C9E0
+	setobjectxyperm 2, 8, 4
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8:: @ 821C9E8
+	setobjectxyperm 7, 3, 3
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0:: @ 821C9F0
+	setobjectxyperm 8, 8, 3
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8:: @ 821C9F8
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
+	lock
+	faceplayer
+	setvar VAR_0x8004, 13
+	special sub_813BDB4
+	compare VAR_0x4095, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
+	lock
+	faceplayer
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	compare VAR_0x4095, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
+	lock
+	faceplayer
+	setvar VAR_0x8004, 9
+	special sub_813BDB4
+	compare VAR_0x4095, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
+	lock
+	faceplayer
+	setvar VAR_0x8004, 10
+	special sub_813BDB4
+	compare VAR_0x4095, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
+	lock
+	faceplayer
+	setvar VAR_0x8004, 11
+	special sub_813BDB4
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
+	lock
+	faceplayer
+	setvar VAR_0x8004, 12
+	special sub_813BDB4
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
+	lock
+	faceplayer
+	setvar VAR_0x8004, 14
+	special sub_813BDB4
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
+	lock
+	faceplayer
+	setvar VAR_0x8004, 15
+	special sub_813BDB4
+	specialvar VAR_RESULT, sub_813BD60
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 7
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
+	specialvar VAR_RESULT, sub_813BCA8
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B
+	lock
+	faceplayer
+	checkflag FLAG_0x0D2
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
+	checkflag FLAG_0x0D2
+	goto_if 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
+	setvar VAR_0x8005, 11
+	special InterviewBefore
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
+	copyvar VAR_0x800A, VAR_0x8006
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4
+	setvar VAR_0x8004, 14
+	copyvar VAR_0x8005, VAR_0x800A
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+	lock
+	faceplayer
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4
+	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4
+	setvar VAR_0x8004, 14
+	copyvar VAR_0x8005, VAR_0x800A
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+	lock
+	faceplayer
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	message LilycoveCity_PokemonTrainerFanClub_Text_281C95
+	waitmessage
+	setvar VAR_0x8004, 2
+	special sub_813A128
+	waitstate
+	setvar VAR_0x8004, 8
+	switch VAR_RESULT
+	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
+	case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	copyvar VAR_0x8006, VAR_0x800A
+	copyvar VAR_0x8005, VAR_RESULT
+	special PutFanClubSpecialOnTheAir
+	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5
+	compare VAR_RESULT, 1
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
+	compare VAR_RESULT, 0
+	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4
+	setflag FLAG_0x0D2
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
+	setvar VAR_0x8004, 8
+	special sub_813BDB4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF
+	end
+
+LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00
+	.string "Oh, wow!\n"
+	.string "It’s {PLAYER}!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12
+	.string "I’ve heard the news!\n"
+	.string "You’re really strong, aren’t you?\p"
+	.string "We always argue about who is the\n"
+	.string "strongest of all TRAINERS here.\p"
+	.string "So when I heard about you, I decided\n"
+	.string "to be your fan!\p"
+	.string "I hope you’ll keep on battling other\n"
+	.string "tough TRAINERS.\p"
+	.string "That way, we’ll be able to see more\n"
+	.string "of your hot, hot battles.\p"
+	.string "That will make the others here see\n"
+	.string "exactly how great you are.\p"
+	.string "Remember, I’m cheering for you,\n"
+	.string "{PLAYER}!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D094: @ 821D094
+	.string "Yo, {PLAYER}!\n"
+	.string "You’re the one we want to win!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D0BB: @ 821D0BB
+	.string "The others, they don’t know that\n"
+	.string "you’re the best of the best!\p"
+	.string "Isn’t that right, {PLAYER}?\n"
+	.string "Show them you’ve got guts!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D12A: @ 821D12A
+	.string "I hate to say this, but the TRAINER\n"
+	.string "everybody’s talking about is\l"
+	.string "{STR_VAR_1}, no question about it!\p"
+	.string "That TRAINER’s power…\n"
+	.string "It’s out of the ordinary.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D1B5: @ 821D1B5
+	.string "Darn it… I’ve been telling people\n"
+	.string "that {STR_VAR_1} is the best now…\p"
+	.string "But no one wants to listen…$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C
+	.string "I’ve been hearing things about\n"
+	.string "a tough new TRAINER.\p"
+	.string "This TRAINER’s supposed to be beating\n"
+	.string "GYM LEADERS, even.\p"
+	.string "Do you know anything about this\n"
+	.string "new TRAINER?$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D2A6: @ 821D2A6
+	.string "Oh!\n"
+	.string "{PLAYER}!\p"
+	.string "Go for it!\n"
+	.string "I’m pulling for you!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE
+	.string "Sigh…\n"
+	.string "BRAWLY…\p"
+	.string "Oh, no! Wait!\n"
+	.string "That’s not right! No, no, no!\p"
+	.string "I’m your fan through and through!\p"
+	.string "So make me proud!\n"
+	.string "Go for it!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D347: @ 821D347
+	.string "I can’t help it, I can only get to\n"
+	.string "like BRAWLY…$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D377: @ 821D377
+	.string "Nobody understands the charm of\n"
+	.string "BRAWLY…\p"
+	.string "I don’t care!\p"
+	.string "Even if I’m the only one, I’m going\n"
+	.string "to keep cheering for BRAWLY!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D3EE: @ 821D3EE
+	.string "Whatever anyone says, my favorite\n"
+	.string "TRAINER is DEWFORD’s GYM LEADER\l"
+	.string "BRAWLY!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D438: @ 821D438
+	.string "You’ve surpassed your own father in\n"
+	.string "every regard!\p"
+	.string "I’m telling you, so there’s no question\n"
+	.string "about it at all!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D4A3: @ 821D4A3
+	.string "Even when things turned bleak,\n"
+	.string "your father never gave up.\p"
+	.string "This I know to be true.\p"
+	.string "You never give up even if you lose!\n"
+	.string "So keep on battling!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E
+	.string "NORMAN battled with more power,\n"
+	.string "charisma, and showmanship than you.\p"
+	.string "Even though people may say that\n"
+	.string "you’re strong…\p"
+	.string "You’ve still got a long way to go\n"
+	.string "compared to your father.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC
+	.string "You’re beginning to get the same\n"
+	.string "air of awe NORMAN exudes.\p"
+	.string "But there’s something conclusively\n"
+	.string "different between you and NORMAN.\p"
+	.string "I can’t tell you what that is.\n"
+	.string "You’ll have to find it yourself.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C
+	.string "Everyone here, we’re all huge fans\n"
+	.string "of POKéMON battles.\p"
+	.string "We discuss who we consider to be\n"
+	.string "the strongest of all TRAINERS.\p"
+	.string "If you were to become famous,\n"
+	.string "we might even become your fans!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D751: @ 821D751
+	.string "Oh, woweee! It’s {PLAYER}!\n"
+	.string "For real, too!\p"
+	.string "Please, shake my hand, shake my hand!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B
+	.string "I’ll always cheer for you, {PLAYER}!\n"
+	.string "Always, always!\p"
+	.string "I don’t want to see you lose ever,\n"
+	.string "{PLAYER}.\p"
+	.string "Because I know you’re really,\n"
+	.string "really strong, {PLAYER}!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822
+	.string "{STR_VAR_1} is really cool…\p"
+	.string "Everyone thinks so, right, right?$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D857: @ 821D857
+	.string "{STR_VAR_1} really is cool, don’t\n"
+	.string "you think so?\p"
+	.string "Even if it’s just me, I’m going to keep\n"
+	.string "cheering my favorite TRAINER.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4
+	.string "My favorite TRAINER is…\p"
+	.string "Cool…\p"
+	.string "Strong…\p"
+	.string "And really nice…\p"
+	.string "I wish there was a TRAINER like that…$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D921: @ 821D921
+	.string "Whoa! It’s {PLAYER}!\n"
+	.string "Wicked!\p"
+	.string "When I grow up, I want to be strong\n"
+	.string "like you, {PLAYER}!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D96A: @ 821D96A
+	.string "Even if I’m the only one…\p"
+	.string "You’ll always be the only one\n"
+	.string "I cheer for, {PLAYER}!\p"
+	.string "Because I believe in you, {PLAYER}!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21D9D1: @ 821D9D1
+	.string "{STR_VAR_1} is so wickedly cool…\n"
+	.string "I want to shake hands with my hero.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DA0D: @ 821DA0D
+	.string "Even if I’m the only one…\p"
+	.string "I’m never going to stop being\n"
+	.string "{STR_VAR_1}’s fan!\p"
+	.string "Because I’ve heard, {STR_VAR_1}\n"
+	.string "never loses!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73
+	.string "{PLAYER}!\n"
+	.string "You are amazing after all!\p"
+	.string "Ever since I set eyes on you,\n"
+	.string "I knew that you were great.\p"
+	.string "It looks like my eyes didn’t deceive me.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DAF5: @ 821DAF5
+	.string "Who cares about the others.\n"
+	.string "I’m in your corner!\p"
+	.string "You don’t need to worry. Just get\n"
+	.string "out there and battle like always.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69
+	.string "You’re a pretty decent TRAINER,\n"
+	.string "I think.\p"
+	.string "But I also think that {STR_VAR_1}\n"
+	.string "is number one right now.\p"
+	.string "That’s just my opinion.\n"
+	.string "Don’t worry about it too much.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DBFB: @ 821DBFB
+	.string "Wow, you really are strong.\n"
+	.string "Maybe even stronger than {STR_VAR_1}.\p"
+	.string "But {STR_VAR_1} needs me.\p"
+	.string "If I don’t cheer for {STR_VAR_1},\n"
+	.string "who will?$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DC68: @ 821DC68
+	.string "You’ve changed my mind!\n"
+	.string "You are strong, aren’t you?\p"
+	.string "I’d like you to tell me how you managed\n"
+	.string "to get so strong!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DCD6: @ 821DCD6
+	.string "The tougher the situation, the more\n"
+	.string "attractively you battle.\p"
+	.string "I can’t wait for your next battle!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DD36: @ 821DD36
+	.string "Among the recently hot TRAINERS,\n"
+	.string "{STR_VAR_1} is the standout.\p"
+	.string "That toughness, it’s simply not normal.\p"
+	.string "You’re doing okay, but you’re not in\n"
+	.string "the same class as {STR_VAR_1}.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE
+	.string "You are really popular…\p"
+	.string "You’re strong, and you’re caring to\n"
+	.string "POKéMON. No one can knock you.\p"
+	.string "But, you know, I believe in {STR_VAR_1}.\p"
+	.string "{STR_VAR_1} is definitely stronger!\n"
+	.string "I’m positive!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72
+	.string "You…\p"
+	.string "Impressive!$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83
+	.string "Your true worth, it is fine if only\n"
+	.string "I recognized it.\p"
+	.string "The others I doubt will understand\n"
+	.string "the hidden power that beats within.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DEFF: @ 821DEFF
+	.string "Yes, I see strength in your eyes.\p"
+	.string "But!\p"
+	.string "You still haven’t realized your\n"
+	.string "potential.$"
+
+LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51
+	.string "It is true that you are tremendously\n"
+	.string "powerful.\p"
+	.string "But!\n"
+	.string "I can tell…\p"
+	.string "That strength cannot be considered\n"
+	.string "true strength yet!\p"
+	.string "True strength is…!\n"
+	.string "… …\p"
+	.string "Actually, I have no idea, either.$"
+
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..0384e495f 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -1,15 +1,15 @@
 LilycoveCity_UnusedMart: @ 8483718
-	.4byte LilycoveCity_UnusedMart_MapAttributes
+	.4byte Mart_Layout
 	.4byte LilycoveCity_UnusedMart_MapEvents
 	.4byte LilycoveCity_UnusedMart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 12
+	.byte MAPSEC_LILYCOVE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c87a35486
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
+	object_event 7, 246, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 8, 247, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 9, 248, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 10, 249, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
+	object_event 11, 250, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 86
+	object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 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..9aa0c9cc7 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -1,15 +1,15 @@
 LinkContestRoom1: @ 8484DA0
-	.4byte LinkContestRoom1_MapAttributes
+	.4byte LinkContestRoom1_Layout
 	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom1_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
 	.2byte 225
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..342ed7d0b 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -1,15 +1,15 @@
 LinkContestRoom2: @ 8484E64
-	.4byte LinkContestRoom2_MapAttributes
+	.4byte LinkContestRoom2_Layout
 	.4byte LinkContestRoom2_MapEvents
 	.4byte LinkContestRoom2_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
 	.2byte 232
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ff29d7e87 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -1,15 +1,15 @@
 LinkContestRoom3: @ 8484E80
-	.4byte LinkContestRoom3_MapAttributes
+	.4byte LinkContestRoom3_Layout
 	.4byte LinkContestRoom3_MapEvents
 	.4byte LinkContestRoom3_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
 	.2byte 233
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..025e5971e 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -1,15 +1,15 @@
 LinkContestRoom4: @ 8484E9C
-	.4byte LinkContestRoom4_MapAttributes
+	.4byte LinkContestRoom4_Layout
 	.4byte LinkContestRoom4_MapEvents
 	.4byte LinkContestRoom4_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
 	.2byte 234
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7c145d0e4 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -1,15 +1,15 @@
 LinkContestRoom5: @ 8484EB8
-	.4byte LinkContestRoom5_MapAttributes
+	.4byte LinkContestRoom5_Layout
 	.4byte LinkContestRoom5_MapEvents
 	.4byte LinkContestRoom5_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
 	.2byte 235
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..939d56426 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -1,15 +1,15 @@
 LinkContestRoom6: @ 8484ED4
-	.4byte LinkContestRoom6_MapAttributes
+	.4byte LinkContestRoom6_Layout
 	.4byte LinkContestRoom6_MapEvents
 	.4byte LinkContestRoom6_MapScripts
 	.4byte 0x0
 	.2byte MUS_CONTEST0
 	.2byte 236
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b6e7c3cf9
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, 868
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0
+	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752
+	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 761
+	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 762
+	object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 794
+	object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 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, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091
+	coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF
+	coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F
+	coord_event 8, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81F9
+	coord_event 9, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E8205
+	coord_event 10, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81E1
+	coord_event 11, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81ED
+	coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB
+	coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE
+
+LittlerootTown_MapBGEvents: @ 8527810
+	bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151
+	bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A
+	bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163
+	bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, 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..db13d6def 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -1,15 +1,15 @@
 LittlerootTown: @ 84825B4
-	.4byte LittlerootTown_MapAttributes
+	.4byte LittlerootTown_Layout
 	.4byte LittlerootTown_MapEvents
 	.4byte LittlerootTown_MapScripts
 	.4byte LittlerootTown_MapConnections
 	.2byte MUS_MISHIRO
 	.2byte 10
+	.byte MAPSEC_LITTLEROOT_TOWN
 	.byte 0
-	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..57538339f
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758
+	object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755
+	object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 734
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735
+	object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 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, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3
+	coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE
+	coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA
+	coord_event 9, 3, 0, VAR_0x408D, 2, 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..6224e7a50 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_MISHIRO
 	.2byte 54
+	.byte MAPSEC_LITTLEROOT_TOWN
 	.byte 0
-	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..815acaa82
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817
+	object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_NORTH, gUnknown_081F860D
+	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656
+	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781
+	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..ec7eb66ce 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_MISHIRO
 	.2byte 55
+	.byte MAPSEC_LITTLEROOT_TOWN
 	.byte 0
-	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
new file mode 100644
index 000000000..429c933fc
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -0,0 +1,318 @@
+LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
+	map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE
+	map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A
+	.byte 0
+
+LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
+	compare VAR_0x408D, 2
+	call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457
+	compare VAR_0x408D, 3
+	call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A
+	compare VAR_0x4092, 4
+	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE
+	call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
+	setvar VAR_0x4089, 0
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
+	checkflag FLAG_0x124
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433
+	compare VAR_0x4084, 2
+	goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456
+	goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456
+	compare VAR_0x40D3, 2
+	goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309
+	setobjectxyperm 1, 0, 2
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
+	checkplayergender
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464
+	setvar VAR_0x408D, 2
+	return
+
+LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
+	map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474
+	.2byte 0
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq EventScript_275D0C
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481
+	lockall
+	compare VAR_0x408D, 2
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
+	delay 10
+	addobject 1
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598
+	waitmovement 0
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A
+	waitmovement 0
+	delay 10
+	playbgm MUS_BOY_SUP, 1
+	compare VAR_FACING, 2
+	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507
+	compare VAR_FACING, 1
+	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536
+	compare VAR_FACING, 3
+	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565
+	compare VAR_FACING, 4
+	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594
+	setvar VAR_0x408D, 3
+	setflag FLAG_0x331
+	clearflag FLAG_0x2F8
+	setvar VAR_0x4050, 1
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0
+	waitmovement 0
+	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
+	closemessage
+	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7
+	waitmovement 0
+	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
+	closemessage
+	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8
+	waitmovement 0
+	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
+	closemessage
+	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD
+	waitmovement 0
+	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
+	closemessage
+	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6
+	delay_8
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604
+	walk_up
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+gUnknown_081F860D:: @ 81F860D
+	lockall
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
+	setvar VAR_0x8004, 1
+	special DoPCTurnOnEffect
+	playse SE_PC_ON
+	msgbox gUnknown_08272D87, 4
+	special BedroomPC
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F
+	setvar VAR_0x8004, 1
+	playse SE_PC_OFF
+	special DoPCTurnOffEffect
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C
+	msgbox gUnknown_08272CD5, 4
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656
+LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F
+LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3
+	end
+
+LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668
+	.string "The clock is stopped…\p"
+	.string "Better set it and start it!$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A
+	.string "MOM: {PLAYER}, how do you like your\n"
+	.string "new room?\p"
+	.string "Good! Everything’s put away neatly!\p"
+	.string "They finished moving everything in\n"
+	.string "downstairs, too.\p"
+	.string "POKéMON movers are so convenient!\p"
+	.string "Oh, you should make sure that\n"
+	.string "everything’s all there on your desk.$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F
+	.string "{PLAYER} flipped open the notebook.\p"
+	.string "ADVENTURE RULE NO. 1\n"
+	.string "Open the MENU with START.\p"
+	.string "ADVENTURE RULE NO. 2\n"
+	.string "Record your progress with SAVE.\p"
+	.string "The remaining pages are blank…$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820
+	.string "{PLAYER} took a closer look at the\n"
+	.string "HOENN region map.$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F
+	.string "It’s a Nintendo GameCube.\p"
+	.string "A Game Boy Advance is connected to\n"
+	.string "serve as the Controller.$"
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
new file mode 100644
index 000000000..fda8175bb
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759
+	object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754
+	object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 734
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736
+	object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 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, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C
+	coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67
+	coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73
+	coord_event 3, 3, 0, VAR_0x408D, 2, 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..7681d9a83 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_MISHIRO
 	.2byte 56
+	.byte MAPSEC_LITTLEROOT_TOWN
 	.byte 0
-	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6d541e1e3
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 185
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 757
+	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 849
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F
+	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656
+	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D
+	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..9e5d0c807 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_MISHIRO
 	.2byte 57
+	.byte MAPSEC_LITTLEROOT_TOWN
 	.byte 0
-	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
new file mode 100644
index 000000000..5501f5ad5
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -0,0 +1,422 @@
+LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
+	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1
+	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D
+	.byte 0
+
+LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
+	compare VAR_0x408D, 2
+	call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A
+	compare VAR_0x408D, 3
+	call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD
+	compare VAR_0x4092, 4
+	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE
+	call LittlerootTown_MaysHouse_2F_EventScript_275CE1
+	setvar VAR_0x4089, 0
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
+	checkflag FLAG_0x124
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6
+	compare VAR_0x4084, 2
+	goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
+	goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
+
+LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
+	checkplayergender
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
+	compare VAR_0x40D3, 2
+	goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
+	setobjectxyperm 1, 8, 2
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309
+LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
+	return
+
+LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
+	return
+
+LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317
+	setvar VAR_0x408D, 2
+	return
+
+LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
+	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327
+	.2byte 0
+
+LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
+	checkplayergender
+	compare VAR_RESULT, 1
+	goto_eq EventScript_275D0C
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
+	lockall
+	compare VAR_0x408D, 2
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
+	msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
+	delay 10
+	addobject 1
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598
+	waitmovement 0
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A
+	waitmovement 0
+	delay 10
+	playbgm MUS_GIRL_SUP, 1
+	compare VAR_FACING, 2
+	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA
+	compare VAR_FACING, 1
+	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9
+	compare VAR_FACING, 3
+	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418
+	compare VAR_FACING, 4
+	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440
+	setvar VAR_0x408D, 3
+	setflag FLAG_0x332
+	clearflag FLAG_0x2D2
+	setvar VAR_0x4050, 1
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473
+	waitmovement 0
+	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	waitmovement 0
+	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
+	closemessage
+	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B
+	waitmovement 0
+	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	waitmovement 0
+	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
+	closemessage
+	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D
+	waitmovement 0
+	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6
+	waitmovement 0
+	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
+	closemessage
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD
+	waitmovement 0
+	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4
+	waitmovement 0
+	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
+	closemessage
+	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB
+	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2
+	waitmovement 0
+	return
+
+LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_right
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F
+	walk_up
+	walk_in_place_fastest_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4
+	walk_up
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD
+	walk_right
+	walk_right
+	walk_down
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1
+LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1
+	lockall
+	checkflag FLAG_0x124
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, 4
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, 4
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
+	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E
+	waitmovement 0
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F
+	setflag FLAG_0x125
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D
+	checkflag FLAG_0x125
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F
+	checkflag FLAG_0x125
+	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4
+	return
+
+gUnknown_081F9553:: @ 81F9553
+	lockall
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
+	msgbox gUnknown_08272CD5, 4
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
+	setvar VAR_0x8004, 2
+	special DoPCTurnOnEffect
+	playse SE_PC_ON
+	msgbox gUnknown_08272D87, 4
+	special BedroomPC
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F
+	setvar VAR_0x8004, 2
+	playse SE_PC_OFF
+	special DoPCTurnOffEffect
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C
+	.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_2F_Text_1F978A: @ 81F978A
+	.string "POKéMON fully restored!\n"
+	.string "Items ready, and…$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4
+	.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_2F_Text_1F9962: @ 81F9962
+	.string "POKéMON fully restored…\n"
+	.string "Items all packed, and…$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991
+LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991
+	.string "It’s {RIVAL}’s POKé BALL!\p"
+	.string "Better leave it right where it is.$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9
+	.string "MAY: {PLAYER}{KUN}!\p"
+	.string "I was just checking my POKéDEX.\p"
+	.string "There’s still a lot of POKéMON that\n"
+	.string "I’ve seen but haven’t caught.\p"
+	.string "And there are many others that\n"
+	.string "I think will evolve.\p"
+	.string "I wonder where I should go catch\n"
+	.string "some POKéMON next?$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E
+	.string "MAY: I wonder where I should go catch\n"
+	.string "some POKéMON next?\p"
+	.string "Wouldn’t it be funny if we ran into each\n"
+	.string "other, {PLAYER}{KUN}?$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D
+	.string "BRENDAN: Hey, it’s {PLAYER}.\p"
+	.string "I was just checking out my POKéDEX.\p"
+	.string "There are still many POKéMON that\n"
+	.string "I need to catch, I know, but this\l"
+	.string "is looking pretty good.\p"
+	.string "Checking this POKéDEX out gives me\n"
+	.string "the urge to hit the road again.$"
+
+LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7
+	.string "BRENDAN: I’m having a hard time deciding\n"
+	.string "where I should catch POKéMON next.\p"
+	.string "Hey, {PLAYER}, if I see you while I’m out\n"
+	.string "catching POKéMON, I can pitch you a\l"
+	.string "battle if you’d like.$"
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
new file mode 100644
index 000000000..df992a2e3
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721
+	object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
+	bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3
+	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
+	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD
+	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4
+	bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB
+	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, 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..3e55729a8 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -1,15 +1,15 @@
 LittlerootTown_ProfessorBirchsLab: @ 8482B64
-	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
+	.4byte LittlerootTown_ProfessorBirchsLab_Layout
 	.4byte LittlerootTown_ProfessorBirchsLab_MapEvents
 	.4byte LittlerootTown_ProfessorBirchsLab_MapScripts
 	.4byte 0x0
 	.2byte MUS_ODAMAKI
 	.2byte 58
+	.byte MAPSEC_LITTLEROOT_TOWN
 	.byte 0
-	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
new file mode 100644
index 000000000..75b83b6a1
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -0,0 +1,1030 @@
+LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
+	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1
+	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06
+	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9
+	.byte 0
+
+LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
+	call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
+	compare VAR_0x40D3, 6
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
+	compare VAR_0x40D3, 4
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
+	compare VAR_0x40D3, 3
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
+	specialvar VAR_RESULT, sub_80C08E4
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
+	setobjectmovementtype 3, 3
+	setobjectxyperm 3, 5, 10
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
+	setvar VAR_0x40D3, 4
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
+	setmaplayoutindex 432
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
+	setmaplayoutindex 432
+	setobjectmovementtype 3, 3
+	setobjectxyperm 3, 5, 10
+	end
+
+LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
+	map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
+	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
+	map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
+	map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
+	map_script_2 VAR_0x40D3, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
+	map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
+	map_script_2 VAR_0x40D3, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
+	.2byte 0
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
+	turnobject 255, 2
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
+	turnobject 255, 2
+	addobject 2
+	addobject 3
+	turnobject 3, 2
+	setobjectxy 3, 5, 5
+	turnobject 2, 1
+	setobjectxy 2, 6, 4
+	turnobject 1, 4
+	setobjectxy 1, 10, 10
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71:: @ 81F9D71
+	addobject 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
+	addobject 4
+	addobject 5
+	addobject 6
+	addobject 3
+	turnobject 4, 1
+	setobjectxy 4, 8, 4
+	turnobject 5, 1
+	setobjectxy 5, 9, 4
+	turnobject 6, 1
+	setobjectxy 6, 10, 4
+	turnobject 2, 1
+	setobjectxy 2, 6, 4
+	turnobject 3, 4
+	setobjectxy 3, 5, 5
+	end
+
+LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9
+	map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
+	map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
+	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80
+	map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62
+	.2byte 0
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
+	lockall
+	bufferleadmonspeciesname 0
+	message LittlerootTown_ProfessorBirchsLab_Text_1FA74D
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
+	setvar VAR_0x8004, 0
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4
+	clearflag FLAG_0x3DF
+	setvar VAR_0x4084, 3
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67
+	lockall
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78
+	waitmovement 0
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8
+	end
+
+LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
+	lockall
+	delay 30
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, 4
+	closemessage
+	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46
+	waitmovement 0
+	delay 20
+	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 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4
+	waitmovement 0
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C
+	playse SE_PC_ON
+	waitse
+	delay 20
+	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58
+	waitmovement 0
+	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
+	waitmovement 0
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4
+	playfanfare MUS_FANFA4
+	message LittlerootTown_ProfessorBirchsLab_Text_1FB436
+	waitmessage
+	waitfanfare
+	setflag FLAG_SYS_NATIONAL_DEX
+	special EnableNationalPokedex
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4
+	closemessage
+	setflag FLAG_0x31B
+	setflag FLAG_0x31A
+	setvar VAR_0x40D3, 2
+	setvar VAR_0x40F5, 0
+	setflag FLAG_0x072
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, 4
+	closemessage
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, 4
+	closemessage
+	return
+
+LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46
+	walk_left
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_right
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62
+	lockall
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C
+	waitmovement 0
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, 4
+	setvar VAR_0x40D3, 5
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
+	lock
+	faceplayer
+	compare VAR_0x4084, 3
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
+	checkflag FLAG_0x058
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, 4
+	setflag FLAG_0x058
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
+	release
+	compare VAR_0x40D3, 6
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	waitmovement 0
+	drawmonpic SPECIES_CYNDAQUIL, 10, 3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
+	release
+	compare VAR_0x40D3, 6
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	waitmovement 0
+	drawmonpic SPECIES_TOTODILE, 10, 3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
+	release
+	compare VAR_0x40D3, 6
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
+	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	waitmovement 0
+	drawmonpic SPECIES_CHIKORITA, 10, 3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, 4
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
+	erasemonpic
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, 4
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
+	bufferspeciesname 0, SPECIES_CYNDAQUIL
+	setvar VAR_TEMP_1, 155
+	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
+	erasemonpic
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+	removeobject 4
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
+	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+	removeobject 4
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
+	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
+	erasemonpic
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4
+	setvar VAR_0x40D3, 6
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
+	bufferspeciesname 0, SPECIES_TOTODILE
+	setvar VAR_TEMP_1, 158
+	givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
+	erasemonpic
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+	removeobject 5
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
+	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+	removeobject 5
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
+	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
+	erasemonpic
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4
+	setvar VAR_0x40D3, 6
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
+	bufferspeciesname 0, SPECIES_CHIKORITA
+	setvar VAR_TEMP_1, 152
+	givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
+	compare VAR_RESULT, 1
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
+	erasemonpic
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+	removeobject 6
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
+	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
+	removeobject 6
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
+	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
+	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
+	erasemonpic
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4
+	setvar VAR_0x40D3, 6
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F
+	playfanfare MUS_FANFA4
+	message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7
+	waitmessage
+	waitfanfare
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
+	lock
+	faceplayer
+	compare VAR_0x40D3, 5
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
+	compare VAR_0x40D3, 2
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
+	checkflag FLAG_0x119
+	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
+	checkflag FLAG_0x380
+	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	compare VAR_0x40D3, 3
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	compare VAR_0x40D3, 6
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141
+	compare VAR_0x4084, 5
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2
+Route101_EventScript_1FA2D2:: @ 81FA2D2
+	msgbox Route101_Text_2B5F52, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox Route101_Text_2B603A, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x119
+	setvar VAR_0x40DA, 2
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, 4
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, 4
+	closemessage
+	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0
+	waitmovement 0
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
+	waitmovement 0
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
+	setvar VAR_0x4084, 5
+	setflag FLAG_0x074
+	setvar VAR_0x4051, 1
+	setvar VAR_0x408D, 4
+	setvar VAR_0x4050, 3
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4
+	giveitem_std ITEM_POKE_BALL, 5
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4
+	setvar VAR_RESULT, 0
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4
+	giveitem_std ITEM_POKE_BALL, 5
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4
+	setvar VAR_RESULT, 1
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC
+	playfanfare MUS_FANFA4
+	message LittlerootTown_ProfessorBirchsLab_Text_1FAC32
+	waitfanfare
+	setflag FLAG_SYS_POKEDEX_GET
+	special sub_81AFDA0
+	setflag FLAG_0x8E4
+	setvar VAR_0x40CD, 1
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC
+	lock
+	faceplayer
+	compare VAR_0x40D3, 5
+	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A
+	compare VAR_0x40D3, 6
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465
+	compare VAR_0x40D3, 2
+	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9
+	compare VAR_RESULT, 1
+	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6
+	lockall
+	pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A
+	waitmessage
+	clearflag FLAG_0x072
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2
+	.string "Hunh? PROF. BIRCH?\p"
+	.string "The PROF’s away on fieldwork.\n"
+	.string "Ergo, he isn’t here.\p"
+	.string "Oh, let me explain what fieldwork is.\p"
+	.string "It is to study things in the natural\n"
+	.string "environment, like fields and mountains,\l"
+	.string "instead of a laboratory.\p"
+	.string "The PROF isn’t one for doing desk work.\n"
+	.string "He’s the type of person who would\l"
+	.string "rather go outside and experience\l"
+	.string "things than read about them here.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641
+	.string "The PROF isn’t one for doing desk work.\n"
+	.string "He’s the type of person who would\l"
+	.string "rather go outside and experience\l"
+	.string "things than read about them here.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE
+	.string "PROF. BIRCH is studying the habitats\n"
+	.string "and distribution of POKéMON.\p"
+	.string "The PROF enjoys {RIVAL}’s help, too.\n"
+	.string "There’s a lot of love there.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D
+	.string "PROF. BIRCH: So, {PLAYER}{KUN}.\p"
+	.string "I’ve heard so much about you from\n"
+	.string "your father.\p"
+	.string "I’ve heard that you don’t have your\n"
+	.string "own POKéMON yet.\p"
+	.string "But the way you battled earlier,\n"
+	.string "you pulled it off with aplomb!\p"
+	.string "I guess you have your father’s blood\n"
+	.string "in your veins after all!\p"
+	.string "Oh, yes. As thanks for rescuing me,\n"
+	.string "I’d like you to have the POKéMON you\l"
+	.string "used earlier.\p"
+	.string "{PLAYER} received the {STR_VAR_1}!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1
+	.string "PROF. BIRCH: While you’re at it, why not\n"
+	.string "give a nickname to that {STR_VAR_1}?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6
+	.string "PROF. BIRCH: If you work at POKéMON\n"
+	.string "and gain experience, I think you’ll make\l"
+	.string "an extremely good TRAINER.\p"
+	.string "My kid, {RIVAL}, is also studying\n"
+	.string "POKéMON while helping me out.\p"
+	.string "{PLAYER}{KUN}, don’t you think it might be\n"
+	.string "a good idea to go see {RIVAL}?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5
+	.string "PROF. BIRCH: Great!\n"
+	.string "{RIVAL} should be happy, too.\p"
+	.string "Get {RIVAL} to teach you what it\n"
+	.string "means to be a TRAINER.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35
+	.string "PROF. BIRCH: Oh, don’t be that way.\n"
+	.string "You should go meet my kid.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74
+	.string "PROF. BIRCH: {RIVAL}?\n"
+	.string "Gone home, I think.\p"
+	.string "Or maybe that kid’s scrabbling around\n"
+	.string "in tall grass again somewhere…\p"
+	.string "If you or your POKéMON get tired,\n"
+	.string "you should get some rest at home.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22
+	.string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p"
+	.string "I heard you beat {RIVAL} on\n"
+	.string "your first try. That’s excellent!\p"
+	.string "{RIVAL}’s been helping with my research\n"
+	.string "for a long time.\p"
+	.string "{RIVAL} has an extensive history as\n"
+	.string "a TRAINER already.\p"
+	.string "Here, {PLAYER}{KUN}, I ordered this for my\n"
+	.string "research, but I think you should have\l"
+	.string "this POKéDEX.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32
+	.string "{PLAYER} received the POKéDEX!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B
+	.string "PROF. BIRCH: The POKéDEX is a high-tech\n"
+	.string "tool that automatically makes a record\l"
+	.string "of any POKéMON you meet or catch.\p"
+	.string "My kid, {RIVAL}, goes everywhere\n"
+	.string "with it.\p"
+	.string "Whenever my kid catches a rare POKéMON\n"
+	.string "and records its data in the POKéDEX,\l"
+	.string "why, {RIVAL} looks for me while I’m out\l"
+	.string "doing fieldwork, and shows me.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F
+	.string "PROF. BIRCH: Countless POKéMON\n"
+	.string "await you!\p"
+	.string "Argh, I’m getting the itch to get out\n"
+	.string "and do fieldwork again!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7
+	.string "MAY: Oh, wow, {PLAYER}{KUN}!\n"
+	.string "You got a POKéDEX, too!\p"
+	.string "That’s great! Just like me!\n"
+	.string "I’ve got something for you, too!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40
+	.string "MAY: It’s fun if you can get a lot of\n"
+	.string "POKéMON!\p"
+	.string "I’m going to look all over the place\n"
+	.string "because I want different POKéMON.\p"
+	.string "If I find any cute POKéMON, I’ll catch\n"
+	.string "them with POKé BALLS!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3
+	.string "Oh? Your BAG’s full.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08
+	.string "MAY: I wonder where I should go look\n"
+	.string "for POKéMON next?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F
+	.string "BRENDAN: Huh…\n"
+	.string "So you got a POKéDEX, too.\p"
+	.string "Well then, here.\n"
+	.string "I’ll give you these.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E
+	.string "BRENDAN: You know it’s more fun to\n"
+	.string "have a whole bunch of POKéMON.\p"
+	.string "I’m going to explore all over the place\n"
+	.string "to find different POKéMON.\p"
+	.string "If I find any cool POKéMON, you bet\n"
+	.string "I’ll try to get them with POKé BALLS.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D
+	.string "Hey, your BAG’s full.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073
+	.string "BRENDAN: Where should I look for\n"
+	.string "POKéMON next…$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2
+	.string "It’s a serious-looking machine.\n"
+	.string "The PROF must use this for research.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7
+	.string "It’s a PC used for research.\n"
+	.string "Better not mess around with it.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124
+	.string "It’s crammed with books on POKéMON.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148
+	.string "It’s a book that’s too hard to read.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D
+	.string "PROF. BIRCH: Now…\p"
+	.string "{PLAYER}{KUN} and {RIVAL}, I’ve had the two\n"
+	.string "of you help me study POKéMON.\p"
+	.string "Thanks to your help, new facts\n"
+	.string "are coming to light.\p"
+	.string "It appears that in the HOENN region,\n"
+	.string "there are also POKéMON from other\l"
+	.string "regions.\p"
+	.string "It goes to show how rich and varied\n"
+	.string "the natural environments of HOENN\l"
+	.string "happen to be.\p"
+	.string "That’s why I think it’s necessary for\n"
+	.string "me to upgrade your POKéDEX to\l"
+	.string "the NATIONAL Mode.\p"
+	.string "Here, let me see your POKéDEX units.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F
+	.string "MAY: Eheheh!\p"
+	.string "It’s so cool that even my POKéDEX\n"
+	.string "is getting updated!\p"
+	.string "It’s because you went out and caught\n"
+	.string "so many POKéMON, {PLAYER}{KUN}!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E
+	.string "BRENDAN: I went out all over HOENN\n"
+	.string "and checked out POKéMON.\p"
+	.string "You can thank me for getting\n"
+	.string "the NATIONAL Mode POKéDEX.\p"
+	.string "Yep, you’re lucky, {PLAYER}!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419
+	.string "PROF. BIRCH: Okay, all done!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436
+	.string "{PLAYER}’s POKéDEX was upgraded\n"
+	.string "to the NATIONAL Mode!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466
+	.string "PROF. BIRCH: But listen.\n"
+	.string "You’ve become the CHAMPION,\l"
+	.string "but your POKéMON journey isn’t over.\p"
+	.string "There is no end to the road\n"
+	.string "that is POKéMON.\p"
+	.string "Somewhere, there is a grassy patch\n"
+	.string "that’s waiting for you!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528
+	.string "MAY: I think I’ll take a short break\n"
+	.string "from fieldwork.\p"
+	.string "I think I’ll help the PROF here for\n"
+	.string "a while.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A
+	.string "BRENDAN: For the time being,\n"
+	.string "I’m taking a break from fieldwork.\p"
+	.string "I’ll be helping out the PROF here\n"
+	.string "for a while.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9
+	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
+	.string "Let’s have a look at your POKéDEX.\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "Yes, there’s no doubt about it.\p"
+	.string "You really have completed the HOENN\n"
+	.string "region’s POKéDEX.\p"
+	.string "That’s more than just impressive.\p"
+	.string "I have a gift for you.\p"
+	.string "Consider it my show of appreciation\n"
+	.string "for the fantastic work you’ve done.\p"
+	.string "My gift is a rare POKéMON only found\n"
+	.string "in another region!\p"
+	.string "You can have any one of these\n"
+	.string "three POKéMON!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787
+	.string "PROF. BIRCH: These are rare POKéMON\n"
+	.string "only found in another region!\p"
+	.string "You can have any one of these\n"
+	.string "three POKéMON!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6
+	.string "PROF. BIRCH: The FIRE POKéMON\n"
+	.string "CYNDAQUIL caught your eye!\p"
+	.string "You’re as sharp as ever!\p"
+	.string "So the CYNDAQUIL is your choice?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869
+	.string "PROF. BIRCH: The WATER POKéMON\n"
+	.string "TOTODILE is your choice!\p"
+	.string "You know how to pick a good one.\p"
+	.string "So, you’ll take the TOTODILE?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0
+	.string "PROF. BIRCH: The GRASS POKéMON\n"
+	.string "CHIKORITA is your choice!\p"
+	.string "You sure know what you’re doing.\p"
+	.string "So, you’ll take the CHIKORITA?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959
+	.string "PROF. BIRCH: Take your time before\n"
+	.string "you decide.\p"
+	.string "They’re all invaluable POKéMON.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8
+	.string "PROF. BIRCH: I see!\n"
+	.string "You picked a fine POKéMON!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7
+	.string "{PLAYER} received the {STR_VAR_1}\n"
+	.string "from PROF. BIRCH!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC
+	.string "Want to give a nickname to\n"
+	.string "the {STR_VAR_1} you received?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C
+	.string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n"
+	.string "You’ve completed the HOENN POKéDEX,\l"
+	.string "but your POKéMON journey isn’t over.\p"
+	.string "There is no end to the road\n"
+	.string "that is POKéMON.\p"
+	.string "Somewhere, there is a grassy patch\n"
+	.string "that’s waiting for you!$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8
+	.string "You received the promised POKéMON.\n"
+	.string "Better leave the others alone.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A
+	.string "Oh, you don’t have any room for\n"
+	.string "this POKéMON.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68
+	.string "MAY: {PLAYER}{KUN}, after this…\n"
+	.string "What are you going to do?\p"
+	.string "Are you going to keep battling\n"
+	.string "and sharpening your skills?\p"
+	.string "Or are you going to try filling\n"
+	.string "the NATIONAL POKéDEX?\p"
+	.string "I’m staying here to help the PROF.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D
+	.string "BRENDAN: Rather than collecting\n"
+	.string "POKéMON, I prefer slowly and \l"
+	.string "steadily raising the one I chose.$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D
+	.string "MAY: Oh, hi, {PLAYER}{KUN}!\n"
+	.string "Have you gone to that place,\l"
+	.string "the BATTLE FRONTIER?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2
+	.string "BRENDAN: Hey, {PLAYER}!\n"
+	.string "Have you gone out to that place,\l"
+	.string "the BATTLE FRONTIER?$"
+
+LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A
+	.string "… … … … … …\n"
+	.string "… … … … … Beep!\p"
+	.string "SCOTT: Hi, hi, {PLAYER}!\n"
+	.string "It’s me, SCOTT.\p"
+	.string "I’m aboard the S.S. TIDAL now.\n"
+	.string "It feels great to be on the sea!\p"
+	.string "By the way…\p"
+	.string "There’s this place that I’d like to\n"
+	.string "invite you to for a visit.\p"
+	.string "If you’re interested, board a ferry\n"
+	.string "at either SLATEPORT or LILYCOVE.\p"
+	.string "I’ll fill you in on the details when\n"
+	.string "we meet. I’ll be waiting!\p"
+	.string "… … … … … …\n"
+	.string "… … … … … Click!$"
diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc
new file mode 100644
index 000000000..2fa18eade
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, 857
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..851f56278 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -1,15 +1,15 @@
 MagmaHideout_1F: @ 8484828
-	.4byte MagmaHideout_1F_MapAttributes
+	.4byte MagmaHideout_1F_Layout
 	.4byte MagmaHideout_1F_MapEvents
 	.4byte MagmaHideout_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 336
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..723c9e914
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 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..d8118281f 100644
--- a/data/maps/MagmaHideout_2F_1R/header.inc
+++ b/data/maps/MagmaHideout_2F_1R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_AJITO
 	.2byte 337
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..277dcf530
--- /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, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..1de48fb62 100644
--- a/data/maps/MagmaHideout_2F_2R/header.inc
+++ b/data/maps/MagmaHideout_2F_2R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_AJITO
 	.2byte 338
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b37419278 100644
--- a/data/maps/MagmaHideout_2F_3R/header.inc
+++ b/data/maps/MagmaHideout_2F_3R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_AJITO
 	.2byte 380
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0f3ff3529
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 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..d5347ed25 100644
--- a/data/maps/MagmaHideout_3F_1R/header.inc
+++ b/data/maps/MagmaHideout_3F_1R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_AJITO
 	.2byte 339
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d2bd79078
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 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..45cda066b 100644
--- a/data/maps/MagmaHideout_3F_2R/header.inc
+++ b/data/maps/MagmaHideout_3F_2R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_AJITO
 	.2byte 340
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2ced1f4fd
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..347ec1897 100644
--- a/data/maps/MagmaHideout_3F_3R/header.inc
+++ b/data/maps/MagmaHideout_3F_3R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_AJITO
 	.2byte 379
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..435099c47
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 853
+	object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857
+	object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, 857
+	object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 850
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 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..f11c5eadd 100644
--- a/data/maps/MagmaHideout_4F/header.inc
+++ b/data/maps/MagmaHideout_4F/header.inc
@@ -1,15 +1,15 @@
 MagmaHideout_4F: @ 84848B4
-	.4byte MagmaHideout_4F_MapAttributes
+	.4byte MagmaHideout_4F_Layout
 	.4byte MagmaHideout_4F_MapEvents
 	.4byte MagmaHideout_4F_MapScripts
 	.4byte 0x0
 	.2byte MUS_AJITO
 	.2byte 341
-	.byte 198
+	.byte MAPSEC_MAGMA_HIDEOUT
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
new file mode 100644
index 000000000..0cc0fea56
--- /dev/null
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -0,0 +1,228 @@
+MagmaHideout_4F_MapScripts:: @ 823A55F
+	.byte 0
+
+MagmaHideout_4F_EventScript_23A560:: @ 823A560
+	lockall
+	playbgm MUS_MGM0, 0
+	msgbox MagmaHideout_4F_Text_23A9F4, 4
+	closemessage
+	delay 20
+	setvar VAR_RESULT, 1
+	playse SE_W197
+	setfieldeffectargument 0, 18
+	setfieldeffectargument 1, 42
+	setfieldeffectargument 2, 0
+	dofieldeffect 54
+	waitfieldeffect 54
+	setvar VAR_RESULT, 1
+	playfanfare MUS_ME_TAMA
+	playse SE_TAMA
+	special sub_80B0534
+	applymovement 255, MagmaHideout_4F_Movement_2725A6
+	waitmovement 0
+	delay 150
+	removeobject 7
+	addobject 1
+	waitstate
+	delay 60
+	applymovement 1, MagmaHideout_4F_Movement_23A672
+	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, MagmaHideout_4F_Movement_23A67D
+	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
+	applymovement 6, MagmaHideout_4F_Movement_23A680
+	waitmovement 0
+	msgbox MagmaHideout_4F_Text_23AADA, 4
+	closemessage
+	applymovement 255, MagmaHideout_4F_Movement_2725A8
+	waitmovement 0
+	delay 30
+	applymovement 6, MagmaHideout_4F_Movement_27259E
+	waitmovement 0
+	msgbox MagmaHideout_4F_Text_23AB33, 4
+	closemessage
+	trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5
+	msgbox MagmaHideout_4F_Text_23ABE2, 4
+	closemessage
+	clearflag FLAG_0x348
+	clearflag FLAG_0x343
+	setvar VAR_0x4058, 1
+	setflag FLAG_0x06F
+	setvar VAR_0x40A0, 1
+	fadescreen 1
+	removeobject 6
+	removeobject 2
+	removeobject 3
+	removeobject 4
+	removeobject 5
+	setflag FLAG_0x359
+	fadescreen 0
+	releaseall
+	end
+
+MagmaHideout_4F_Movement_23A672: @ 823A672
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+MagmaHideout_4F_Movement_23A67D: @ 823A67D
+	slide_up
+	slide_up
+	step_end
+
+MagmaHideout_4F_Movement_23A680: @ 823A680
+	face_left
+	delay_16
+	face_right
+	delay_16
+	face_left
+	delay_16
+	face_right
+	delay_16
+	face_up
+	delay_16
+	delay_16
+	step_end
+
+MagmaHideout_4F_EventScript_23A68C:: @ 823A68C
+	trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775
+	msgbox MagmaHideout_4F_Text_23A7B5, 6
+	end
+
+MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3
+	trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B
+	msgbox MagmaHideout_4F_Text_23A841, 6
+	end
+
+MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA
+	trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7
+	msgbox MagmaHideout_4F_Text_23A8C6, 6
+	end
+
+MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1
+	trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994
+	msgbox MagmaHideout_4F_Text_23A9AC, 6
+	end
+
+MagmaHideout_4F_Text_23A6E8: @ 823A6E8
+	.string "I want to see GROUDON, too, but they\n"
+	.string "won’t let me see even its tail…\p"
+	.string "It’s got me feeling really frustrated.\p"
+	.string "Oh, no!\n"
+	.string "I blabbed about GROUDON!$"
+
+MagmaHideout_4F_Text_23A775: @ 823A775
+	.string "I guess it’s impossible to win if one\n"
+	.string "doesn’t have a calm mind…$"
+
+MagmaHideout_4F_Text_23A7B5: @ 823A7B5
+	.string "I wonder if GROUDON even has a tail?$"
+
+MagmaHideout_4F_Text_23A7DA: @ 823A7DA
+	.string "Fuhahaha!\n"
+	.string "Soon! Very soon!\l"
+	.string "Our grand objective will be achieved!$"
+
+MagmaHideout_4F_Text_23A81B: @ 823A81B
+	.string "Grrr…\n"
+	.string "I’ve come so far, but now this?$"
+
+MagmaHideout_4F_Text_23A841: @ 823A841
+	.string "MAXIE, sir!\n"
+	.string "An intruder is headed your way!$"
+
+MagmaHideout_4F_Text_23A86D: @ 823A86D
+	.string "You’re not finished yet!\n"
+	.string "You’re not getting by me easily!$"
+
+MagmaHideout_4F_Text_23A8A7: @ 823A8A7
+	.string "Was I that easy to knock down?$"
+
+MagmaHideout_4F_Text_23A8C6: @ 823A8C6
+	.string "C-come on, one more match…$"
+
+MagmaHideout_4F_Text_23A8E1: @ 823A8E1
+	.string "Hehehe!\n"
+	.string "You made it this far, so I’ll tell you!\p"
+	.string "That’s right!\n"
+	.string "Up ahead, GROUDON is sleeping!\p"
+	.string "MAXIE went to GROUDON just seconds\n"
+	.string "ago!\p"
+	.string "It’s going to awaken real soon!\n"
+	.string "Hehe! Hehehe!$"
+
+MagmaHideout_4F_Text_23A994: @ 823A994
+	.string "Taken down again…\n"
+	.string "Hehe…$"
+
+MagmaHideout_4F_Text_23A9AC: @ 823A9AC
+	.string "…And while you wasted time with me,\n"
+	.string "MAXIE should have awakened GROUDON…$"
+
+MagmaHideout_4F_Text_23A9F4: @ 823A9F4
+	.string "MAXIE: GROUDON…\p"
+	.string "Nothing could awaken you from your\n"
+	.string "sleep bathed in magma…\p"
+	.string "This BLUE ORB is what you sought.\n"
+	.string "Wasn’t it?\p"
+	.string "I have brought you the BLUE ORB.\n"
+	.string "Let its shine awaken you!\p"
+	.string "And show me…\n"
+	.string "Show me the full extent of your power!$"
+
+MagmaHideout_4F_Text_23AADA: @ 823AADA
+	.string "MAXIE: GROUDON!\n"
+	.string "What’s wrong?\p"
+	.string "Wasn’t the BLUE ORB the key?\p"
+	.string "GROUDON!\n"
+	.string "Where have you gone…$"
+
+MagmaHideout_4F_Text_23AB33: @ 823AB33
+	.string "MAXIE: Oh, so it was you?\p"
+	.string "I’ve seen you poking around uninvited\n"
+	.string "here and there…\p"
+	.string "I get it now!\n"
+	.string "You must have pulled a cheap stunt!$"
+
+MagmaHideout_4F_Text_23ABB5: @ 823ABB5
+	.string "What makes you so adept at handling\n"
+	.string "POKéMON?$"
+
+MagmaHideout_4F_Text_23ABE2: @ 823ABE2
+	.string "MAXIE: There has to be some reason\n"
+	.string "why GROUDON fled…\p"
+	.string "That’s what you’re trying to say,\n"
+	.string "aren’t you?\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "Humph…\n"
+	.string "You think I didn’t know that?\p"
+	.string "With GROUDON gone, there is no longer\n"
+	.string "any need for this blasted volcano.\p"
+	.string "I am going after GROUDON, so this\n"
+	.string "is where we part!$"
+
diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc
new file mode 100644
index 000000000..8569e33ec
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_TEMP_1, 1, 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..36bff96d6 100644
--- a/data/maps/MarineCave_End/header.inc
+++ b/data/maps/MarineCave_End/header.inc
@@ -1,15 +1,15 @@
 MarineCave_End: @ 8484A04
-	.4byte MarineCave_End_MapAttributes
+	.4byte MarineCave_End_Layout
 	.4byte MarineCave_End_MapEvents
 	.4byte MarineCave_End_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 413
-	.byte 203
+	.byte MAPSEC_MARINE_CAVE
 	.byte 0
-	.byte 6
-	.byte 4
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 14
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
new file mode 100644
index 000000000..9c821e14f
--- /dev/null
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -0,0 +1,78 @@
+MarineCave_End_MapScripts:: @ 823AFDF
+	map_script 5, MarineCave_End_MapScript1_23AFEA
+	map_script 3, MarineCave_End_MapScript1_23B008
+	.byte 0
+
+MarineCave_End_MapScript1_23AFEA: @ 823AFEA
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, MarineCave_End_EventScript_23AFF4
+	end
+
+MarineCave_End_EventScript_23AFF4:: @ 823AFF4
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, MarineCave_End_EventScript_27374E
+	removeobject 1
+	return
+
+MarineCave_End_MapScript1_23B008: @ 823B008
+	checkflag FLAG_0x1BE
+	call_if 0, MarineCave_End_EventScript_23B012
+	end
+
+MarineCave_End_EventScript_23B012:: @ 823B012
+	clearflag FLAG_0x30E
+	setvar VAR_TEMP_1, 1
+	return
+
+MarineCave_End_EventScript_23B01B:: @ 823B01B
+	lockall
+	applymovement 255, MarineCave_End_Movement_2725B2
+	waitmovement 0
+	applymovement 1, MarineCave_End_Movement_23B09D
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KYOGRE, 2
+	delay 40
+	waitmoncry
+	setvar VAR_LAST_TALKED, 1
+	setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special BattleSetup_StartLegendaryBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	setvar VAR_TEMP_1, 0
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq MarineCave_End_EventScript_23B084
+	compare VAR_RESULT, 4
+	goto_eq MarineCave_End_EventScript_23B092
+	compare VAR_RESULT, 5
+	goto_eq MarineCave_End_EventScript_23B092
+	setvar VAR_0x4039, 1
+	setflag FLAG_0x1BE
+	releaseall
+	end
+
+MarineCave_End_EventScript_23B084:: @ 823B084
+	setvar VAR_0x4039, 1
+	setflag FLAG_0x1BE
+	goto MarineCave_End_EventScript_27376D
+	end
+
+MarineCave_End_EventScript_23B092:: @ 823B092
+	setvar VAR_0x8004, 404
+	goto MarineCave_End_EventScript_273776
+	end
+
+MarineCave_End_Movement_23B09D: @ 823B09D
+	init_affine_anim
+	walk_down_start_affine
+	delay_16
+	delay_16
+	walk_down_affine
+	delay_16
+	delay_16
+	walk_down_affine
+	step_end
+
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..9feb17fe2 100644
--- a/data/maps/MarineCave_Entrance/header.inc
+++ b/data/maps/MarineCave_Entrance/header.inc
@@ -1,15 +1,15 @@
 MarineCave_Entrance: @ 84849E8
-	.4byte MarineCave_Entrance_MapAttributes
+	.4byte MarineCave_Entrance_Layout
 	.4byte MarineCave_Entrance_MapEvents
 	.4byte MarineCave_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 407
-	.byte 203
+	.byte MAPSEC_MARINE_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 14
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5b2d9927c
--- /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, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0
+	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805
+	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, 1116
+	object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0
+	object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 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, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73
+	bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0
+	bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A
+	bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A
+	bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73
+	bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3D7
+	bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9
+	bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, 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..f6aadf1ff 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -1,15 +1,15 @@
 MauvilleCity: @ 84824F0
-	.4byte MauvilleCity_MapAttributes
+	.4byte MauvilleCity_Layout
 	.4byte MauvilleCity_MapEvents
 	.4byte MauvilleCity_MapScripts
 	.4byte MauvilleCity_MapConnections
 	.2byte MUS_GOTOWN
 	.2byte 3
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
new file mode 100644
index 000000000..abb527d7f
--- /dev/null
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -0,0 +1,677 @@
+MauvilleCity_MapScripts:: @ 81DF385
+	map_script 3, MauvilleCity_MapScript1_1DF38B
+	.byte 0
+
+MauvilleCity_MapScript1_1DF38B: @ 81DF38B
+	setflag FLAG_VISITED_MAUVILLE_CITY
+	clearflag FLAG_0x09D
+	clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
+	setflag FLAG_SYS_TV_START
+	clearflag FLAG_0x063
+	setvar VAR_0x4093, 0
+	checkflag FLAG_GOT_TM24_FROM_WATTSON
+	call_if 1, MauvilleCity_EventScript_1DF3A9
+	end
+
+MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
+	clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
+	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
+	setflag FLAG_WATTSON_REMATCH_AVAILABLE
+	return
+
+MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
+	msgbox MauvilleCity_Text_1E0301, 2
+	end
+
+MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC
+	msgbox MauvilleCity_Text_1E037C, 2
+	end
+
+MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5
+	msgbox MauvilleCity_Text_1E03FB, 2
+	end
+
+MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE
+	msgbox MauvilleCity_Text_1E044A, 2
+	end
+
+MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7
+	msgbox MauvilleCity_Text_1E0485, 3
+	end
+
+MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0
+	msgbox MauvilleCity_Text_1E04B7, 3
+	end
+
+MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9
+	msgbox MauvilleCity_Text_1E0504, 3
+	end
+
+MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2
+	msgbox MauvilleCity_Text_1E053C, 3
+	end
+
+MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB
+	lock
+	faceplayer
+	checkflag FLAG_0x062
+	goto_eq MauvilleCity_EventScript_1DF413
+	msgbox MauvilleCity_Text_1E056A, 4
+	setflag FLAG_0x062
+	release
+	end
+
+MauvilleCity_EventScript_1DF413:: @ 81DF413
+	msgbox MauvilleCity_Text_1E0699, 4
+	release
+	end
+
+MauvilleCity_EventScript_1DF41D:: @ 81DF41D
+	lock
+	faceplayer
+	checkflag FLAG_0x11C
+	goto_eq MauvilleCity_EventScript_1DF43D
+	msgbox MauvilleCity_Text_1DF7DC, 4
+	closemessage
+	applymovement 7, MauvilleCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MauvilleCity_EventScript_1DF43D:: @ 81DF43D
+	msgbox MauvilleCity_Text_1DFAA5, 4
+	closemessage
+	applymovement 7, MauvilleCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MauvilleCity_EventScript_1DF452:: @ 81DF452
+	lockall
+	checkflag FLAG_0x11C
+	goto_eq MauvilleCity_EventScript_1DF690
+	applymovement 6, MauvilleCity_Movement_2725A8
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DF845, 4
+	msgbox MauvilleCity_Text_1DF8B9, 4
+	msgbox MauvilleCity_Text_1DF963, 4
+	applymovement 6, MauvilleCity_Movement_27259E
+	waitmovement 0
+	playse SE_PIN
+	applymovement 6, MauvilleCity_Movement_272598
+	waitmovement 0
+	applymovement 6, MauvilleCity_Movement_27259A
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DF9B2, 5
+	goto MauvilleCity_EventScript_1DF4AD
+	end
+
+MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
+	compare VAR_RESULT, 1
+	call_if 1, MauvilleCity_EventScript_1DF63A
+	compare VAR_RESULT, 0
+	goto_eq MauvilleCity_EventScript_1DF683
+	closemessage
+	switch VAR_FACING
+	case 2, MauvilleCity_EventScript_1DF4E0
+	case 4, MauvilleCity_EventScript_1DF53D
+	end
+
+MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
+	applymovement 255, MauvilleCity_Movement_1DF6DF
+	applymovement 6, MauvilleCity_Movement_1DF6A8
+	applymovement 7, MauvilleCity_Movement_1DF6E2
+	waitmovement 0
+	applymovement 6, MauvilleCity_Movement_2725A8
+	waitmovement 0
+	delay 30
+	applymovement 255, MauvilleCity_Movement_1DF6EE
+	applymovement 7, MauvilleCity_Movement_1DF6F3
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DFD34, 4
+	closemessage
+	applymovement 255, MauvilleCity_Movement_1DF6CC
+	applymovement 7, MauvilleCity_Movement_1DF6FA
+	applymovement 6, MauvilleCity_Movement_1DF6B4
+	waitmovement 0
+	goto MauvilleCity_EventScript_1DF593
+	end
+
+MauvilleCity_EventScript_1DF53D:: @ 81DF53D
+	applymovement 255, MauvilleCity_Movement_1DF6DC
+	applymovement 6, MauvilleCity_Movement_1DF6AE
+	applymovement 7, MauvilleCity_Movement_1DF6E8
+	waitmovement 0
+	applymovement 6, MauvilleCity_Movement_2725A8
+	waitmovement 0
+	delay 30
+	applymovement 7, MauvilleCity_Movement_1DF6F7
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DFD34, 4
+	closemessage
+	applymovement 255, MauvilleCity_Movement_1DF6D0
+	applymovement 7, MauvilleCity_Movement_1DF703
+	applymovement 6, MauvilleCity_Movement_1DF6C0
+	waitmovement 0
+	goto MauvilleCity_EventScript_1DF593
+	end
+
+MauvilleCity_EventScript_1DF593:: @ 81DF593
+	removeobject 6
+	removeobject 7
+	clearflag FLAG_0x326
+	clearflag FLAG_0x329
+	setflag FLAG_0x0BE
+	setvar VAR_0x40F2, 0
+	setflag FLAG_0x088
+	compare VAR_FACING, 2
+	call_if 1, MauvilleCity_EventScript_1DF5F3
+	compare VAR_FACING, 4
+	call_if 1, MauvilleCity_EventScript_1DF601
+	applymovement 255, MauvilleCity_Movement_2725AA
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DFED5, 4
+	closemessage
+	addvar VAR_0x40D1, 1
+	compare VAR_FACING, 2
+	call_if 1, MauvilleCity_EventScript_1DF616
+	compare VAR_FACING, 4
+	call_if 1, MauvilleCity_EventScript_1DF628
+	removeobject 11
+	releaseall
+	end
+
+MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3
+	addobject 11
+	applymovement 11, MauvilleCity_Movement_1DF70D
+	waitmovement 0
+	return
+
+MauvilleCity_EventScript_1DF601:: @ 81DF601
+	setobjectxyperm 11, 12, 13
+	addobject 11
+	applymovement 11, MauvilleCity_Movement_1DF719
+	waitmovement 0
+	return
+
+MauvilleCity_EventScript_1DF616:: @ 81DF616
+	applymovement 255, MauvilleCity_Movement_1DF6D5
+	applymovement 11, MauvilleCity_Movement_1DF725
+	waitmovement 0
+	return
+
+MauvilleCity_EventScript_1DF628:: @ 81DF628
+	applymovement 255, MauvilleCity_Movement_1DF6D8
+	applymovement 11, MauvilleCity_Movement_1DF72F
+	waitmovement 0
+	return
+
+MauvilleCity_EventScript_1DF63A:: @ 81DF63A
+	msgbox MauvilleCity_Text_1DFB6D, 4
+	trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96
+	applymovement 6, MauvilleCity_Movement_2725A8
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DFBC3, 4
+	applymovement 6, MauvilleCity_Movement_27259E
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DFBED, 4
+	applymovement 6, MauvilleCity_Movement_2725A8
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DFC8A, 4
+	return
+
+MauvilleCity_EventScript_1DF683:: @ 81DF683
+	setflag FLAG_0x11C
+	msgbox MauvilleCity_Text_1DFA4A, 4
+	release
+	end
+
+MauvilleCity_EventScript_1DF690:: @ 81DF690
+	applymovement 6, MauvilleCity_Movement_27259E
+	waitmovement 0
+	msgbox MauvilleCity_Text_1DFB42, 5
+	goto MauvilleCity_EventScript_1DF4AD
+	end
+
+MauvilleCity_Movement_1DF6A8: @ 81DF6A8
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	step_end
+
+MauvilleCity_Movement_1DF6AE: @ 81DF6AE
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+MauvilleCity_Movement_1DF6B4: @ 81DF6B4
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	delay_8
+	step_end
+
+MauvilleCity_Movement_1DF6C0: @ 81DF6C0
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	delay_8
+	step_end
+
+MauvilleCity_Movement_1DF6CC: @ 81DF6CC
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	step_end
+
+MauvilleCity_Movement_1DF6D0: @ 81DF6D0
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+MauvilleCity_Movement_1DF6D5: @ 81DF6D5
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+MauvilleCity_Movement_1DF6D8: @ 81DF6D8
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+MauvilleCity_Movement_1DF6DC: @ 81DF6DC
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+MauvilleCity_Movement_1DF6DF: @ 81DF6DF
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+MauvilleCity_Movement_1DF6E2: @ 81DF6E2
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	step_end
+
+MauvilleCity_Movement_1DF6E8: @ 81DF6E8
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	step_end
+
+MauvilleCity_Movement_1DF6EE: @ 81DF6EE
+	delay_16
+	delay_8
+	delay_4
+	walk_in_place_fastest_down
+	step_end
+
+MauvilleCity_Movement_1DF6F3: @ 81DF6F3
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+MauvilleCity_Movement_1DF6F7: @ 81DF6F7
+	walk_right
+	walk_up
+	step_end
+
+MauvilleCity_Movement_1DF6FA: @ 81DF6FA
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+MauvilleCity_Movement_1DF703: @ 81DF703
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+MauvilleCity_Movement_1DF70D: @ 81DF70D
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	step_end
+
+MauvilleCity_Movement_1DF719: @ 81DF719
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+MauvilleCity_Movement_1DF725: @ 81DF725
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+MauvilleCity_Movement_1DF72F: @ 81DF72F
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+MauvilleCity_EventScript_1DF73A:: @ 81DF73A
+	lock
+	faceplayer
+	checkflag FLAG_GOT_TM24_FROM_WATTSON
+	goto_eq MauvilleCity_EventScript_1DF7B0
+	compare VAR_0x40BA, 2
+	goto_eq MauvilleCity_EventScript_1DF784
+	checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
+	goto_eq MauvilleCity_EventScript_1DF77A
+	msgbox MauvilleCity_Text_1DFFE4, 4
+	giveitem_std ITEM_BASEMENT_KEY
+	setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
+	msgbox MauvilleCity_Text_1E0154, 4
+	release
+	end
+
+MauvilleCity_EventScript_1DF77A:: @ 81DF77A
+	msgbox MauvilleCity_Text_1E0154, 4
+	release
+	end
+
+MauvilleCity_EventScript_1DF784:: @ 81DF784
+	msgbox MauvilleCity_Text_1E020E, 4
+	giveitem_std ITEM_TM24
+	compare VAR_RESULT, 0
+	goto_eq MauvilleCity_EventScript_272054
+	setflag FLAG_GOT_TM24_FROM_WATTSON
+	msgbox MauvilleCity_Text_1E02AA, 4
+	release
+	end
+
+MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0
+	msgbox MauvilleCity_Text_1E02AA, 4
+	release
+	end
+
+MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
+	lockall
+	pokenavcall MauvilleCity_Text_1DFDFB
+	waitmessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox MauvilleCity_Text_1DFEB4, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x0D6
+	clearflag FLAG_0x088
+	releaseall
+	end
+
+MauvilleCity_Text_1DF7DC: @ 81DF7DC
+	.string "UNCLE: It’s because of POKéMON that\n"
+	.string "this boy’s got more pep, I suppose…\l"
+	.string "But he’s become a bit too peppy…$"
+
+MauvilleCity_Text_1DF845: @ 81DF845
+	.string "WALLY: Aww, UNCLE, please?\p"
+	.string "I want to challenge this GYM and see\n"
+	.string "how much better I’ve become.\p"
+	.string "Please? May I, please?$"
+
+MauvilleCity_Text_1DF8B9: @ 81DF8B9
+	.string "UNCLE: Now hold on, WALLY.\p"
+	.string "Since you started living with POKéMON,\n"
+	.string "you have grown quite a lot stronger.\p"
+	.string "But don’t you think you’re pushing it\n"
+	.string "to suddenly challenge a GYM?$"
+
+MauvilleCity_Text_1DF963: @ 81DF963
+	.string "WALLY: I’m not pushing it.\p"
+	.string "If I combine forces with RALTS,\n"
+	.string "we can beat anyone!$"
+
+MauvilleCity_Text_1DF9B2: @ 81DF9B2
+	.string "WALLY: Oh! Hi, {PLAYER}!\p"
+	.string "I’ve gotten a lot stronger since\n"
+	.string "we met.\p"
+	.string "{PLAYER}, I want you and my UNCLE to\n"
+	.string "understand that.\p"
+	.string "{PLAYER}, please, will you have\n"
+	.string "a battle with me?$"
+
+MauvilleCity_Text_1DFA4A: @ 81DFA4A
+	.string "WALLY: Oh… If you won’t battle me,\n"
+	.string "{PLAYER}, my UNCLE won’t know that I’ve\l"
+	.string "become really strong.$"
+
+MauvilleCity_Text_1DFAA5: @ 81DFAA5
+	.string "UNCLE: {PLAYER}{KUN}, was it?\n"
+	.string "On WALLY’s behalf, can I ask you to\l"
+	.string "battle with him just this once?\p"
+	.string "I don’t think he’s going to listen to\n"
+	.string "any reason the way he is now.$"
+
+MauvilleCity_Text_1DFB42: @ 81DFB42
+	.string "WALLY: {PLAYER}, please!\n"
+	.string "Battle with me, please.$"
+
+MauvilleCity_Text_1DFB6D: @ 81DFB6D
+	.string "WALLY: {PLAYER}, thank you.\p"
+	.string "Okay… Here I come!$"
+
+MauvilleCity_Text_1DFB96: @ 81DFB96
+	.string "WALLY: … … … … … … …\p"
+	.string "… … … … … … … …\p"
+	.string "I lost…$"
+
+MauvilleCity_Text_1DFBC3: @ 81DFBC3
+	.string "WALLY: UNCLE…\n"
+	.string "I’ll go back to VERDANTURF…$"
+
+MauvilleCity_Text_1DFBED: @ 81DFBED
+	.string "{PLAYER}, thank you.\n"
+	.string "Being a TRAINER is tough, isn’t it?\p"
+	.string "It’s not enough just to have POKéMON\n"
+	.string "and make them battle. That isn’t what\l"
+	.string "being a real TRAINER is about.$"
+
+MauvilleCity_Text_1DFC8A: @ 81DFC8A
+	.string "UNCLE: WALLY, there’s no need to be so\n"
+	.string "down on yourself.\p"
+	.string "Why, what’s keeping you from becoming\n"
+	.string "stronger and stronger?\p"
+	.string "Come on, let’s go home.\n"
+	.string "Everyone’s waiting for you.$"
+
+MauvilleCity_Text_1DFD34: @ 81DFD34
+	.string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n"
+	.string "that you must be the TRAINER who kept\l"
+	.string "an eye out for WALLY when he caught\l"
+	.string "his POKéMON.\p"
+	.string "Why don’t you visit us in VERDANTURF\n"
+	.string "sometime?\l"
+	.string "I’m sure WALLY would enjoy it.$"
+
+
+MauvilleCity_Text_1DFDFB: @ 81DFDFB
+	.string "… … … … … …\n"
+	.string "… … … … … Beep!\p"
+	.string "WALLY: Oh, hello, {PLAYER}!\p"
+	.string "I just wanted to tell you that\n"
+	.string "my uncle bought me a POKéNAV!\p"
+	.string "Now I can get in touch with you\n"
+	.string "anytime, {PLAYER}!\p"
+	.string "… … … … … …\n"
+	.string "… … … … … Click!$"
+
+MauvilleCity_Text_1DFEB4: @ 81DFEB4
+	.string "Registered WALLY\n"
+	.string "in the POKéNAV.$"
+
+MauvilleCity_Text_1DFED5: @ 81DFED5
+	.string "SCOTT: Hehe…\n"
+	.string "I was watching that match!\p"
+	.string "You’re friends with that boy WALLY,\n"
+	.string "aren’t you?\p"
+	.string "But you didn’t hold anything back\n"
+	.string "and beat him impressively.\p"
+	.string "Yeah! That’s what a real POKéMON\n"
+	.string "battle is all about!\p"
+	.string "I idolize TRAINERS like that!\p"
+	.string "… … … … … …\n"
+	.string "I’ll be cheering for you!$"
+
+MauvilleCity_Text_1DFFE4: @ 81DFFE4
+	.string "WATTSON: Oh, {PLAYER}{KUN}!\n"
+	.string "You look like you have a lot of zip!\l"
+	.string "That’s a good thing, wahahahaha!\p"
+	.string "Fine! I’ve decided!\n"
+	.string "I need a favor, {PLAYER}{KUN}!\p"
+	.string "MAUVILLE CITY has an underground\n"
+	.string "sector called NEW MAUVILLE.\p"
+	.string "{PLAYER}{KUN}, I’d like you to go there and\n"
+	.string "switch off the GENERATOR.\p"
+	.string "The GENERATOR has been running a bit\n"
+	.string "haywire. It’s getting unsafe.\p"
+	.string "Here, this is the KEY to get into\n"
+	.string "NEW MAUVILLE.$"
+
+MauvilleCity_Text_1E0154: @ 81E0154
+	.string "WATTSON: Don’t you worry about it.\n"
+	.string "It won’t be a challenge to you.\p"
+	.string "The entrance to NEW MAUVILLE is just\n"
+	.string "a short SURF away from ROUTE 110.\p"
+	.string "That’s it, then, you have my trust!\n"
+	.string "Wahahahaha!$"
+
+MauvilleCity_Text_1E020E: @ 81E020E
+	.string "WATTSON: Wahahahaha!\p"
+	.string "I knew it, {PLAYER}{KUN}! I knew I’d made\n"
+	.string "the right choice asking you!\p"
+	.string "This is my thanks--a TM containing\n"
+	.string "THUNDERBOLT!\p"
+	.string "Go on, you’ve earned it!$"
+
+MauvilleCity_Text_1E02AA: @ 81E02AA
+	.string "WATTSON: Wahahahaha!\p"
+	.string "It pleases me to no end to see\n"
+	.string "the young step up and take charge!$"
+
+MauvilleCity_Text_1E0301: @ 81E0301
+	.string "You know, it’s cool to have POKéMON\n"
+	.string "battles and stuff…\p"
+	.string "But if your POKéMON gets hurt,\n"
+	.string "you have to nurse it back to health.$"
+
+MauvilleCity_Text_1E037C: @ 81E037C
+	.string "The roads of this town stretch north\n"
+	.string "and south, and east and west.\p"
+	.string "Because of that, we get all sorts of\n"
+	.string "people coming through.$"
+
+MauvilleCity_Text_1E03FB: @ 81E03FB
+	.string "Have you been to RYDEL’S CYCLES yet?\p"
+	.string "RYDEL, the owner, is a very generous\n"
+	.string "man.$"
+
+MauvilleCity_Text_1E044A: @ 81E044A
+	.string "Even if you’re riding a BIKE,\n"
+	.string "wild POKéMON could jump you.$"
+
+MauvilleCity_Text_1E0485: @ 81E0485
+	.string "MAUVILLE CITY\n"
+	.string "“The bright and shiny city of fun!”$"
+
+MauvilleCity_Text_1E04B7: @ 81E04B7
+	.string "MAUVILLE CITY POKéMON GYM\n"
+	.string "LEADER: WATTSON\l"
+	.string "“The cheerfully electrifying man!”$"
+
+MauvilleCity_Text_1E0504: @ 81E0504
+	.string "“Ride in gravel and shake up your\n"
+	.string "soul!”\l"
+	.string "RYDEL’S CYCLES$"
+
+MauvilleCity_Text_1E053C: @ 81E053C
+	.string "“The play spot for all!”\n"
+	.string "MAUVILLE GAME CORNER$"
+
+MauvilleCity_Text_1E056A: @ 81E056A
+	.string "Hi, do you check out TV at all?\p"
+	.string "They’ve added a bunch of cool new\n"
+	.string "shows recently.\p"
+	.string "TV is so cool. I’ve seen my friends on\n"
+	.string "TV just out of the blue.\p"
+	.string "And, sometimes, they even put you on TV\n"
+	.string "without telling you.\p"
+	.string "I wish I would be on TV sometime.\p"
+	.string "That’s why I think you should check\n"
+	.string "out TVs whenever you can.$"
+
+MauvilleCity_Text_1E0699: @ 81E0699
+	.string "Hi, have you been checking out TVs?$"
diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc
new file mode 100644
index 000000000..7befd0f73
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A
+	bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..baa4f18d5 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -1,15 +1,15 @@
 MauvilleCity_BikeShop: @ 8483280
-	.4byte MauvilleCity_BikeShop_MapAttributes
+	.4byte MauvilleCity_BikeShop_Layout
 	.4byte MauvilleCity_BikeShop_MapEvents
 	.4byte MauvilleCity_BikeShop_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 90
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..79b436489
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0
+	object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0
+	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0
+	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0
+	object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 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, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6
+	bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6
+	bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316
+	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210336
+	bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210356
+	bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210376
+	bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210396
+	bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103B6
+	bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103D6
+	bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_2103F6
+	bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210416
+	bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210436
+	bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1
+	bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF
+	bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, 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..45fd23da0 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -1,15 +1,15 @@
 MauvilleCity_GameCorner: @ 84832B8
-	.4byte MauvilleCity_GameCorner_MapAttributes
+	.4byte MauvilleCity_GameCorner_Layout
 	.4byte MauvilleCity_GameCorner_MapEvents
 	.4byte MauvilleCity_GameCorner_MapScripts
 	.4byte 0x0
 	.2byte MUS_CASINO
 	.2byte 91
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..cb126faef
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 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, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E
+	coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043
+	coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9
+	coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068
+
+MauvilleCity_Gym_MapBGEvents: @ 852FE54
+	bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B
+	bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..736b491db 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -1,15 +1,15 @@
 MauvilleCity_Gym: @ 8483264
-	.4byte MauvilleCity_Gym_MapAttributes
+	.4byte MauvilleCity_Gym_Layout
 	.4byte MauvilleCity_Gym_MapEvents
 	.4byte MauvilleCity_Gym_MapScripts
 	.4byte 0x0
 	.2byte MUS_GIM
 	.2byte 89
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..1d759b438
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 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..6a29041cc 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -1,15 +1,15 @@
 MauvilleCity_House1: @ 848329C
-	.4byte MauvilleCity_House1_MapAttributes
+	.4byte House2_Layout
 	.4byte MauvilleCity_House1_MapEvents
 	.4byte MauvilleCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 60
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3ac497bbc
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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..3fc04798e 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -1,15 +1,15 @@
 MauvilleCity_House2: @ 84832D4
-	.4byte MauvilleCity_House2_MapAttributes
+	.4byte House1_Layout
 	.4byte MauvilleCity_House2_MapEvents
 	.4byte MauvilleCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 59
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5e96dcfd3
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..3722f4565 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -1,15 +1,15 @@
 MauvilleCity_Mart: @ 8483328
-	.4byte MauvilleCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte MauvilleCity_Mart_MapEvents
 	.4byte MauvilleCity_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4000ead3e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..659176f80 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..fb76a5fc7
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,54 @@
+MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
+	map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66
+	map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30
+	.byte 0
+
+MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
+	setrespawn 5
+	call MauvilleCity_PokemonCenter_1F_EventScript_2718DE
+	goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
+	end
+
+MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
+	special ScrSpecial_SetMauvilleOldManEventObjGfx
+	end
+
+MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
+	setvar VAR_0x800B, 1
+	call MauvilleCity_PokemonCenter_1F_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86
+	msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, 2
+	end
+
+MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F
+	msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, 2
+	end
+
+MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98
+	msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, 2
+	end
+
+MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1
+	.string "That man over there, he says weird\n"
+	.string "things!\p"
+	.string "He’s funny in a weird way.\n"
+	.string "I doubt I’ll forget about him!$"
+
+MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06
+	.string "When I accessed the RECORD CORNER,\n"
+	.string "the data for what’s hot in DEWFORD\l"
+	.string "got updated.\p"
+	.string "Now that bit of data is the same\n"
+	.string "as my friend’s!$"
+
+MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A
+	.string "A RECORD CORNER opened upstairs in\n"
+	.string "the POKéMON CENTER.\p"
+	.string "I don’t know what it’s about, but it\n"
+	.string "sounds fun. I’ll go check it out!$"
+
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..d445b3cca
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 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..462fdc47d 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 9
+	.byte MAPSEC_MAUVILLE_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..068f9a356
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 939
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 939
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 938
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 938
+	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 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, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F
+
+MeteorFalls_1F_1R_MapBGEvents: @ 85340A4
+	bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 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..abf0e85c5 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN03
 	.2byte 125
-	.byte 63
+	.byte MAPSEC_METEOR_FALLS
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
new file mode 100644
index 000000000..b786dc961
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -0,0 +1,312 @@
+MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
+	map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30
+	.byte 0
+
+MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A
+	end
+
+MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
+	setmetatile 4, 1, 582, 1
+	setmetatile 3, 2, 589, 1
+	setmetatile 4, 2, 590, 0
+	setmetatile 5, 2, 591, 1
+	return
+
+MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
+	lockall
+	playbgm MUS_MGM0, 0
+	applymovement 255, MeteorFalls_1F_1R_Movement_2725B0
+	waitmovement 0
+	delay 30
+	applymovement 5, MeteorFalls_1F_1R_Movement_2725B4
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22BF47, 4
+	closemessage
+	applymovement 5, MeteorFalls_1F_1R_Movement_2725A6
+	applymovement 6, MeteorFalls_1F_1R_Movement_2725A6
+	waitmovement 0
+	playse SE_PIN
+	applymovement 5, MeteorFalls_1F_1R_Movement_272598
+	waitmovement 0
+	applymovement 5, MeteorFalls_1F_1R_Movement_27259A
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22BF84, 4
+	closemessage
+	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22BFE4, 4
+	closemessage
+	applymovement 255, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
+	waitmovement 0
+	addobject 7
+	addobject 8
+	addobject 9
+	playbgm MUS_AQA_0, 0
+	applymovement 7, MeteorFalls_1F_1R_Movement_22BED9
+	applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0
+	applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8
+	waitmovement 0
+	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
+	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22C04E, 4
+	closemessage
+	applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D
+	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4
+	applymovement 6, MeteorFalls_1F_1R_Movement_22BECE
+	waitmovement 0
+	removeobject 5
+	removeobject 6
+	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22C11C, 4
+	closemessage
+	applymovement 8, MeteorFalls_1F_1R_Movement_22BF08
+	applymovement 9, MeteorFalls_1F_1R_Movement_22BF18
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22C268, 4
+	applymovement 7, MeteorFalls_1F_1R_Movement_2725AA
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22C292, 4
+	applymovement 7, MeteorFalls_1F_1R_Movement_2725A4
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_22C2FC, 4
+	closemessage
+	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0
+	applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE
+	applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 7
+	removeobject 8
+	removeobject 9
+	setflag FLAG_0x333
+	setflag FLAG_0x0CF
+	setflag FLAG_0x2FF
+	setvar VAR_0x40BF, 1
+	releaseall
+	end
+
+MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
+	walk_in_place_fastest_down
+	delay_4
+	walk_in_place_fastest_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	face_right
+	step_end
+
+MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25
+	lock
+	faceplayer
+	checkflag FLAG_0x0F4
+	goto_eq MeteorFalls_1F_1R_EventScript_22BF3D
+	setflag FLAG_0x0F4
+	msgbox MeteorFalls_1F_1R_Text_22C342, 4
+	release
+	end
+
+MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D
+	msgbox MeteorFalls_1F_1R_Text_22C47D, 4
+	release
+	end
+
+MeteorFalls_1F_1R_Text_22BF47: @ 822BF47
+	.string "Hehehe!\p"
+	.string "With this METEORITE, that thing in\n"
+	.string "MT. CHIMNEY will…$"
+
+MeteorFalls_1F_1R_Text_22BF84: @ 822BF84
+	.string "Heh?\p"
+	.string "I don’t know who you are, but if you get\n"
+	.string "in the way of TEAM MAGMA, don’t\l"
+	.string "expect any mercy!$"
+
+MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4
+	.string "Hold it right there, TEAM MAGMA!\p"
+	.string "You’re badly mistaken if you think you\n"
+	.string "can have your way with the world!$"
+
+MeteorFalls_1F_1R_Text_22C04E: @ 822C04E
+	.string "Hehehe!\n"
+	.string "Even TEAM AQUA joins us!\p"
+	.string "But it’s too much trouble to deal with\n"
+	.string "you all…\p"
+	.string "Heh, it doesn’t matter!\p"
+	.string "We’ve got the METEORITE, so off to\n"
+	.string "MT. CHIMNEY we go!\p"
+	.string "Hehehe! Be seeing you, you TEAM\n"
+	.string "AQUA dingbats!$"
+
+MeteorFalls_1F_1R_Text_22C11C: @ 822C11C
+	.string "ARCHIE: Didn’t I see you before?\n"
+	.string "At SLATEPORT’s MUSEUM?\p"
+	.string "Ah, so your name is {PLAYER}.\p"
+	.string "At the time, I thought you were one\n"
+	.string "of TEAM MAGMA’s goons.\p"
+	.string "Humph…\n"
+	.string "You’re one odd kid.\p"
+	.string "TEAM MAGMA is a dangerous group of\n"
+	.string "total fanatics.\p"
+	.string "They engage in destruction, claiming\n"
+	.string "to expand the land mass.\p"
+	.string "They are the rivals to us,\n"
+	.string "the sea-loving TEAM AQUA!$"
+
+MeteorFalls_1F_1R_Text_22C268: @ 822C268
+	.string "BOSS, we should give chase to\n"
+	.string "TEAM MAGMA…$"
+
+MeteorFalls_1F_1R_Text_22C292: @ 822C292
+	.string "ARCHIE: Yes, yes, we must!\n"
+	.string "We’ve got to hurry.\p"
+	.string "There’s no telling what TEAM MAGMA\n"
+	.string "will do at MT. CHIMNEY!$"
+
+MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC
+	.string "ARCHIE: {PLAYER}, you should keep\n"
+	.string "an eye out for TEAM MAGMA, too.\p"
+	.string "Farewell!$"
+
+MeteorFalls_1F_1R_Text_22C342: @ 822C342
+	.string "I… I’m COZMO…\n"
+	.string "I’m a PROFESSOR…\p"
+	.string "TEAM MAGMA asked me to guide them\n"
+	.string "to METEOR FALLS…\p"
+	.string "But they tricked me.\n"
+	.string "They even took my METEORITE away…\p"
+	.string "And then another similar bunch,\n"
+	.string "TEAM AQUA showed up.\p"
+	.string "After that…\n"
+	.string "I don’t understand any of it.\p"
+	.string "But that TEAM MAGMA…\p"
+	.string "What are they going to do with that\n"
+	.string "METEORITE at MT. CHIMNEY?$"
+
+MeteorFalls_1F_1R_Text_22C47D: @ 822C47D
+	.string "PROF. COZMO: But that TEAM MAGMA…\p"
+	.string "What are they going to do with that\n"
+	.string "METEORITE at MT. CHIMNEY?$"
+
diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc
new file mode 100644
index 000000000..1e8e1f093
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, 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..a0d074121 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN03
 	.2byte 126
-	.byte 63
+	.byte MAPSEC_METEOR_FALLS
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..078998891 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN03
 	.2byte 127
-	.byte 63
+	.byte MAPSEC_METEOR_FALLS
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..85dafb869
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..dabf884b4 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_DAN03
 	.2byte 128
-	.byte 63
+	.byte MAPSEC_METEOR_FALLS
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..09225365d
--- /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, MOVEMENT_TYPE_FACE_UP, 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..7236159f3 100644
--- a/data/maps/MeteorFalls_StevensCave/header.inc
+++ b/data/maps/MeteorFalls_StevensCave/header.inc
@@ -1,15 +1,15 @@
 MeteorFalls_StevensCave: @ 8484A74
-	.4byte MeteorFalls_StevensCave_MapAttributes
+	.4byte MeteorFalls_StevensCave_Layout
 	.4byte MeteorFalls_StevensCave_MapEvents
 	.4byte MeteorFalls_StevensCave_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN03
 	.2byte 431
-	.byte 63
+	.byte MAPSEC_METEOR_FALLS
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..584ed3f7f 100644
--- a/data/maps/MirageTower_1F/header.inc
+++ b/data/maps/MirageTower_1F/header.inc
@@ -1,15 +1,15 @@
 MirageTower_1F: @ 8484908
-	.4byte MirageTower_1F_MapAttributes
+	.4byte MirageTower_1F_Layout
 	.4byte MirageTower_1F_MapEvents
 	.4byte MirageTower_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 381
-	.byte 199
+	.byte MAPSEC_MIRAGE_TOWER
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..03f762758 100644
--- a/data/maps/MirageTower_2F/header.inc
+++ b/data/maps/MirageTower_2F/header.inc
@@ -1,15 +1,15 @@
 MirageTower_2F: @ 8484924
-	.4byte MirageTower_2F_MapAttributes
+	.4byte MirageTower_2F_Layout
 	.4byte MirageTower_2F_MapEvents
 	.4byte MirageTower_2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 382
-	.byte 199
+	.byte MAPSEC_MIRAGE_TOWER
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d62e54f92
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, 17
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..3930ca2ba 100644
--- a/data/maps/MirageTower_3F/header.inc
+++ b/data/maps/MirageTower_3F/header.inc
@@ -1,15 +1,15 @@
 MirageTower_3F: @ 8484940
-	.4byte MirageTower_3F_MapAttributes
+	.4byte MirageTower_3F_Layout
 	.4byte MirageTower_3F_MapEvents
 	.4byte MirageTower_3F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 383
-	.byte 199
+	.byte MAPSEC_MIRAGE_TOWER
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b9574637a
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, 963
+	object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, 964
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..505e671eb 100644
--- a/data/maps/MirageTower_4F/header.inc
+++ b/data/maps/MirageTower_4F/header.inc
@@ -1,15 +1,15 @@
 MirageTower_4F: @ 848495C
-	.4byte MirageTower_4F_MapAttributes
+	.4byte MirageTower_4F_Layout
 	.4byte MirageTower_4F_MapEvents
 	.4byte MirageTower_4F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 388
-	.byte 199
+	.byte MAPSEC_MIRAGE_TOWER
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0413b1be4
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043
+	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823
+	object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823
+	object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 823
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 823
+	object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 823
+	object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0
+	object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788
+	object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 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, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38
+	coord_event 42, 21, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 22, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 23, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 41, 24, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+	coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41
+
+MossdeepCity_MapBGEvents: @ 85272A0
+	bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26
+	bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D
+	bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73
+	bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A
+	bg_event 66, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B2F
+	bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73
+	bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A
+	bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, 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..f5196d035 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity: @ 8482560
-	.4byte MossdeepCity_MapAttributes
+	.4byte MossdeepCity_Layout
 	.4byte MossdeepCity_MapEvents
 	.4byte MossdeepCity_MapScripts
 	.4byte MossdeepCity_MapConnections
 	.2byte MUS_GOTOWN
 	.2byte 7
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
new file mode 100644
index 000000000..8cce8efeb
--- /dev/null
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -0,0 +1,436 @@
+MossdeepCity_MapScripts:: @ 81E4A96
+	map_script 3, MossdeepCity_MapScript1_1E4A9C
+	.byte 0
+
+MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
+	clearflag FLAG_0x064
+	clearflag FLAG_0x065
+	clearflag FLAG_0x066
+	clearflag FLAG_0x067
+	checkflag FLAG_SYS_WEATHER_CTRL
+	call_if 1, MossdeepCity_EventScript_27207A
+	end
+
+MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
+	lock
+	faceplayer
+	checkflag FLAG_0x07B
+	goto_eq MossdeepCity_EventScript_1E4AC7
+	msgbox MossdeepCity_Text_1E4E90, 4
+	release
+	end
+
+MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7
+	msgbox MossdeepCity_Text_1E4F15, 4
+	release
+	end
+
+MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1
+	lock
+	faceplayer
+	checkflag FLAG_0x07B
+	goto_eq MossdeepCity_EventScript_1E4AE6
+	msgbox MossdeepCity_Text_1E4F50, 4
+	release
+	end
+
+MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6
+	msgbox MossdeepCity_Text_1E5051, 4
+	release
+	end
+
+MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0
+	msgbox MossdeepCity_Text_1E4E22, 2
+	end
+
+MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9
+	msgbox MossdeepCity_Text_1E5135, 2
+	end
+
+MossdeepCity_EventScript_1E4B02:: @ 81E4B02
+	msgbox MossdeepCity_Text_1E50D9, 2
+	end
+
+MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B
+	msgbox MossdeepCity_Text_1E529D, 2
+	end
+
+MossdeepCity_EventScript_1E4B14:: @ 81E4B14
+	msgbox MossdeepCity_Text_1E5396, 3
+	end
+
+MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D
+	msgbox MossdeepCity_Text_1E53A9, 3
+	end
+
+MossdeepCity_EventScript_1E4B26:: @ 81E4B26
+	msgbox MossdeepCity_Text_1E53F2, 3
+	end
+
+MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F
+	msgbox MossdeepCity_Text_1E541F, 3
+	end
+
+MossdeepCity_EventScript_1E4B38:: @ 81E4B38
+	setflag FLAG_VISITED_MOSSDEEP_CITY
+	setvar VAR_TEMP_1, 1
+	end
+
+MossdeepCity_EventScript_1E4B41:: @ 81E4B41
+	lockall
+	applymovement 14, MossdeepCity_Movement_1E4BAD
+	waitmovement 0
+	applymovement 10, MossdeepCity_Movement_1E4BB7
+	applymovement 11, MossdeepCity_Movement_1E4BB7
+	applymovement 12, MossdeepCity_Movement_1E4BB7
+	applymovement 13, MossdeepCity_Movement_1E4BB7
+	waitmovement 0
+	applymovement 14, MossdeepCity_Movement_1E4BBC
+	applymovement 10, MossdeepCity_Movement_1E4BCA
+	applymovement 11, MossdeepCity_Movement_1E4BDD
+	applymovement 12, MossdeepCity_Movement_1E4BEF
+	applymovement 13, MossdeepCity_Movement_1E4C00
+	waitmovement 0
+	removeobject 14
+	removeobject 10
+	removeobject 11
+	removeobject 12
+	removeobject 13
+	delay 30
+	setvar VAR_0x405D, 2
+	setflag FLAG_0x337
+	releaseall
+	end
+
+MossdeepCity_Movement_1E4BAD: @ 81E4BAD
+	delay_16
+	face_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_left
+	delay_16
+	delay_16
+	step_end
+
+MossdeepCity_Movement_1E4BB7: @ 81E4BB7
+	face_right
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+MossdeepCity_Movement_1E4BBC: @ 81E4BBC
+	walk_down
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MossdeepCity_Movement_1E4BCA: @ 81E4BCA
+	delay_16
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MossdeepCity_Movement_1E4BDD: @ 81E4BDD
+	delay_16
+	delay_8
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MossdeepCity_Movement_1E4BEF: @ 81E4BEF
+	delay_16
+	delay_8
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MossdeepCity_Movement_1E4C00: @ 81E4C00
+	delay_16
+	delay_8
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+MossdeepCity_EventScript_1E4C10:: @ 81E4C10
+	lock
+	faceplayer
+	msgbox MossdeepCity_Text_1E5213, 4
+	applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_EventScript_1E4C26:: @ 81E4C26
+	lock
+	faceplayer
+	checkflag FLAG_0x114
+	goto_eq MossdeepCity_EventScript_1E4C68
+	msgbox MossdeepCity_Text_1E4CED, 5
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_EventScript_1E4C72
+	msgbox MossdeepCity_Text_1E4D5B, 4
+	giveitem_std ITEM_KINGS_ROCK
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_EventScript_272054
+	setflag FLAG_0x114
+	release
+	end
+
+MossdeepCity_EventScript_1E4C68:: @ 81E4C68
+	msgbox MossdeepCity_Text_1E4DB3, 4
+	release
+	end
+
+MossdeepCity_EventScript_1E4C72:: @ 81E4C72
+	msgbox MossdeepCity_Text_1E4DD7, 4
+	release
+	end
+
+MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C
+	msgbox MossdeepCity_Text_1E5581, 2
+	end
+
+MossdeepCity_EventScript_1E4C85:: @ 81E4C85
+	lock
+	faceplayer
+	msgbox MossdeepCity_Text_1E5453, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, MossdeepCity_EventScript_1E4CB0
+	compare VAR_FACING, 4
+	call_if 1, MossdeepCity_EventScript_1E4CC2
+	addvar VAR_0x40D1, 1
+	removeobject 16
+	release
+	end
+
+MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0
+	applymovement 255, MossdeepCity_Movement_1E4CD4
+	applymovement 16, MossdeepCity_Movement_1E4CD8
+	waitmovement 0
+	return
+
+MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2
+	applymovement 255, MossdeepCity_Movement_1E4CD4
+	applymovement 16, MossdeepCity_Movement_1E4CE2
+	waitmovement 0
+	return
+
+MossdeepCity_Movement_1E4CD4: @ 81E4CD4
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+MossdeepCity_Movement_1E4CD8: @ 81E4CD8
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+MossdeepCity_Movement_1E4CE2: @ 81E4CE2
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+MossdeepCity_Text_1E4CED: @ 81E4CED
+	.string "I got this from STEVEN, but I don’t\n"
+	.string "know what it’s good for.\p"
+	.string "I think it’s called KING’S ROCK.\n"
+	.string "Do you want it?$"
+
+MossdeepCity_Text_1E4D5B: @ 81E4D5B
+	.string "Why would you want it?\n"
+	.string "You’re weird.\p"
+	.string "You can keep it, but keep it a secret\n"
+	.string "from STEVEN.$"
+
+MossdeepCity_Text_1E4DB3: @ 81E4DB3
+	.string "STEVEN’s house is right over there!$"
+
+MossdeepCity_Text_1E4DD7: @ 81E4DD7
+	.string "Yeah, you think so, too! What are you\n"
+	.string "supposed to do with some weird rock?$"
+
+MossdeepCity_Text_1E4E22: @ 81E4E22
+	.string "Around MOSSDEEP, you can see wild\n"
+	.string "WAILMER.\p"
+	.string "It’s called, uh…\n"
+	.string "What was it now…\p"
+	.string "WAI, WAI, WAI…\p"
+	.string "WAILMER watching!$"
+
+MossdeepCity_Text_1E4E90: @ 81E4E90
+	.string "The island’s SPACE CENTER has been\n"
+	.string "launching huge rockets.\p"
+	.string "There’s been some kind of an uproar\n"
+	.string "over a letter they received recently.$"
+
+MossdeepCity_Text_1E4F15: @ 81E4F15
+	.string "The island’s SPACE CENTER has been\n"
+	.string "launching huge rockets.$"
+
+MossdeepCity_Text_1E4F50: @ 81E4F50
+	.string "I heard from a SAILOR buddy that\n"
+	.string "TEAM AQUA set up shop in LILYCOVE.\p"
+	.string "I also heard that someone came along\n"
+	.string "and wiped the floor with them!\p"
+	.string "But MOSSDEEP here’s been targeted\n"
+	.string "by that TEAM MAGMA.\p"
+	.string "If you want to know what they’re up to,\n"
+	.string "go visit the SPACE CENTER.$"
+
+MossdeepCity_Text_1E5051: @ 81E5051
+	.string "I’m a SAILOR, so the sea’s obviously\n"
+	.string "more important to me.\p"
+	.string "But you know? When I get back on land\n"
+	.string "after a long voyage, I do feel relief!$"
+
+MossdeepCity_Text_1E50D9: @ 81E50D9
+	.string "Wouldn’t it be nice?\p"
+	.string "If the whole world was covered in\n"
+	.string "plants and flowers like this island?$"
+
+MossdeepCity_Text_1E5135: @ 81E5135
+	.string "All life needs the sea to live, even\n"
+	.string "though it makes its home on the land.\p"
+	.string "Life, having run its course, becomes\n"
+	.string "soil and returns to the land.\p"
+	.string "And the sea is always connected to\n"
+	.string "the land.\p"
+	.string "Yes, like the very shoreline here.$"
+
+MossdeepCity_Text_1E5213: @ 81E5213
+	.string "A voyage on a ship is fine.\p"
+	.string "But crossing the sea with POKéMON\n"
+	.string "using SURF…\p"
+	.string "Now that’s an exhilarating trip!\n"
+	.string "Wouldn’t you agree, youngster?$"
+
+MossdeepCity_Text_1E529D: @ 81E529D
+	.string "This rock has a special meaning to\n"
+	.string "the people at the SPACE CENTER.\p"
+	.string "They put it here as their wish for\n"
+	.string "their rockets to fly safely.\p"
+	.string "When you make a wish, what do you use?\n"
+	.string "Do you wish upon a star?\p"
+	.string "I use a wish tag to make it happen.\n"
+	.string "That’s what I do.$"
+
+MossdeepCity_Text_1E5396: @ 81E5396
+	.string "It’s a white rock.$"
+
+MossdeepCity_Text_1E53A9: @ 81E53A9
+	.string "MOSSDEEP CITY POKéMON GYM\n"
+	.string "LEADERS: LIZA & TATE\p"
+	.string "“The mystic combination!”$"
+
+MossdeepCity_Text_1E53F2: @ 81E53F2
+	.string "MOSSDEEP CITY\n"
+	.string "“Our slogan: Cherish POKéMON!”$"
+
+MossdeepCity_Text_1E541F: @ 81E541F
+	.string "MOSSDEEP SPACE CENTER\n"
+	.string "“The closest place to space.”$"
+
+MossdeepCity_Text_1E5453: @ 81E5453
+	.string "SCOTT: {PLAYER}{KUN}, feeling good?\n"
+	.string "I’m doing great!\p"
+	.string "I’d heard MOSSDEEP’s GYM LEADER is\n"
+	.string "pretty strong, so I decided to come\l"
+	.string "take a look-see for myself.\p"
+	.string "But there’s something wrong about\n"
+	.string "this town.\p"
+	.string "People are going on about a warning\n"
+	.string "letter and the SPACE CENTER…\p"
+	.string "I don’t think it concerns me in any\n"
+	.string "way, though.$"
+
+MossdeepCity_Text_1E5581: @ 81E5581
+	.string "Ahh… It feels great letting the waves\n"
+	.string "wash over my feet…\p"
+	.string "Speaking of the waves, you know that\n"
+	.string "island city SOOTOPOLIS?\p"
+	.string "I think the GYM there had a new\n"
+	.string "LEADER come in.\p"
+	.string "People tell me the new LEADER once\n"
+	.string "mentored WALLACE.$"
+
diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
new file mode 100644
index 000000000..4186ec9ca
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D
+	bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D
+	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..302f13d7e 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 305
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..58ca66fd2
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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..86e796c52 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 306
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a6511d2c1
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0
+	object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0
+	object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0
+	object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0
+	object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0
+	object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0
+	object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0
+	object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0
+	object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0
+	object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0
+	object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67
+	coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D
+	coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D
+	coord_event 15, 34, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C93
+	coord_event 23, 24, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9
+	coord_event 23, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9
+	coord_event 8, 6, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CBF
+	coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1
+	coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67
+
+MossdeepCity_Gym_MapBGEvents: @ 853294C
+	bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33
+	bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..1b325fc9a 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity_Gym: @ 84838BC
-	.4byte MossdeepCity_Gym_MapAttributes
+	.4byte MossdeepCity_Gym_Layout
 	.4byte MossdeepCity_Gym_MapEvents
 	.4byte MossdeepCity_Gym_MapScripts
 	.4byte 0x0
 	.2byte MUS_GIM
 	.2byte 108
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..00e7a12fc
--- /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, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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..25b8f5558 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity_House1: @ 84838D8
-	.4byte MossdeepCity_House1_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House1_MapEvents
 	.4byte MossdeepCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 60
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b38d1bf8d
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 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..718ed1f1a 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity_House2: @ 84838F4
-	.4byte MossdeepCity_House2_MapAttributes
+	.4byte House1_Layout
 	.4byte MossdeepCity_House2_MapEvents
 	.4byte MossdeepCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 59
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
new file mode 100644
index 000000000..c61f74d99
--- /dev/null
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -0,0 +1,70 @@
+MossdeepCity_House2_MapScripts:: @ 82220DE
+	.byte 0
+
+MossdeepCity_House2_EventScript_2220DF:: @ 82220DF
+	msgbox MossdeepCity_House2_Text_222146, 2
+	end
+
+MossdeepCity_House2_EventScript_2220E8:: @ 82220E8
+	msgbox MossdeepCity_House2_Text_2221A6, 2
+	end
+
+MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox MossdeepCity_House2_Text_22222E, 4
+	waitmoncry
+	closemessage
+	setflag FLAG_0x0E0
+	clearflag FLAG_0x3A5
+	compare VAR_FACING, 2
+	call_if 1, MossdeepCity_House2_EventScript_222124
+	compare VAR_FACING, 3
+	call_if 1, MossdeepCity_House2_EventScript_22212F
+	removeobject 3
+	release
+	end
+
+MossdeepCity_House2_EventScript_222124:: @ 8222124
+	applymovement 3, MossdeepCity_House2_Movement_22213A
+	waitmovement 0
+	return
+
+MossdeepCity_House2_EventScript_22212F:: @ 822212F
+	applymovement 3, MossdeepCity_House2_Movement_222141
+	waitmovement 0
+	return
+
+MossdeepCity_House2_Movement_22213A: @ 822213A
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
+	delay_8
+	step_end
+
+MossdeepCity_House2_Movement_222141: @ 8222141
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	step_end
+
+MossdeepCity_House2_Text_222146: @ 8222146
+	.string "My little sister exchanges MAIL with\n"
+	.string "her boyfriend in FORTREE.\p"
+	.string "I don’t envy her one bit at all.$"
+
+MossdeepCity_House2_Text_2221A6: @ 82221A6
+	.string "Even though I can’t see my friend in\n"
+	.string "FORTREE, my POKéMON carries MAIL\l"
+	.string "back and forth for us.\p"
+	.string "I’m not lonesome, even though we’re\n"
+	.string "apart.$"
+
+MossdeepCity_House2_Text_22222E: @ 822222E
+	.string "WINGULL: Pihyoh!$"
+
diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc
new file mode 100644
index 000000000..374808598
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 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..53aeb0a29 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity_House3: @ 8483964
-	.4byte MossdeepCity_House3_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House3_MapEvents
 	.4byte MossdeepCity_House3_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 60
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..048bd5ffd
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..41cbc6a7a 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity_House4: @ 848399C
-	.4byte MossdeepCity_House4_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte MossdeepCity_House4_MapEvents
 	.4byte MossdeepCity_House4_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 80
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..9fb1f674a
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..659c7e133 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity_Mart: @ 8483948
-	.4byte MossdeepCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte MossdeepCity_Mart_MapEvents
 	.4byte MossdeepCity_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ed26d83cb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..75f151c51 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e13367153
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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..5a98563b8 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fe1d4fcf8
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756
+	object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756
+	object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737
+	object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..a0dd1e050 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 275
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
new file mode 100644
index 000000000..2edf6d251
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -0,0 +1,439 @@
+MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
+	map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2
+	map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C
+	.byte 0
+
+MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
+	setobjectxyperm 3, 1, 9
+	setobjectmovementtype 3, 10
+	setobjectxyperm 5, 0, 8
+	setobjectmovementtype 5, 10
+	setobjectxyperm 4, 1, 6
+	setobjectmovementtype 4, 10
+	setobjectxyperm 1, 3, 4
+	setobjectmovementtype 1, 10
+	setobjectmovementtype 2, 10
+	compare VAR_0x409E, 1
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA
+	compare VAR_0x409E, 2
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2
+	compare VAR_0x409E, 3
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA
+	setobjectxyperm 9, 12, 2
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_222FB2:: @ 8222FB2
+	setobjectxyperm 9, 13, 3
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA
+	setobjectxyperm 9, 14, 2
+	end
+
+MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
+	compare VAR_0x405D, 2
+	goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
+	setmetatile 2, 5, 996, 1
+	return
+
+MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
+	lock
+	faceplayer
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
+	dodailyevents
+	specialvar VAR_RESULT, GetWeekCount
+	buffernumberstring 0, VAR_RESULT
+	compare VAR_RESULT, 0
+	call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012
+	compare VAR_RESULT, 1
+	call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B
+	closemessage
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, 4
+	return
+
+MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, 4
+	return
+
+MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
+	dodailyevents
+	specialvar VAR_RESULT, GetWeekCount
+	buffernumberstring 0, VAR_RESULT
+	compare VAR_RESULT, 0
+	call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051
+	compare VAR_RESULT, 1
+	call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A
+	closemessage
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223305, 4
+	return
+
+MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A
+	msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, 4
+	return
+
+MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
+	lock
+	faceplayer
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, 4
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
+	lock
+	faceplayer
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA
+	checkflag FLAG_0x0C0
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4
+	giveitem_std ITEM_SUN_STONE
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
+	setflag FLAG_0x0C0
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA
+	checkflag FLAG_0x0C0
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4
+	giveitem_std ITEM_SUN_STONE
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
+	setflag FLAG_0x0C0
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E
+	compare VAR_0x405D, 2
+	goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154
+	goto MossdeepCity_SpaceCenter_1F_EventScript_22315E
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
+	lock
+	faceplayer
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F
+	compare VAR_0x405D, 2
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4
+	compare VAR_0x405D, 2
+	goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F
+	goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F
+	msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9
+	lock
+	faceplayer
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223849, 4
+	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF
+	lockall
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, 4
+	releaseall
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA
+	trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999
+	msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, 6
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1
+	trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, 6
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208
+	trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, 6
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
+	lock
+	faceplayer
+	checkflag FLAG_0x0BF
+	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, 4
+	trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2
+	setflag FLAG_0x0BF
+	moveobjectoffscreen 9
+	switch VAR_FACING
+	case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278
+	case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289
+	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2
+	waitmovement 0
+	setvar VAR_0x409E, 2
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E
+	msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, 4
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278
+	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A
+	waitmovement 0
+	setvar VAR_0x409E, 1
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289
+	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E
+	waitmovement 0
+	setvar VAR_0x409E, 3
+	release
+	end
+
+MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	step_end
+
+MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	step_end
+
+MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2
+	face_left
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	step_end
+
+MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7
+	.string "The rocket’s launch is imminent!$"
+
+MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8
+	.string "The rocket launched safely!\n"
+	.string "That’s successful launch no. {STR_VAR_1}!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305
+	.string "I know that things are a little\n"
+	.string "haywire right now, but…\p"
+	.string "The rocket’s launch is imminent!$"
+
+MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E
+	.string "I know that things are a little\n"
+	.string "haywire right now, but…\p"
+	.string "The rocket launched safely!\n"
+	.string "That’s successful launch no. {STR_VAR_1}!$"
+
+MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3
+	.string "A rocket launch demands perfection.\n"
+	.string "Not even a 1% margin of error is allowed.\p"
+	.string "Even if it’s 99% okay, the whole thing\n"
+	.string "is useless if 1% happens to be no good.\p"
+	.string "Despite that, we never stop trying.\n"
+	.string "Why? It’s a dream that never ends.$"
+
+MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7
+	.string "Those MAGMA thugs have their sights\n"
+	.string "set on our SPACE CENTER.\p"
+	.string "But we can’t allow anything that minor\n"
+	.string "to interfere with our rocket launch!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540
+	.string "I was taking a stroll down the beach\n"
+	.string "when I found this.\p"
+	.string "It’s not anything I need, so you can\n"
+	.string "have it.$"
+
+MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6
+	.string "The HOENN region has been famous for \n"
+	.string "its meteor showers for a long time.$"
+
+MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0
+	.string "TEAM MAGMA can’t be allowed to steal\n"
+	.string "the rocket fuel.\p"
+	.string "Oh, by the way, you can have this stone\n"
+	.string "I found on the beach.$"
+
+MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664
+	.string "With TEAM MAGMA around, I guess\n"
+	.string "strolls on the beach aren’t safe.$"
+
+MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6
+	.string "Some people claim that POKéMON came\n"
+	.string "from space. Could it be true?$"
+
+MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8
+	.string "TEAM AQUA should take care of\n"
+	.string "TEAM MAGMA!\p"
+	.string "But if they did that, TEAM AQUA will\n"
+	.string "become bold and brazen, won’t they?$"
+
+MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B
+	.string "A giant chunk of metal bursts through\n"
+	.string "the skies and flies into space…\p"
+	.string "It boggles my mind!$"
+
+MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5
+	.string "A giant chunk of metal bursts through\n"
+	.string "the skies and flies into space…\p"
+	.string "But TEAM MAGMA wants to spoil\n"
+	.string "that dream of mine!\p"
+	.string "I’m not having any of that!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849
+	.string "STEVEN: {PLAYER}{KUN}, have you read that\n"
+	.string "proclamation already?\p"
+	.string "TEAM MAGMA is coming after the rocket\n"
+	.string "fuel on this island.\p"
+	.string "I don’t know what they’d need it for,\n"
+	.string "but they can’t be allowed to take it.\p"
+	.string "I’ll keep an eye on things for\n"
+	.string "a while longer.\p"
+	.string "In the meantime, why don’t you go\n"
+	.string "check out the town?$"
+
+MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C
+	.string "As promised, we’ve come for\n"
+	.string "the rocket fuel!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999
+	.string "Ran out of fuel…$"
+
+MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA
+	.string "Don’t think you’re on a roll just\n"
+	.string "because you’ve beaten me!$"
+
+MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6
+	.string "We gave you fair warning!\n"
+	.string "There’s nothing sneaky about us!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21
+	.string "Grrr…\n"
+	.string "We should’ve used sneaky treachery…$"
+
+MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B
+	.string "Okay, I get it already! The next time,\n"
+	.string "we’ll come unannounced.$"
+
+MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A
+	.string "The rocket fuel the SPACE CENTER has\n"
+	.string "in storage--that’s what we’re after.\p"
+	.string "We mean to take every last bit of it!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA
+	.string "Please, can you spare some fuel?\n"
+	.string "Even a chintzy cup will do!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223B37: @ 8223B37
+	.string "What are we going to do with\n"
+	.string "the rocket fuel?\p"
+	.string "How would I know?\n"
+	.string "Ask our leader upstairs!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223B90: @ 8223B90
+	.string "Our leader said no one, but no one,\n"
+	.string "gets past me!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223BC2: @ 8223BC2
+	.string "Ack! Ack! Aaack!$"
+
+MossdeepCity_SpaceCenter_1F_Text_223BD3: @ 8223BD3
+	.string "Please, tell our leader that\n"
+	.string "I never abandoned my post.\l"
+	.string "That I stayed to the bitter end…$"
+
+MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C
+	.string "This is…\n"
+	.string "An intent-to-steal notice?\p"
+	.string "“To the staff of the SPACE CENTER:\n"
+	.string "How are you? We are doing fine.\p"
+	.string "“We will soon visit you to take your\n"
+	.string "rocket fuel.\p"
+	.string "“Please don’t try to stop us.\n"
+	.string "We will take the fuel no matter what.\p"
+	.string "“Let there be more land!\n"
+	.string "                                          TEAM MAGMA”$"
+
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
new file mode 100644
index 000000000..b1e7373da
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0
+	object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862
+	object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862
+	object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862
+	object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 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..7f6c20a66 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 276
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..66e00b1f4
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 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, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909
+	bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909
+	bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909
+	bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, 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..68da46965 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -1,15 +1,15 @@
 MossdeepCity_StevensHouse: @ 8483980
-	.4byte MossdeepCity_StevensHouse_MapAttributes
+	.4byte MossdeepCity_StevensHouse_Layout
 	.4byte MossdeepCity_StevensHouse_MapEvents
 	.4byte MossdeepCity_StevensHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 327
-	.byte 13
+	.byte MAPSEC_MOSSDEEP_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
new file mode 100644
index 000000000..14d0cd5c7
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -0,0 +1,219 @@
+MossdeepCity_StevensHouse_MapScripts:: @ 8222784
+	map_script 1, MossdeepCity_StevensHouse_MapScript1_222794
+	map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8
+	map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0
+	.byte 0
+
+MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 0, MossdeepCity_StevensHouse_EventScript_22279E
+	end
+
+MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
+	setmetatile 6, 4, 753, 1
+	return
+
+MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
+	compare VAR_0x40C6, 2
+	call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4
+	end
+
+MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
+	setobjectxyperm 1, 6, 5
+	setobjectmovementtype 1, 7
+	return
+
+MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
+	map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA
+	.2byte 0
+
+MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
+	lockall
+	applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, MossdeepCity_StevensHouse_Movement_272598
+	waitmovement 0
+	applymovement 1, MossdeepCity_StevensHouse_Movement_27259A
+	waitmovement 0
+	applymovement 1, MossdeepCity_StevensHouse_Movement_222833
+	waitmovement 0
+	msgbox MossdeepCity_StevensHouse_Text_222936, 4
+	giveitem_std ITEM_HM08
+	setflag FLAG_0x07B
+	setflag FLAG_0x12E
+	msgbox MossdeepCity_StevensHouse_Text_222A0E, 4
+	closemessage
+	delay 20
+	applymovement 1, MossdeepCity_StevensHouse_Movement_22283B
+	waitmovement 0
+	setflag FLAG_0x314
+	setflag FLAG_0x3AD
+	setvar VAR_0x40C6, 2
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_Movement_222833: @ 8222833
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+MossdeepCity_StevensHouse_Movement_22283B: @ 822283B
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	step_end
+
+MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841
+	lockall
+	msgbox MossdeepCity_StevensHouse_Text_222B9E, 5
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_StevensHouse_EventScript_22285B
+	goto MossdeepCity_StevensHouse_EventScript_222865
+	end
+
+MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B
+	msgbox MossdeepCity_StevensHouse_Text_222C2A, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
+	setvar VAR_TEMP_1, 398
+	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_StevensHouse_EventScript_222895
+	compare VAR_RESULT, 1
+	goto_eq MossdeepCity_StevensHouse_EventScript_2228BD
+	goto MossdeepCity_StevensHouse_EventScript_273811
+	end
+
+MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
+	call MossdeepCity_StevensHouse_EventScript_2228EB
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_StevensHouse_EventScript_222901
+	call MossdeepCity_StevensHouse_EventScript_27378B
+	call MossdeepCity_StevensHouse_EventScript_2723DD
+	goto MossdeepCity_StevensHouse_EventScript_222901
+	end
+
+MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
+	call MossdeepCity_StevensHouse_EventScript_2228EB
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq MossdeepCity_StevensHouse_EventScript_2228E0
+	call MossdeepCity_StevensHouse_EventScript_273797
+	goto MossdeepCity_StevensHouse_EventScript_2228E0
+	end
+
+MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0
+	call MossdeepCity_StevensHouse_EventScript_2737A0
+	goto MossdeepCity_StevensHouse_EventScript_222901
+	end
+
+MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB
+	bufferspeciesname 1, SPECIES_BELDUM
+	removeobject 2
+	playfanfare MUS_FANFA4
+	message MossdeepCity_StevensHouse_Text_222BED
+	waitmessage
+	waitfanfare
+	bufferspeciesname 0, SPECIES_BELDUM
+	return
+
+MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901
+	setflag FLAG_0x3C8
+	setflag FLAG_0x12A
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909
+	msgbox MossdeepCity_StevensHouse_Text_222D97, 3
+	end
+
+MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912
+	msgbox MossdeepCity_StevensHouse_Text_222B11, 2
+	end
+
+MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B
+	lockall
+	msgbox MossdeepCity_StevensHouse_Text_222C4E, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926
+	giveitem_std ITEM_HM08, 1, 1
+	setflag FLAG_0x07B
+	end
+
+MossdeepCity_StevensHouse_Text_222936: @ 8222936
+	.string "STEVEN: {PLAYER}{KUN}…\p"
+	.string "As you can see, there’s not much here,\n"
+	.string "but this is my home.\p"
+	.string "Thank you for all that you’ve done.\p"
+	.string "This is my token of appreciation.\n"
+	.string "It’s the HIDDEN MACHINE DIVE.\p"
+	.string "No need to be shy--you’ve earned\n"
+	.string "this HM.$"
+
+MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E
+	.string "STEVEN: While you’re using SURF, you\n"
+	.string "should notice dark patches of water.\p"
+	.string "Use DIVE if you come to deep water\n"
+	.string "like it. You’ll drop to the seafloor.\p"
+	.string "When you want to come back up, use\n"
+	.string "DIVE again.\p"
+	.string "In some places, it won’t be possible\n"
+	.string "for you to surface, though.$"
+
+MossdeepCity_StevensHouse_Text_222B11: @ 8222B11
+	.string "STEVEN: Apparently, there’s an\n"
+	.string "underwater cavern between\l"
+	.string "MOSSDEEP and SOOTOPOLIS.\p"
+	.string "You know, the one that CAPT. STERN\n"
+	.string "found in his submarine.$"
+
+MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E
+	.string "{PLAYER} checked the POKé BALL.\p"
+	.string "It contained the POKéMON\n"
+	.string "BELDUM.\p"
+	.string "Take the POKé BALL?$"
+
+MossdeepCity_StevensHouse_Text_222BED: @ 8222BED
+	.string "{PLAYER} obtained a BELDUM.$"
+
+MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
+	.string "There is no space for another POKéMON.$"
+
+MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A
+	.string "{PLAYER} left the POKé BALL where\n"
+	.string "it was.$"
+
+MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E
+	.string "It’s a letter.\p"
+	.string "… … … … … …\p"
+	.string "To {PLAYER}{KUN}…\p"
+	.string "I’ve decided to do a little soul-\n"
+	.string "searching and train on the road.\p"
+	.string "I don’t plan to return home for some\n"
+	.string "time.\p"
+	.string "I have a favor to ask of you.\p"
+	.string "I want you to take the POKé BALL on\n"
+	.string "the desk.\p"
+	.string "Inside it is a BELDUM, my favorite\n"
+	.string "POKéMON.\p"
+	.string "I’m counting on you.\p"
+	.string "May our paths cross someday.\p"
+	.string "STEVEN STONE$"
+
+MossdeepCity_StevensHouse_Text_222D97: @ 8222D97
+	.string "It’s a collection of rare rocks and\n"
+	.string "stones assembled by STEVEN.$"
+
diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc
new file mode 100644
index 000000000..03806a854
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926
+	object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927
+	object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994
+	object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927
+	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927
+	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927
+	object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927
+	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927
+	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926
+	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927
+	object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877
+	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877
+	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, 877
+	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, 877
+	object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, 927
+	object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4
+	bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, 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..04bfa4a45 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -1,15 +1,15 @@
 MtChimney: @ 8484010
-	.4byte MtChimney_MapAttributes
+	.4byte MtChimney_Layout
 	.4byte MtChimney_MapEvents
 	.4byte MtChimney_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 136
-	.byte 56
+	.byte MAPSEC_MT_CHIMNEY
 	.byte 0
-	.byte 7
-	.byte 3
+	.byte WEATHER_ASH
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
new file mode 100644
index 000000000..28135bb1e
--- /dev/null
+++ b/data/maps/MtChimney/scripts.inc
@@ -0,0 +1,869 @@
+MtChimney_MapScripts:: @ 822EDC1
+	map_script 5, MtChimney_MapScript1_22EDD2
+	map_script 3, MtChimney_MapScript1_22EDCC
+	.byte 0
+
+MtChimney_MapScript1_22EDCC: @ 822EDCC
+	setvar VAR_0x40BD, 1
+	end
+
+MtChimney_MapScript1_22EDD2: @ 822EDD2
+	setstepcallback 1
+	end
+
+MtChimney_EventScript_22EDD5:: @ 822EDD5
+	lock
+	faceplayer
+	checkflag FLAG_0x0DB
+	call_if 0, MtChimney_EventScript_22EDF9
+	checkflag FLAG_0x0DB
+	call_if 1, MtChimney_EventScript_22EE02
+	closemessage
+	applymovement 1, MtChimney_Movement_2725A2
+	waitmovement 0
+	setflag FLAG_0x0DB
+	release
+	end
+
+MtChimney_EventScript_22EDF9:: @ 822EDF9
+	msgbox MtChimney_Text_22FAD2, 4
+	return
+
+MtChimney_EventScript_22EE02:: @ 822EE02
+	msgbox MtChimney_Text_22FBC7, 4
+	return
+
+MtChimney_EventScript_22EE0B:: @ 822EE0B
+	lockall
+	playbgm MUS_MGM0, 0
+	msgbox MtChimney_Text_22F26A, 4
+	applymovement 2, MtChimney_Movement_27259E
+	waitmovement 0
+	playse SE_PIN
+	applymovement 2, MtChimney_Movement_272598
+	waitmovement 0
+	applymovement 2, MtChimney_Movement_27259A
+	waitmovement 0
+	msgbox MtChimney_Text_22F32E, 4
+	trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF
+	msgbox MtChimney_Text_22F5F7, 4
+	closemessage
+	delay 30
+	fadescreen 1
+	removeobject 2
+	removeobject 29
+	removeobject 3
+	removeobject 22
+	setflag FLAG_0x39F
+	fadescreen 0
+	setobjectxyperm 1, 10, 12
+	addobject 1
+	compare VAR_FACING, 4
+	call_if 1, MtChimney_EventScript_22EEC7
+	compare VAR_FACING, 2
+	call_if 1, MtChimney_EventScript_22EED2
+	applymovement 255, MtChimney_Movement_2725A4
+	waitmovement 0
+	msgbox MtChimney_Text_22FC3D, 4
+	closemessage
+	compare VAR_FACING, 4
+	call_if 1, MtChimney_EventScript_22EEDD
+	compare VAR_FACING, 2
+	call_if 1, MtChimney_EventScript_22EEE8
+	removeobject 1
+	setflag FLAG_0x39E
+	setflag FLAG_0x08B
+	clearflag FLAG_0x3A0
+	setflag FLAG_0x3AE
+	clearflag FLAG_0x3E2
+	releaseall
+	end
+
+MtChimney_EventScript_22EEC7:: @ 822EEC7
+	applymovement 1, MtChimney_Movement_22EF83
+	waitmovement 0
+	return
+
+MtChimney_EventScript_22EED2:: @ 822EED2
+	applymovement 1, MtChimney_Movement_22EF94
+	waitmovement 0
+	return
+
+MtChimney_EventScript_22EEDD:: @ 822EEDD
+	applymovement 1, MtChimney_Movement_22EF8B
+	waitmovement 0
+	return
+
+MtChimney_EventScript_22EEE8:: @ 822EEE8
+	applymovement 1, MtChimney_Movement_22EF9C
+	waitmovement 0
+	return
+
+MtChimney_EventScript_22EEF3:: @ 822EEF3
+	lock
+	faceplayer
+	showmoneybox 0, 0, 0
+	msgbox MtChimney_Text_22FE04, 5
+	compare VAR_RESULT, 0
+	goto_eq MtChimney_EventScript_22EF69
+	checkmoney 0xc8, 0
+	compare VAR_RESULT, 0
+	goto_eq MtChimney_EventScript_22EF76
+	msgbox MtChimney_Text_22FE4D, 4
+	checkitemspace ITEM_LAVA_COOKIE, 1
+	compare VAR_RESULT, 1
+	call_if 1, MtChimney_EventScript_22EF5E
+	giveitem_std ITEM_LAVA_COOKIE
+	compare VAR_RESULT, 0
+	goto_eq MtChimney_EventScript_22EF51
+	hidemoneybox
+	nop
+	nop
+	release
+	end
+
+MtChimney_EventScript_22EF51:: @ 822EF51
+	msgbox gUnknown_08272AD0, 4
+	hidemoneybox
+	nop
+	nop
+	release
+	end
+
+MtChimney_EventScript_22EF5E:: @ 822EF5E
+	takemoney 0xc8, 0
+	updatemoneybox 0, 0
+	nop
+	return
+
+MtChimney_EventScript_22EF69:: @ 822EF69
+	msgbox MtChimney_Text_22FE9B, 4
+	hidemoneybox
+	nop
+	nop
+	release
+	end
+
+MtChimney_EventScript_22EF76:: @ 822EF76
+	msgbox MtChimney_Text_22FE5E, 4
+	hidemoneybox
+	nop
+	nop
+	release
+	end
+
+MtChimney_Movement_22EF83: @ 822EF83
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	step_end
+
+MtChimney_Movement_22EF8B: @ 822EF8B
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22EF94: @ 822EF94
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	step_end
+
+MtChimney_Movement_22EF9C: @ 822EF9C
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22EFA6: @ 822EFA6
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+MtChimney_Movement_22EFB8: @ 822EFB8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+MtChimney_Movement_22EFC1: @ 822EFC1
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22EFD0: @ 822EFD0
+	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_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+MtChimney_Movement_22EFE9: @ 822EFE9
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+MtChimney_Movement_22EFF4: @ 822EFF4
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22F004: @ 822F004
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+MtChimney_Movement_22F015: @ 822F015
+	delay_16
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+MtChimney_Movement_22F01D: @ 822F01D
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22F02B: @ 822F02B
+	walk_down
+	step_end
+
+MtChimney_Movement_22F02D: @ 822F02D
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22F035: @ 822F035
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22F03F: @ 822F03F
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_Movement_22F04A: @ 822F04A
+	lock_facing_direction
+	walk_fast_left
+	unlock_facing_direction
+	face_right
+	step_end
+
+MtChimney_Movement_22F04F: @ 822F04F
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
+	step_end
+
+MtChimney_EventScript_22F053:: @ 822F053
+	msgbox MtChimney_Text_22FD1F, 3
+	end
+
+MtChimney_EventScript_22F05C:: @ 822F05C
+	msgbox MtChimney_Text_22FD5B, 3
+	end
+
+MtChimney_EventScript_22F065:: @ 822F065
+	msgbox MtChimney_Text_22FDA1, 3
+	end
+
+MtChimney_EventScript_22F06E:: @ 822F06E
+	trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C
+	msgbox MtChimney_Text_22F76D, 6
+	end
+
+MtChimney_EventScript_22F085:: @ 822F085
+	trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A
+	msgbox MtChimney_Text_22F859, 6
+	end
+
+MtChimney_EventScript_22F09C:: @ 822F09C
+	msgbox MtChimney_Text_22F978, 3
+	end
+
+MtChimney_EventScript_22F0A5:: @ 822F0A5
+	msgbox MtChimney_Text_22F9B2, 3
+	end
+
+MtChimney_EventScript_22F0AE:: @ 822F0AE
+	msgbox MtChimney_Text_22F9D1, 3
+	end
+
+MtChimney_EventScript_22F0B7:: @ 822F0B7
+	msgbox MtChimney_Text_22FA2F, 3
+	end
+
+MtChimney_EventScript_22F0C0:: @ 822F0C0
+	msgbox MtChimney_Text_22FA8B, 3
+	end
+
+MtChimney_EventScript_22F0C9:: @ 822F0C9
+	msgbox MtChimney_Text_22FAA5, 3
+	end
+
+MtChimney_EventScript_22F0D2:: @ 822F0D2
+	msgbox MtChimney_Text_22FACB, 3
+	end
+
+MtChimney_EventScript_22F0DB:: @ 822F0DB
+	msgbox MtChimney_Text_22FDFC, 3
+	end
+
+MtChimney_EventScript_22F0E4:: @ 822F0E4
+	lockall
+	checkflag FLAG_0x08B
+	goto_if 0, MtChimney_EventScript_22F137
+	checkflag FLAG_0x073
+	goto_eq MtChimney_EventScript_22F12D
+	msgbox MtChimney_Text_22FF12, 5
+	compare VAR_RESULT, 0
+	goto_eq MtChimney_EventScript_22F123
+	msgbox MtChimney_Text_22FF66, 4
+	giveitem_std ITEM_METEORITE
+	setflag FLAG_0x073
+	releaseall
+	end
+
+MtChimney_EventScript_22F123:: @ 822F123
+	msgbox MtChimney_Text_22FF9C, 4
+	releaseall
+	end
+
+MtChimney_EventScript_22F12D:: @ 822F12D
+	msgbox MtChimney_Text_22FFC0, 4
+	releaseall
+	end
+
+MtChimney_EventScript_22F137:: @ 822F137
+	msgbox MtChimney_Text_22FEAA, 4
+	releaseall
+	end
+
+MtChimney_EventScript_22F141:: @ 822F141
+	msgbox MtChimney_Text_22FFFA, 3
+	end
+
+MtChimney_EventScript_22F14A:: @ 822F14A
+	trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq MtChimney_EventScript_22F195
+	msgbox MtChimney_Text_2300A2, 4
+	release
+	end
+
+MtChimney_EventScript_22F176:: @ 822F176
+	special sub_80B4808
+	waitmovement 0
+	msgbox MtChimney_Text_2300E3, 4
+	setvar VAR_0x8004, 313
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 313
+	callstd 8
+	release
+	end
+
+MtChimney_EventScript_22F195:: @ 822F195
+	trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB
+	msgbox MtChimney_Text_2301E7, 6
+	end
+
+MtChimney_EventScript_22F1AC:: @ 822F1AC
+	trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D
+	msgbox MtChimney_Text_230292, 6
+	end
+
+MtChimney_EventScript_22F1C3:: @ 822F1C3
+	trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304
+	msgbox MtChimney_Text_23033A, 6
+	end
+
+MtChimney_EventScript_22F1DA:: @ 822F1DA
+	trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436
+	msgbox MtChimney_Text_230463, 6
+	end
+
+MtChimney_EventScript_22F1F1:: @ 822F1F1
+	trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921
+	msgbox MtChimney_Text_22F93A, 6
+	end
+
+MtChimney_EventScript_22F208:: @ 822F208
+	trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq MtChimney_EventScript_22F253
+	msgbox MtChimney_Text_230519, 4
+	release
+	end
+
+MtChimney_EventScript_22F234:: @ 822F234
+	special sub_80B4808
+	waitmovement 0
+	msgbox MtChimney_Text_230557, 4
+	setvar VAR_0x8004, 1
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 1
+	callstd 8
+	release
+	end
+
+MtChimney_EventScript_22F253:: @ 822F253
+	trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3
+	msgbox MtChimney_Text_230614, 6
+	end
+
+MtChimney_Text_22F26A: @ 822F26A
+	.string "The power contained in the METEORITE…\p"
+	.string "By amplifying its power with this\n"
+	.string "machine, MT. CHIMNEY’s volcanic\l"
+	.string "activity will instantly intensify…\p"
+	.string "Its energy will grow deep inside\n"
+	.string "the crater and…\l"
+	.string "Fufufu…$"
+
+MtChimney_Text_22F32E: @ 822F32E
+	.string "MAXIE: Hm?\n"
+	.string "Who are you?\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "I’d heard ARCHIE bemoaning a child\n"
+	.string "who’s been meddling in TEAM AQUA’s\l"
+	.string "affairs.\p"
+	.string "It must be you he meant.\p"
+	.string "Humph! So you’re thinking of\n"
+	.string "interfering with us, TEAM MAGMA?\p"
+	.string "Now you listen.\n"
+	.string "Long ago, living things used the\l"
+	.string "land to live and grow.\p"
+	.string "That is why land is all important!\n"
+	.string "It is the cradle of all!\p"
+	.string "That is why TEAM MAGMA is dedicated\n"
+	.string "to the expansion of the land mass.\p"
+	.string "It is for further advancement of\n"
+	.string "humankind and POKéMON!\p"
+	.string "And for that, we need the power of\n"
+	.string "what sleeps within this mountain…\p"
+	.string "Oh! There was no need for you to\n"
+	.string "learn that much.\p"
+	.string "But, no matter!\n"
+	.string "I’ll teach you the consequences of\l"
+	.string "meddling in our grand design!$"
+
+MtChimney_Text_22F5CF: @ 822F5CF
+	.string "What?!\p"
+	.string "I, MAXIE, was caught off guard?!$"
+
+MtChimney_Text_22F5F7: @ 822F5F7
+	.string "MAXIE: But, enough.\n"
+	.string "I will back off this time.\p"
+	.string "But don’t think that this is the last\n"
+	.string "you’ve seen of TEAM MAGMA.\p"
+	.string "Fufufu…\p"
+	.string "Even without the METEORITE, if we\n"
+	.string "obtain that ORB… Fufufu…$"
+
+MtChimney_Text_22F6AA: @ 822F6AA
+	.string "Hehehe!\p"
+	.string "So you’ve come all the way here!\p"
+	.string "But you’re too late!\n"
+	.string "I’ve already delivered the METEORITE\l"
+	.string "from METEOR FALLS to the BOSS!$"
+
+MtChimney_Text_22F72C: @ 822F72C
+	.string "Hehehe…\p"
+	.string "Even though I’ve lost, if our leader\n"
+	.string "awakens that thing…$"
+
+MtChimney_Text_22F76D: @ 822F76D
+	.string "BOSS, hurry!\n"
+	.string "Give it the METEORITE’s energy!\p"
+	.string "Hehehe…$"
+
+MtChimney_Text_22F7A2: @ 822F7A2
+	.string "We of TEAM MAGMA are working hard for\n"
+	.string "everyone’s sake.\p"
+	.string "Like, if that thing’s power made more\n"
+	.string "land, there’d be more places to live.\p"
+	.string "Everyone’d be happy!$"
+
+MtChimney_Text_22F83A: @ 822F83A
+	.string "Hunh?\n"
+	.string "What do you mean I lost?$"
+
+MtChimney_Text_22F859: @ 822F859
+	.string "Our BOSS says, “It will make everyone\n"
+	.string "happy.”\p"
+	.string "But why does everyone keep getting\n"
+	.string "in our way?$"
+
+MtChimney_Text_22F8B6: @ 822F8B6
+	.string "If there were more land, I’d be able\n"
+	.string "to get a big house of my own!\p"
+	.string "I’m going to build it on hardened lava!$"
+
+MtChimney_Text_22F921: @ 822F921
+	.string "My dream of a big house…$"
+
+MtChimney_Text_22F93A: @ 822F93A
+	.string "A kid like you, you ought to be\n"
+	.string "splashing about in the waves!$"
+
+MtChimney_Text_22F978: @ 822F978
+	.string "That annoying TEAM AQUA…\n"
+	.string "They always mess with our plans!$"
+
+MtChimney_Text_22F9B2: @ 822F9B2
+	.string "METEORITES pack amazing power!$"
+
+MtChimney_Text_22F9D1: @ 822F9D1
+	.string "You’d better not mess with us!\p"
+	.string "We’re trying to awaken that thing\n"
+	.string "for the benefit of everyone!$"
+
+MtChimney_Text_22FA2F: @ 822FA2F
+	.string "We’re TEAM MAGMA!\p"
+	.string "They’re TEAM AQUA!\p"
+	.string "It totally annoys me that they’d\n"
+	.string "use a name like ours!$"
+
+MtChimney_Text_22FA8B: @ 822FA8B
+	.string "Yeah!\n"
+	.string "Douse them in fire!$"
+
+MtChimney_Text_22FAA5: @ 822FAA5
+	.string "We’re going to keep making more land!$"
+
+MtChimney_Text_22FACB: @ 822FACB
+	.string "Bufoh!$"
+
+MtChimney_Text_22FAD2: @ 822FAD2
+	.string "ARCHIE: Grr, {PLAYER}!\n"
+	.string "I should’ve guessed you’d show up!\p"
+	.string "See for yourself what the fanatics\n"
+	.string "of TEAM MAGMA are up to!\p"
+	.string "They’re trying to inject the stolen\n"
+	.string "METEORITE’s power into the volcano!\p"
+	.string "Doing something like that will cause\n"
+	.string "the volcano’s eruption!$"
+
+MtChimney_Text_22FBC7: @ 822FBC7
+	.string "ARCHIE: Grrr…\p"
+	.string "I want to stop that MAXIE,\n"
+	.string "but I can’t!\p"
+	.string "Not when I have my hands full battling\n"
+	.string "three opponents at once!$"
+
+MtChimney_Text_22FC3D: @ 822FC3D
+	.string "ARCHIE: {PLAYER}!\n"
+	.string "Thank you!\p"
+	.string "With your help, we thwarted TEAM\n"
+	.string "MAGMA’s destructive plan!\p"
+	.string "But… You…\n"
+	.string "Whose side are you on?\p"
+	.string "Ah, it doesn’t matter.\p"
+	.string "We will remain vigilant and keep up\n"
+	.string "our pursuit of TEAM MAGMA.\p"
+	.string "{PLAYER}, we shall meet again!$"
+
+MtChimney_Text_22FD1F: @ 822FD1F
+	.string "Darn… TEAM MAGMA outnumbers us!\n"
+	.string "We can’t keep up with them!$"
+
+MtChimney_Text_22FD5B: @ 822FD5B
+	.string "If they expand the land, there’ll be\n"
+	.string "less habitats for WATER POKéMON!$"
+
+MtChimney_Text_22FDA1: @ 822FDA1
+	.string "We’re TEAM AQUA!\p"
+	.string "They’re TEAM MAGMA!\p"
+	.string "It burns me up that they’d use such\n"
+	.string "a confusing name!$"
+
+MtChimney_Text_22FDFC: @ 822FDFC
+	.string "Bushaa!$"
+
+MtChimney_Text_22FE04: @ 822FE04
+	.string "LAVA COOKIES are MT. CHIMNEY’s local\n"
+	.string "specialty.\p"
+	.string "Try one. It’s just ¥200.$"
+
+MtChimney_Text_22FE4D: @ 822FE4D
+	.string "Thank you, dear!$"
+
+MtChimney_Text_22FE5E: @ 822FE5E
+	.string "Oh, dear. You can’t buy a thing if\n"
+	.string "you’ve not got the money.$"
+
+MtChimney_Text_22FE9B: @ 822FE9B
+	.string "Oh, fine then.$"
+
+MtChimney_Text_22FEAA: @ 822FEAA
+	.string "A METEORITE is fitted on a mysterious\n"
+	.string "machine…\p"
+	.string "The machine seems to be storing\n"
+	.string "energy in the METEORITE.$"
+
+MtChimney_Text_22FF12: @ 822FF12
+	.string "A METEORITE is fitted on a mysterious\n"
+	.string "machine…\p"
+	.string "Do you want to remove the METEORITE?$"
+
+MtChimney_Text_22FF66: @ 822FF66
+	.string "{PLAYER} removed the METEORITE from\n"
+	.string "the mysterious machine.$"
+
+MtChimney_Text_22FF9C: @ 822FF9C
+	.string "{PLAYER} left the METEORITE where\n"
+	.string "it was.$"
+
+MtChimney_Text_22FFC0: @ 822FFC0
+	.string "This mysterious machine…\n"
+	.string "It makes no response whatsoever.$"
+
+MtChimney_Text_22FFFA: @ 822FFFA
+	.string "{0x7A} JAGGED PATH\n"
+	.string "LAVARIDGE TOWN AHEAD$"
+
+MtChimney_Text_23001D: @ 823001D
+	.string "I’ve been to the hot springs and\n"
+	.string "refreshed my tired bones.\l"
+	.string "Right now I’m feeling strong!$"
+
+MtChimney_Text_230076: @ 8230076
+	.string "Oh, my goodness.\n"
+	.string "Now, aren’t you something!$"
+
+MtChimney_Text_2300A2: @ 82300A2
+	.string "Well, well, I’ve lost. I can’t call\n"
+	.string "myself an EXPERT now, can I?$"
+
+MtChimney_Text_2300E3: @ 82300E3
+	.string "Thank you, child. It was fun, as if\n"
+	.string "I were battling my own grandchild.\p"
+	.string "Please, come see me again for\n"
+	.string "a rematch.$"
+
+MtChimney_Text_230153: @ 8230153
+	.string "If you can mesh your heart with those\n"
+	.string "of your POKéMON, why, you should be\l"
+	.string "able to achieve great things.$"
+
+MtChimney_Text_2301BB: @ 82301BB
+	.string "Oh, my goodness.\n"
+	.string "Now, aren’t you something!$"
+
+MtChimney_Text_2301E7: @ 82301E7
+	.string "Perhaps your heart has become one\n"
+	.string "with the hearts of your POKéMON.$"
+
+MtChimney_Text_23022A: @ 823022A
+	.string "I’ve got the fire in me, baby.\n"
+	.string "I can’t stand it! I have to battle!$"
+
+MtChimney_Text_23026D: @ 823026D
+	.string "Ooh, that was a scorching-hot match!$"
+
+MtChimney_Text_230292: @ 8230292
+	.string "The heat of MT. CHIMNEY warms\n"
+	.string "me up, baby!$"
+
+MtChimney_Text_2302BD: @ 82302BD
+	.string "I’ve finally made it to MT. CHIMNEY.\n"
+	.string "I want to make my POKéMON battle!$"
+
+MtChimney_Text_230304: @ 8230304
+	.string "The way you battle…\n"
+	.string "It’s like a MT. CHIMNEY eruption!$"
+
+MtChimney_Text_23033A: @ 823033A
+	.string "Like I said, I’ve finally made it to\n"
+	.string "MT. CHIMNEY. It would be a shame if\l"
+	.string "I only do a little sightseeing…\p"
+	.string "I want to get in some battles and buy\n"
+	.string "COOKIES as souvenirs.$"
+
+MtChimney_Text_2303DF: @ 82303DF
+	.string "Since I bathed in the hot springs,\n"
+	.string "I’ve been feeling great!\l"
+	.string "I’m sure I’m going to win!$"
+
+MtChimney_Text_230436: @ 8230436
+	.string "Yowch!\n"
+	.string "I’m getting a chill out of the water.$"
+
+MtChimney_Text_230463: @ 8230463
+	.string "I’ll have to take another dip in the\n"
+	.string "hot springs. Want to join me?\p"
+	.string "Just joking!$"
+
+MtChimney_Text_2304B3: @ 82304B3
+	.string "This is one fine mountain! Plenty of\n"
+	.string "hot people around for company!$"
+
+MtChimney_Text_2304F7: @ 82304F7
+	.string "Oh, you’re a real firebrand, too!$"
+
+MtChimney_Text_230519: @ 8230519
+	.string "I think I need a dip in LAVARIDGE\n"
+	.string "HOT SPRING with the locals!$"
+
+MtChimney_Text_230557: @ 8230557
+	.string "I like little fireballs like you.\n"
+	.string "Let me register you in my POKéNAV.$"
+
+MtChimney_Text_23059C: @ 823059C
+	.string "I’m happily surrounded by hot people\n"
+	.string "around these parts. I won’t lose!$"
+
+MtChimney_Text_2305E3: @ 82305E3
+	.string "Gosh, you’re still the same\n"
+	.string "firebrand as before!$"
+
+MtChimney_Text_230614: @ 8230614
+	.string "Actually, it really is hot here.\n"
+	.string "I’m overdressed for these parts.$"
+
diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc
new file mode 100644
index 000000000..491ca7997
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..e12bfbacb 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -1,15 +1,15 @@
 MtChimney_CableCarStation: @ 8483DFC
-	.4byte MtChimney_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte MtChimney_CableCarStation_MapEvents
 	.4byte MtChimney_CableCarStation_MapScripts
 	.4byte 0x0
 	.2byte MUS_DOORO_X1
 	.2byte 118
-	.byte 56
+	.byte MAPSEC_MT_CHIMNEY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
new file mode 100644
index 000000000..b6c2118db
--- /dev/null
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -0,0 +1,98 @@
+MtChimney_CableCarStation_MapScripts:: @ 822ABFA
+	map_script 3, MtChimney_CableCarStation_MapScript1_22AC05
+	map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D
+	.byte 0
+
+MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
+	compare VAR_0x40A3, 1
+	call_if 1, MtChimney_CableCarStation_EventScript_22AC11
+	end
+
+MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
+	setobjectxyperm 1, 5, 4
+	setobjectmovementtype 1, 10
+	return
+
+MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
+	map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27
+	.2byte 0
+
+MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
+	lockall
+	applymovement 255, MtChimney_CableCarStation_Movement_22ACB4
+	applymovement 1, MtChimney_CableCarStation_Movement_22ACAA
+	waitmovement 0
+	setvar VAR_0x40A3, 0
+	setobjectxyperm 1, 6, 7
+	setobjectmovementtype 1, 8
+	releaseall
+	end
+
+MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B
+	lock
+	faceplayer
+	msgbox MtChimney_CableCarStation_Text_22ACB9, 5
+	compare VAR_RESULT, 1
+	goto_eq MtChimney_CableCarStation_EventScript_22AC6C
+	compare VAR_RESULT, 0
+	goto_eq MtChimney_CableCarStation_EventScript_22AC9B
+	end
+
+MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
+	msgbox MtChimney_CableCarStation_Text_22ACF8, 4
+	closemessage
+	applymovement 1, MtChimney_CableCarStation_Movement_22ACA5
+	applymovement 255, MtChimney_CableCarStation_Movement_22ACAF
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x40A3, 2
+	incrementgamestat 48
+	special CableCarWarp
+	special sub_814FC9C
+	waitstate
+	release
+	end
+
+MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B
+	msgbox MtChimney_CableCarStation_Text_22AD0E, 4
+	release
+	end
+
+MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5
+	walk_up
+	walk_up
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	step_end
+
+MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF
+	walk_up
+	walk_up
+	walk_up
+	delay_16
+	step_end
+
+MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	step_end
+
+MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9
+	.string "The CABLE CAR is ready to go down.\n"
+	.string "Would you like to be on it?$"
+
+MtChimney_CableCarStation_Text_22ACF8: @ 822ACF8
+	.string "Please step this way.$"
+
+MtChimney_CableCarStation_Text_22AD0E: @ 822AD0E
+	.string "Please ride with us another time.$"
+
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc
new file mode 100644
index 000000000..179a6a538
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 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..241f3dff3 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -1,15 +1,15 @@
 MtPyre_1F: @ 8484064
-	.4byte MtPyre_1F_MapAttributes
+	.4byte MtPyre_1F_Layout
 	.4byte MtPyre_1F_MapEvents
 	.4byte MtPyre_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 137
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6c334ac0c
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0
+	object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0
+	object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 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..a542638a7 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,15 +1,15 @@
 MtPyre_2F: @ 8484080
-	.4byte MtPyre_2F_MapAttributes
+	.4byte MtPyre_2F_Layout
 	.4byte MtPyre_2F_MapEvents
 	.4byte MtPyre_2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 138
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ed9caf9f3
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 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..b09729f81 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,15 +1,15 @@
 MtPyre_3F: @ 848409C
-	.4byte MtPyre_3F_MapAttributes
+	.4byte MtPyre_3F_Layout
 	.4byte MtPyre_3F_MapEvents
 	.4byte MtPyre_3F_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 139
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..73c0a59cf
--- /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, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..bee0a548f 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,15 +1,15 @@
 MtPyre_4F: @ 84840B8
-	.4byte MtPyre_4F_MapAttributes
+	.4byte MtPyre_4F_Layout
 	.4byte MtPyre_4F_MapEvents
 	.4byte MtPyre_4F_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 140
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e1fffe025
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..d17d64262 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,15 +1,15 @@
 MtPyre_5F: @ 84840D4
-	.4byte MtPyre_5F_MapAttributes
+	.4byte MtPyre_5F_Layout
 	.4byte MtPyre_5F_MapEvents
 	.4byte MtPyre_5F_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 141
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..607c0902a
--- /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, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 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..a783fc7c3 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,15 +1,15 @@
 MtPyre_6F: @ 84840F0
-	.4byte MtPyre_6F_MapAttributes
+	.4byte MtPyre_6F_Layout
 	.4byte MtPyre_6F_MapEvents
 	.4byte MtPyre_6F_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 142
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..16fd3530f
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, MtPyre_Exterior_EventScript_231FED
+	coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED
+	coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2
+	coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2
+	coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED
+
+MtPyre_Exterior_MapBGEvents: @ 8535174
+	bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, 29
+	bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, 78
+
+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..b9b2575e8 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -1,15 +1,15 @@
 MtPyre_Exterior: @ 848410C
-	.4byte MtPyre_Exterior_MapAttributes
+	.4byte MtPyre_Exterior_Layout
 	.4byte MtPyre_Exterior_MapEvents
 	.4byte MtPyre_Exterior_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHUPI
 	.2byte 302
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..669625c41
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 916
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, 917
+	object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 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, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018
+	coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024
+	coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030
+	coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC
+	coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8
+	coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204
+
+MtPyre_Summit_MapBGEvents: @ 85352D8
+	bg_hidden_item_event 9, 25, 0, ITEM_ZINC, 79
+	bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, 80
+
+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..d1a65792f 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -1,15 +1,15 @@
 MtPyre_Summit: @ 8484128
-	.4byte MtPyre_Summit_MapAttributes
+	.4byte MtPyre_Summit_Layout
 	.4byte MtPyre_Summit_MapEvents
 	.4byte MtPyre_Summit_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHUPI
 	.2byte 303
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 6
-	.byte 3
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
new file mode 100644
index 000000000..fe39e9d48
--- /dev/null
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -0,0 +1,640 @@
+MtPyre_Summit_MapScripts:: @ 8231FF7
+	map_script 3, MtPyre_Summit_MapScript1_231FFD
+	.byte 0
+
+MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
+	compare VAR_0x40B9, 2
+	call_if 1, MtPyre_Summit_EventScript_232009
+	end
+
+MtPyre_Summit_EventScript_232009:: @ 8232009
+	setobjectxyperm 8, 23, 6
+	setobjectxyperm 2, 22, 6
+	end
+
+MtPyre_Summit_EventScript_232018:: @ 8232018
+	lockall
+	setvar VAR_0x8008, 0
+	goto MtPyre_Summit_EventScript_23203C
+	end
+
+MtPyre_Summit_EventScript_232024:: @ 8232024
+	lockall
+	setvar VAR_0x8008, 1
+	goto MtPyre_Summit_EventScript_23203C
+	end
+
+MtPyre_Summit_EventScript_232030:: @ 8232030
+	lockall
+	setvar VAR_0x8008, 2
+	goto MtPyre_Summit_EventScript_23203C
+	end
+
+MtPyre_Summit_EventScript_23203C:: @ 823203C
+	playbgm MUS_AQA_0, 0
+	applymovement 255, MtPyre_Summit_Movement_2725B2
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_2725AA
+	waitmovement 0
+	delay 50
+	compare VAR_0x8008, 0
+	call_if 1, MtPyre_Summit_EventScript_2320E0
+	compare VAR_0x8008, 1
+	call_if 1, MtPyre_Summit_EventScript_2320EB
+	compare VAR_0x8008, 2
+	call_if 1, MtPyre_Summit_EventScript_2320EC
+	msgbox MtPyre_Summit_Text_23281A, 4
+	closemessage
+	fadescreen 1
+	removeobject 2
+	removeobject 4
+	removeobject 5
+	removeobject 6
+	removeobject 7
+	setflag FLAG_0x394
+	setflag FLAG_0x395
+	fadedefaultbgm
+	fadescreen 0
+	delay 20
+	setvar VAR_0x40B9, 1
+	compare VAR_0x8008, 0
+	call_if 1, MtPyre_Summit_EventScript_2320F7
+	compare VAR_0x8008, 1
+	call_if 1, MtPyre_Summit_EventScript_23210C
+	compare VAR_0x8008, 2
+	call_if 1, MtPyre_Summit_EventScript_232117
+	msgbox MtPyre_Summit_Text_23290E, 4
+	giveitem_std ITEM_MAGMA_EMBLEM
+	setflag FLAG_0x0D4
+	setflag FLAG_0x34F
+	releaseall
+	end
+
+MtPyre_Summit_EventScript_2320E0:: @ 82320E0
+	applymovement 2, MtPyre_Summit_Movement_232136
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_2320EB:: @ 82320EB
+	return
+
+MtPyre_Summit_EventScript_2320EC:: @ 82320EC
+	applymovement 2, MtPyre_Summit_Movement_232139
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_2320F7:: @ 82320F7
+	applymovement 3, MtPyre_Summit_Movement_23212C
+	waitmovement 0
+	applymovement 255, MtPyre_Summit_Movement_2725A8
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_23210C:: @ 823210C
+	applymovement 3, MtPyre_Summit_Movement_232130
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_232117:: @ 8232117
+	applymovement 3, MtPyre_Summit_Movement_232132
+	waitmovement 0
+	applymovement 255, MtPyre_Summit_Movement_2725A4
+	waitmovement 0
+	return
+
+MtPyre_Summit_Movement_23212C: @ 823212C
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+MtPyre_Summit_Movement_232130: @ 8232130
+	walk_down
+	step_end
+
+MtPyre_Summit_Movement_232132: @ 8232132
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	step_end
+
+MtPyre_Summit_Movement_232136: @ 8232136
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+MtPyre_Summit_Movement_232139: @ 8232139
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+MtPyre_Summit_EventScript_23213C:: @ 823213C
+	lock
+	faceplayer
+	checkflag FLAG_0x09E
+	goto_eq MtPyre_Summit_EventScript_232167
+	msgbox MtPyre_Summit_Text_232E0C, 5
+	compare VAR_RESULT, 1
+	call_if 1, MtPyre_Summit_EventScript_232187
+	compare VAR_RESULT, 0
+	call_if 1, MtPyre_Summit_EventScript_232190
+	release
+	end
+
+MtPyre_Summit_EventScript_232167:: @ 8232167
+	msgbox MtPyre_Summit_Text_2331A6, 5
+	compare VAR_RESULT, 1
+	call_if 1, MtPyre_Summit_EventScript_232199
+	compare VAR_RESULT, 0
+	call_if 1, MtPyre_Summit_EventScript_232190
+	release
+	end
+
+MtPyre_Summit_EventScript_232187:: @ 8232187
+	msgbox MtPyre_Summit_Text_232F27, 4
+	return
+
+MtPyre_Summit_EventScript_232190:: @ 8232190
+	msgbox MtPyre_Summit_Text_233162, 4
+	return
+
+MtPyre_Summit_EventScript_232199:: @ 8232199
+	msgbox MtPyre_Summit_Text_23325D, 4
+	return
+
+MtPyre_Summit_EventScript_2321A2:: @ 82321A2
+	lock
+	faceplayer
+	checkflag FLAG_0x103
+	goto_eq MtPyre_Summit_EventScript_2321E2
+	compare VAR_0x40B9, 3
+	call_if 4, MtPyre_Summit_EventScript_2321CB
+	checkflag FLAG_0x081
+	goto_eq MtPyre_Summit_EventScript_2321D8
+	msgbox MtPyre_Summit_Text_232AD8, 4
+	release
+	end
+
+MtPyre_Summit_EventScript_2321CB:: @ 82321CB
+	msgbox MtPyre_Summit_Text_232CA6, 4
+	setflag FLAG_0x103
+	release
+	end
+
+MtPyre_Summit_EventScript_2321D8:: @ 82321D8
+	msgbox MtPyre_Summit_Text_232B4F, 4
+	release
+	end
+
+MtPyre_Summit_EventScript_2321E2:: @ 82321E2
+	msgbox MtPyre_Summit_Text_232D1E, 4
+	release
+	end
+
+MtPyre_Summit_EventScript_2321EC:: @ 82321EC
+	lockall
+	setvar VAR_0x8008, 0
+	goto MtPyre_Summit_EventScript_232210
+	end
+
+MtPyre_Summit_EventScript_2321F8:: @ 82321F8
+	lockall
+	setvar VAR_0x8008, 1
+	goto MtPyre_Summit_EventScript_232210
+	end
+
+MtPyre_Summit_EventScript_232204:: @ 8232204
+	lockall
+	setvar VAR_0x8008, 2
+	goto MtPyre_Summit_EventScript_232210
+	end
+
+MtPyre_Summit_EventScript_232210:: @ 8232210
+	applymovement 255, MtPyre_Summit_Movement_2725A6
+	waitmovement 0
+	delay 60
+	compare VAR_0x8008, 0
+	call_if 1, MtPyre_Summit_EventScript_2322C4
+	compare VAR_0x8008, 1
+	call_if 1, MtPyre_Summit_EventScript_2322DD
+	compare VAR_0x8008, 2
+	call_if 1, MtPyre_Summit_EventScript_2322F6
+	playse SE_PIN
+	applymovement 8, MtPyre_Summit_Movement_272598
+	waitmovement 0
+	applymovement 8, MtPyre_Summit_Movement_27259A
+	waitmovement 0
+	delay 30
+	compare VAR_0x8008, 0
+	call_if 1, MtPyre_Summit_EventScript_23230F
+	compare VAR_0x8008, 1
+	call_if 1, MtPyre_Summit_EventScript_232328
+	compare VAR_0x8008, 2
+	call_if 1, MtPyre_Summit_EventScript_232341
+	msgbox MtPyre_Summit_Text_233183, 4
+	closemessage
+	compare VAR_0x8008, 0
+	call_if 1, MtPyre_Summit_EventScript_23235A
+	compare VAR_0x8008, 1
+	call_if 1, MtPyre_Summit_EventScript_232376
+	compare VAR_0x8008, 2
+	call_if 1, MtPyre_Summit_EventScript_232392
+	delay 30
+	applymovement 2, MtPyre_Summit_Movement_2323B6
+	applymovement 8, MtPyre_Summit_Movement_2323BD
+	waitmovement 0
+	removeobject 2
+	removeobject 8
+	setvar VAR_0x40B9, 3
+	releaseall
+	end
+
+MtPyre_Summit_EventScript_2322C4:: @ 82322C4
+	applymovement 255, MtPyre_Summit_Movement_2323C4
+	applymovement 2, MtPyre_Summit_Movement_2323B6
+	applymovement 8, MtPyre_Summit_Movement_2323BD
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_2322DD:: @ 82322DD
+	applymovement 255, MtPyre_Summit_Movement_2323CB
+	applymovement 2, MtPyre_Summit_Movement_2323B6
+	applymovement 8, MtPyre_Summit_Movement_2323BD
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_2322F6:: @ 82322F6
+	applymovement 255, MtPyre_Summit_Movement_2323D2
+	applymovement 2, MtPyre_Summit_Movement_2323B6
+	applymovement 8, MtPyre_Summit_Movement_2323BD
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_23230F:: @ 823230F
+	applymovement 255, MtPyre_Summit_Movement_2323AE
+	applymovement 2, MtPyre_Summit_Movement_2323E7
+	applymovement 8, MtPyre_Summit_Movement_2323D8
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_232328:: @ 8232328
+	applymovement 255, MtPyre_Summit_Movement_2323B2
+	applymovement 2, MtPyre_Summit_Movement_2323E7
+	applymovement 8, MtPyre_Summit_Movement_2323DD
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_232341:: @ 8232341
+	applymovement 255, MtPyre_Summit_Movement_2323B2
+	applymovement 2, MtPyre_Summit_Movement_2323E7
+	applymovement 8, MtPyre_Summit_Movement_2323E2
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_23235A:: @ 823235A
+	applymovement 255, MtPyre_Summit_Movement_2323EA
+	applymovement 8, MtPyre_Summit_Movement_2323ED
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_2725A8
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_232376:: @ 8232376
+	applymovement 255, MtPyre_Summit_Movement_2323EA
+	applymovement 8, MtPyre_Summit_Movement_2323F3
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_2725A8
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_232392:: @ 8232392
+	applymovement 255, MtPyre_Summit_Movement_2323EA
+	applymovement 8, MtPyre_Summit_Movement_2323F8
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_2725A8
+	waitmovement 0
+	return
+
+MtPyre_Summit_Movement_2323AE: @ 82323AE
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+MtPyre_Summit_Movement_2323B2: @ 82323B2
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	step_end
+
+MtPyre_Summit_Movement_2323B6: @ 82323B6
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtPyre_Summit_Movement_2323BD: @ 82323BD
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+MtPyre_Summit_Movement_2323C4: @ 82323C4
+	delay_16
+	delay_8
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+MtPyre_Summit_Movement_2323CB: @ 82323CB
+	delay_16
+	delay_8
+	walk_right
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+MtPyre_Summit_Movement_2323D2: @ 82323D2
+	delay_16
+	delay_8
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+MtPyre_Summit_Movement_2323D8: @ 82323D8
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	step_end
+
+MtPyre_Summit_Movement_2323DD: @ 82323DD
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+MtPyre_Summit_Movement_2323E2: @ 82323E2
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+MtPyre_Summit_Movement_2323E7: @ 82323E7
+	delay_16
+	walk_in_place_fastest_up
+	step_end
+
+MtPyre_Summit_Movement_2323EA: @ 82323EA
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+MtPyre_Summit_Movement_2323ED: @ 82323ED
+	walk_down
+	walk_right
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+MtPyre_Summit_Movement_2323F3: @ 82323F3
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+MtPyre_Summit_Movement_2323F8: @ 82323F8
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+MtPyre_Summit_EventScript_2323FD:: @ 82323FD
+	trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
+	msgbox MtPyre_Summit_Text_2324E0, 6
+	end
+
+MtPyre_Summit_EventScript_232414:: @ 8232414
+	trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
+	msgbox MtPyre_Summit_Text_2325E4, 6
+	end
+
+MtPyre_Summit_EventScript_23242B:: @ 823242B
+	trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
+	msgbox MtPyre_Summit_Text_2326B3, 6
+	end
+
+MtPyre_Summit_EventScript_232442:: @ 8232442
+	trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
+	msgbox MtPyre_Summit_Text_2327D8, 6
+	end
+
+MtPyre_Summit_Text_232459: @ 8232459
+	.string "No! Those TEAM MAGMA goons got\n"
+	.string "here ahead of us!\p"
+	.string "We can’t fall behind!$"
+
+MtPyre_Summit_Text_2324A0: @ 82324A0
+	.string "I thought you were one of the MAGMAS\n"
+	.string "who happened to come back…$"
+
+MtPyre_Summit_Text_2324E0: @ 82324E0
+	.string "Yeah, so you are strong…\n"
+	.string "But there’re a lot of us!$"
+
+MtPyre_Summit_Text_232513: @ 8232513
+	.string "Hah!\n"
+	.string "Too bad for you!\p"
+	.string "If you came earlier, you only would’ve\n"
+	.string "had to battle the wimpy TEAM MAGMA.\p"
+	.string "But since you arrived now, you have\n"
+	.string "to take on us toughies!$"
+
+MtPyre_Summit_Text_2325B0: @ 82325B0
+	.string "Urgh… I should’ve let you take on\n"
+	.string "TEAM MAGMA first…$"
+
+MtPyre_Summit_Text_2325E4: @ 82325E4
+	.string "You don’t know anything!\n"
+	.string "So why are you messing with us?$"
+
+MtPyre_Summit_Text_23261D: @ 823261D
+	.string "You…\n"
+	.string "We saw you at MT. CHIMNEY.\p"
+	.string "You don’t belong to either TEAM,\n"
+	.string "so why would you be here?$"
+
+MtPyre_Summit_Text_232678: @ 8232678
+	.string "If you’re going to mess with anyone,\n"
+	.string "let it be TEAM MAGMA…$"
+
+MtPyre_Summit_Text_2326B3: @ 82326B3
+	.string "Heh, it doesn’t matter!\n"
+	.string "We bought ourselves some time!\p"
+	.string "The BOSS should have snatched what\n"
+	.string "he was after!$"
+
+MtPyre_Summit_Text_23271B: @ 823271B
+	.string "Oh, I know!\n"
+	.string "You tried to join TEAM MAGMA,\l"
+	.string "but they wouldn’t have you!\p"
+	.string "Well, don’t think that we’ll let you\n"
+	.string "join our TEAM AQUA!$"
+
+MtPyre_Summit_Text_23279A: @ 823279A
+	.string "If you want to join TEAM AQUA that\n"
+	.string "badly, we can consider it…$"
+
+MtPyre_Summit_Text_2327D8: @ 82327D8
+	.string "We have a great combination going\n"
+	.string "with us members and our leader.$"
+
+MtPyre_Summit_Text_23281A: @ 823281A
+	.string "ARCHIE: TEAM MAGMA’s MAXIE got ahead\n"
+	.string "of us, but we also got what we wanted.\p"
+	.string "The RED ORB preserved at MT. PYRE…\n"
+	.string "I, ARCHIE, now have it in my possession!\p"
+	.string "Fufufu… Now we can bring our ultimate\n"
+	.string "objective to fruition!\p"
+	.string "Okay, TEAM!\n"
+	.string "We’re pulling out!$"
+
+MtPyre_Summit_Text_23290E: @ 823290E
+	.string "Oh, no…\n"
+	.string "This cannot happen…\p"
+	.string "Not only the BLUE ORB, but even\n"
+	.string "the RED ORB has been taken…\p"
+	.string "The BLUE ORB and RED ORB must never\n"
+	.string "be separated. They belong together.\p"
+	.string "What are those men trying to do with\n"
+	.string "the two ORBS?\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "Oh, yes. Was it TEAM MAGMA who came\n"
+	.string "and took the BLUE ORB first?\p"
+	.string "Well, in their haste, they left this\n"
+	.string "behind.\p"
+	.string "I couldn’t imagine what exactly it\n"
+	.string "could be.\p"
+	.string "I would like you to have it.\n"
+	.string "Perhaps it will be useful in some way.$"
+
+MtPyre_Summit_Text_232AD8: @ 8232AD8
+	.string "The BLUE ORB and RED ORB taken by\n"
+	.string "those sinister men…\p"
+	.string "They must never be apart…\n"
+	.string "I fear something terrible will happen…$"
+
+MtPyre_Summit_Text_232B4F: @ 8232B4F
+	.string "Oh, my goodness…\p"
+	.string "You say that both GROUDON and KYOGRE\n"
+	.string "have been awakened?\p"
+	.string "It is said that the BLUE ORB and\n"
+	.string "the RED ORB quelled the rage of\l"
+	.string "the two POKéMON…\p"
+	.string "It is also said that the true owner\n"
+	.string "of the ORBS still exists.\p"
+	.string "However, no one knows who, or what\n"
+	.string "exactly, the ORBS belong to.\p"
+	.string "It could be a human, or perhaps\n"
+	.string "a POKéMON, but no one knows.$"
+
+MtPyre_Summit_Text_232CA6: @ 8232CA6
+	.string "The two men who took the ORBS came\n"
+	.string "back to return them on their own.\p"
+	.string "Those men…\n"
+	.string "Perhaps they are not so evil after all…$"
+
+MtPyre_Summit_Text_232D1E: @ 8232D1E
+	.string "The embodiments of the land, sea,\n"
+	.string "and the sky…\p"
+	.string "That is said to be the identities of\n"
+	.string "the super-ancient POKéMON…\p"
+	.string "In the same way that we humans and\n"
+	.string "POKéMON have life, our world, too,\l"
+	.string "is alive…\p"
+	.string "The super-ancient POKéMON have\n"
+	.string "taught us that…$"
+
+MtPyre_Summit_Text_232E0C: @ 8232E0C
+	.string "MT. PYRE is where we calm the spirits\n"
+	.string "of POKéMON that have passed on…\p"
+	.string "This is a high place where one can\n"
+	.string "see all of HOENN…\p"
+	.string "The disembodied spirits of POKéMON\n"
+	.string "must find solace here…\p"
+	.string "Is it coincidence that you are here…\p"
+	.string "Will you hear out my tale? A tale long\n"
+	.string "told in the HOENN region?$"
+
+MtPyre_Summit_Text_232F27: @ 8232F27
+	.string "It happened long, long ago…\p"
+	.string "The world was wracked by a ferocious\n"
+	.string "clash between the POKéMON of the land\l"
+	.string "and the POKéMON of the sea…\p"
+	.string "The POKéMON of the land raised\n"
+	.string "mountains and created continents…\p"
+	.string "The POKéMON of the sea raised huge\n"
+	.string "waves and carved out oceans…\p"
+	.string "Their fierce duel raged without end.\p"
+	.string "The world was engulfed in massive\n"
+	.string "infernos and vicious storms.\p"
+	.string "The BLUE ORB and the RED ORB brought\n"
+	.string "an end to the calamity.\p"
+	.string "Light poured from the two ORBS and\n"
+	.string "becalmed the enraged adversaries.\p"
+	.string "The pair, made docile, dove deep into\n"
+	.string "the sea where eventually they\l"
+	.string "disappeared…$"
+
+MtPyre_Summit_Text_233162: @ 8233162
+	.string "I see…\n"
+	.string "Well, that, too, is fine…$"
+
+MtPyre_Summit_Text_233183: @ 8233183
+	.string "MAXIE: {PLAYER}…\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …$"
+
+MtPyre_Summit_Text_2331A6: @ 82331A6
+	.string "It is my role to pass on the legends\n"
+	.string "of HOENN to future generations.\p"
+	.string "And the crisis that just ended in\n"
+	.string "SOOTOPOLIS rewrote a legend…\p"
+	.string "Have you the time to hear the new\n"
+	.string "legend of HOENN?$"
+
+MtPyre_Summit_Text_23325D: @ 823325D
+	.string "It happened long, long ago…\p"
+	.string "The world was wracked by a ferocious\n"
+	.string "clash between the POKéMON of the land\l"
+	.string "and the POKéMON of the sea…\p"
+	.string "The POKéMON of the land raised\n"
+	.string "mountains and created continents…\p"
+	.string "The POKéMON of the sea raised huge\n"
+	.string "waves and carved out oceans…\p"
+	.string "Their fierce duel raged without end.\p"
+	.string "The world was engulfed in massive\n"
+	.string "fires and vicious storms.\p"
+	.string "It was then that the POKéMON of\n"
+	.string "the sky descended from a storm.\p"
+	.string "The POKéMON, shining a vivid green,\n"
+	.string "becalmed the two enraged POKéMON.\p"
+	.string "Then, its duty done, the green POKéMON\n"
+	.string "flew off into the wild blue yonder…$"
+
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..59e9a3f59 100644
--- a/data/maps/NavelRock_B1F/header.inc
+++ b/data/maps/NavelRock_B1F/header.inc
@@ -1,15 +1,15 @@
 NavelRock_B1F: @ 84858C8
-	.4byte NavelRock_B1F_MapAttributes
+	.4byte NavelRock_B1F_Layout
 	.4byte NavelRock_B1F_MapEvents
 	.4byte NavelRock_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 427
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..49a39c162
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..0711b5b81 100644
--- a/data/maps/NavelRock_Bottom/header.inc
+++ b/data/maps/NavelRock_Bottom/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Bottom: @ 8485AC0
-	.4byte NavelRock_Bottom_MapAttributes
+	.4byte NavelRock_Bottom_Layout
 	.4byte NavelRock_Bottom_MapEvents
 	.4byte NavelRock_Bottom_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 424
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fd5b2c0f3 100644
--- a/data/maps/NavelRock_Down01/header.inc
+++ b/data/maps/NavelRock_Down01/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down01: @ 848598C
-	.4byte NavelRock_Down01_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down01_MapEvents
 	.4byte NavelRock_Down01_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7827fe4cb 100644
--- a/data/maps/NavelRock_Down02/header.inc
+++ b/data/maps/NavelRock_Down02/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down02: @ 84859A8
-	.4byte NavelRock_Down02_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down02_MapEvents
 	.4byte NavelRock_Down02_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 426
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..465297482 100644
--- a/data/maps/NavelRock_Down03/header.inc
+++ b/data/maps/NavelRock_Down03/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down03: @ 84859C4
-	.4byte NavelRock_Down03_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down03_MapEvents
 	.4byte NavelRock_Down03_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7ee2eee47 100644
--- a/data/maps/NavelRock_Down04/header.inc
+++ b/data/maps/NavelRock_Down04/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down04: @ 84859E0
-	.4byte NavelRock_Down04_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down04_MapEvents
 	.4byte NavelRock_Down04_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 426
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3f4199195 100644
--- a/data/maps/NavelRock_Down05/header.inc
+++ b/data/maps/NavelRock_Down05/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down05: @ 84859FC
-	.4byte NavelRock_Down05_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down05_MapEvents
 	.4byte NavelRock_Down05_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..189c26969 100644
--- a/data/maps/NavelRock_Down06/header.inc
+++ b/data/maps/NavelRock_Down06/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down06: @ 8485A18
-	.4byte NavelRock_Down06_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down06_MapEvents
 	.4byte NavelRock_Down06_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 426
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..378b7bbd2 100644
--- a/data/maps/NavelRock_Down07/header.inc
+++ b/data/maps/NavelRock_Down07/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down07: @ 8485A34
-	.4byte NavelRock_Down07_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down07_MapEvents
 	.4byte NavelRock_Down07_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7ad3e736a 100644
--- a/data/maps/NavelRock_Down08/header.inc
+++ b/data/maps/NavelRock_Down08/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down08: @ 8485A50
-	.4byte NavelRock_Down08_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down08_MapEvents
 	.4byte NavelRock_Down08_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 426
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..60cec1da8 100644
--- a/data/maps/NavelRock_Down09/header.inc
+++ b/data/maps/NavelRock_Down09/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down09: @ 8485A6C
-	.4byte NavelRock_Down09_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down09_MapEvents
 	.4byte NavelRock_Down09_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..08b2d975b 100644
--- a/data/maps/NavelRock_Down10/header.inc
+++ b/data/maps/NavelRock_Down10/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down10: @ 8485A88
-	.4byte NavelRock_Down10_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Down10_MapEvents
 	.4byte NavelRock_Down10_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 426
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8182f1c41 100644
--- a/data/maps/NavelRock_Down11/header.inc
+++ b/data/maps/NavelRock_Down11/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Down11: @ 8485AA4
-	.4byte NavelRock_Down11_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Down11_MapEvents
 	.4byte NavelRock_Down11_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a0ec2bdc2 100644
--- a/data/maps/NavelRock_Entrance/header.inc
+++ b/data/maps/NavelRock_Entrance/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Entrance: @ 84858AC
-	.4byte NavelRock_Entrance_MapAttributes
+	.4byte NavelRock_Entrance_Layout
 	.4byte NavelRock_Entrance_MapEvents
 	.4byte NavelRock_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 422
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..582fd9cbc 100644
--- a/data/maps/NavelRock_Exterior/header.inc
+++ b/data/maps/NavelRock_Exterior/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Exterior: @ 8485874
-	.4byte NavelRock_Exterior_MapAttributes
+	.4byte NavelRock_Exterior_Layout
 	.4byte NavelRock_Exterior_MapEvents
 	.4byte NavelRock_Exterior_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANASHIMA
 	.2byte 421
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..53c0fdaed 100644
--- a/data/maps/NavelRock_Fork/header.inc
+++ b/data/maps/NavelRock_Fork/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Fork: @ 84858E4
-	.4byte NavelRock_Fork_MapAttributes
+	.4byte NavelRock_Fork_Layout
 	.4byte NavelRock_Fork_MapEvents
 	.4byte NavelRock_Fork_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 428
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b5a299572
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 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..79b1dbafb 100644
--- a/data/maps/NavelRock_Harbor/header.inc
+++ b/data/maps/NavelRock_Harbor/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Harbor: @ 8485890
-	.4byte NavelRock_Harbor_MapAttributes
+	.4byte IslandHarbor_Layout
 	.4byte NavelRock_Harbor_MapEvents
 	.4byte NavelRock_Harbor_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANASHIMA
 	.2byte 405
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ef781a838
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F
+
+NavelRock_Top_MapBGEvents: @ 853DBA4
+	bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, 109
+
+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..9c0a7b1c0 100644
--- a/data/maps/NavelRock_Top/header.inc
+++ b/data/maps/NavelRock_Top/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Top: @ 8485970
-	.4byte NavelRock_Top_MapAttributes
+	.4byte NavelRock_Top_Layout
 	.4byte NavelRock_Top_MapEvents
 	.4byte NavelRock_Top_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 423
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 11
-	.byte 4
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc
new file mode 100644
index 000000000..67ddbc373
--- /dev/null
+++ b/data/maps/NavelRock_Top/scripts.inc
@@ -0,0 +1,127 @@
+NavelRock_Top_MapScripts:: @ 8269113
+	map_script 3, NavelRock_Top_MapScript1_26911E
+	map_script 5, NavelRock_Top_MapScript1_269151
+	.byte 0
+
+NavelRock_Top_MapScript1_26911E: @ 826911E
+	checkflag FLAG_0x092
+	call_if 1, NavelRock_Top_EventScript_269131
+	checkflag FLAG_0x092
+	call_if 0, NavelRock_Top_EventScript_26913A
+	end
+
+NavelRock_Top_EventScript_269131:: @ 8269131
+	setvar VAR_TEMP_1, 1
+	setflag FLAG_0x321
+	return
+
+NavelRock_Top_EventScript_26913A:: @ 826913A
+	setvar VAR_TEMP_1, 1
+	checkflag FLAG_0x1DC
+	goto_eq NavelRock_Top_EventScript_27374E
+	setvar VAR_TEMP_1, 0
+	clearflag FLAG_0x321
+	return
+
+NavelRock_Top_MapScript1_269151: @ 8269151
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, NavelRock_Top_EventScript_26915B
+	end
+
+NavelRock_Top_EventScript_26915B:: @ 826915B
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, NavelRock_Top_EventScript_27374E
+	removeobject 1
+	return
+
+NavelRock_Top_EventScript_26916F:: @ 826916F
+	lockall
+	setvar VAR_TEMP_1, 1
+	special SpawnScriptEventObject
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 35
+	special sub_813B80C
+	applymovement 1, NavelRock_Top_Movement_269243
+	applymovement 127, NavelRock_Top_Movement_269230
+	waitmovement 0
+	delay 50
+	setweather 0
+	doweather
+	waitse
+	playmoncry SPECIES_HO_OH, 2
+	delay 30
+	waitmoncry
+	delay 60
+	setvar VAR_0x8004, 3
+	setvar VAR_0x8005, 35
+	special sub_813B80C
+	applymovement 127, NavelRock_Top_Movement_269234
+	applymovement 1, NavelRock_Top_Movement_26923A
+	waitmovement 0
+	special RemoveScriptEventObject
+	setvar VAR_0x8004, 250
+	setvar VAR_0x8005, 70
+	setvar VAR_0x8006, 0
+	special CreateObedientEnemyMon
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special BattleSetup_StartLegendaryBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	setvar VAR_LAST_TALKED, 1
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq NavelRock_Top_EventScript_269217
+	compare VAR_RESULT, 4
+	goto_eq NavelRock_Top_EventScript_269225
+	compare VAR_RESULT, 5
+	goto_eq NavelRock_Top_EventScript_269225
+	setflag FLAG_0x092
+	releaseall
+	end
+
+NavelRock_Top_EventScript_269217:: @ 8269217
+	setflag FLAG_0x1DC
+	setvar VAR_0x8004, 250
+	goto NavelRock_Top_EventScript_273776
+	end
+
+NavelRock_Top_EventScript_269225:: @ 8269225
+	setvar VAR_0x8004, 250
+	goto NavelRock_Top_EventScript_273776
+	end
+
+NavelRock_Top_Movement_269230: @ 8269230
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+NavelRock_Top_Movement_269234: @ 8269234
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+NavelRock_Top_Movement_26923A: @ 826923A
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_down
+	delay_16
+	delay_16
+	step_end
+
+NavelRock_Top_Movement_269243: @ 8269243
+	delay_16
+	delay_16
+	walk_in_place_down
+	walk_in_place_down
+	walk_in_place_down
+	walk_in_place_down
+	step_end
+
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..3fa05854e 100644
--- a/data/maps/NavelRock_Up1/header.inc
+++ b/data/maps/NavelRock_Up1/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Up1: @ 8485900
-	.4byte NavelRock_Up1_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Up1_MapEvents
 	.4byte NavelRock_Up1_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..62fed7dc3 100644
--- a/data/maps/NavelRock_Up2/header.inc
+++ b/data/maps/NavelRock_Up2/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Up2: @ 848591C
-	.4byte NavelRock_Up2_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Up2_MapEvents
 	.4byte NavelRock_Up2_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 426
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..723329d92 100644
--- a/data/maps/NavelRock_Up3/header.inc
+++ b/data/maps/NavelRock_Up3/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Up3: @ 8485938
-	.4byte NavelRock_Up3_MapAttributes
+	.4byte NavelRock_LadderRoom1_Layout
 	.4byte NavelRock_Up3_MapEvents
 	.4byte NavelRock_Up3_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 425
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..33501a678 100644
--- a/data/maps/NavelRock_Up4/header.inc
+++ b/data/maps/NavelRock_Up4/header.inc
@@ -1,15 +1,15 @@
 NavelRock_Up4: @ 8485954
-	.4byte NavelRock_Up4_MapAttributes
+	.4byte NavelRock_LadderRoom2_Layout
 	.4byte NavelRock_Up4_MapEvents
 	.4byte NavelRock_Up4_MapScripts
 	.4byte 0x0
 	.2byte MUS_RG_NANADUNGEON
 	.2byte 426
-	.byte 211
+	.byte MAPSEC_NAVEL_ROCK2
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4c333f6b3
--- /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, VAR_0x40BA, 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..092cf841f 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -1,15 +1,15 @@
 NewMauville_Entrance: @ 8484470
-	.4byte NewMauville_Entrance_MapAttributes
+	.4byte NewMauville_Entrance_Layout
 	.4byte NewMauville_Entrance_MapEvents
 	.4byte NewMauville_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 184
-	.byte 62
+	.byte MAPSEC_NEW_MAUVILLE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..af8f10f99
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, 1110
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, 1122
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, 1123
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, 974
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, 975
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
+	coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
+	coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
+	coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
+	coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
+	coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
+	coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
+	coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459
+	coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471
+	coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725
+
+NewMauville_Inside_MapBGEvents: @ 8536610
+	bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
+	bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
+	bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
+	bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
+	bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
+	bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
+	bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F
+	bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, 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..3f8d3192e 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -1,15 +1,15 @@
 NewMauville_Inside: @ 848448C
-	.4byte NewMauville_Inside_MapAttributes
+	.4byte NewMauville_Inside_Layout
 	.4byte NewMauville_Inside_MapEvents
 	.4byte NewMauville_Inside_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 185
-	.byte 62
+	.byte MAPSEC_NEW_MAUVILLE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8c637b2bf
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0
+	object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 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, VAR_0x4051, 0, OldaleTown_EventScript_1E903F
+	coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086
+	coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6
+	coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6
+
+OldaleTown_MapBGEvents: @ 8527914
+	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA
+	bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73
+	bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A
+	bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73
+	bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..8d94687a6 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -1,15 +1,15 @@
 OldaleTown: @ 84825D0
-	.4byte OldaleTown_MapAttributes
+	.4byte OldaleTown_Layout
 	.4byte OldaleTown_MapEvents
 	.4byte OldaleTown_MapScripts
 	.4byte OldaleTown_MapConnections
 	.2byte MUS_MACHI_S4
 	.2byte 11
-	.byte 1
+	.byte MAPSEC_OLDALE_TOWN
 	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
new file mode 100644
index 000000000..32bca3703
--- /dev/null
+++ b/data/maps/OldaleTown/scripts.inc
@@ -0,0 +1,408 @@
+OldaleTown_MapScripts:: @ 81E8EA2
+	map_script 3, OldaleTown_MapScript1_1E8EA8
+	.byte 0
+
+OldaleTown_MapScript1_1E8EA8: @ 81E8EA8
+	call OldaleTown_EventScript_271ED7
+	setflag FLAG_VISITED_OLDALE_TOWN
+	checkflag FLAG_0x074
+	call_if 0, OldaleTown_EventScript_1E8ED2
+	checkflag FLAG_0x084
+	call_if 0, OldaleTown_EventScript_1E8EDE
+	checkflag FLAG_0x074
+	call_if 1, OldaleTown_EventScript_1E8ECC
+	end
+
+OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
+	setvar VAR_0x4051, 1
+	return
+
+OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
+	setobjectxyperm 3, 1, 11
+	setobjectmovementtype 3, 9
+	return
+
+OldaleTown_EventScript_1E8EDE:: @ 81E8EDE
+	setobjectxyperm 2, 13, 14
+	setobjectmovementtype 2, 8
+	return
+
+OldaleTown_EventScript_1E8EEA:: @ 81E8EEA
+	msgbox OldaleTown_Text_1E94DA, 3
+	end
+
+OldaleTown_EventScript_1E8EF3:: @ 81E8EF3
+	msgbox OldaleTown_Text_1E918E, 2
+	end
+
+OldaleTown_EventScript_1E8EFC:: @ 81E8EFC
+	lock
+	faceplayer
+	checkflag FLAG_0x084
+	goto_eq OldaleTown_EventScript_1E8FB9
+	checkflag FLAG_0x001
+	goto_eq OldaleTown_EventScript_1E8FB9
+	setflag FLAG_0x001
+	playbgm MUS_TSURETEK, 0
+	msgbox OldaleTown_Text_1E91C0, 4
+	closemessage
+	switch VAR_FACING
+	case 1, OldaleTown_EventScript_1E8F47
+	case 2, OldaleTown_EventScript_1E8F5E
+	case 4, OldaleTown_EventScript_1E8F75
+	end
+
+OldaleTown_EventScript_1E8F47:: @ 81E8F47
+	applymovement 2, OldaleTown_Movement_1E8FD7
+	applymovement 255, OldaleTown_Movement_1E9001
+	waitmovement 0
+	goto OldaleTown_EventScript_1E8F8C
+	end
+
+OldaleTown_EventScript_1E8F5E:: @ 81E8F5E
+	applymovement 2, OldaleTown_Movement_1E8FE2
+	applymovement 255, OldaleTown_Movement_1E900B
+	waitmovement 0
+	goto OldaleTown_EventScript_1E8F8C
+	end
+
+OldaleTown_EventScript_1E8F75:: @ 81E8F75
+	applymovement 255, OldaleTown_Movement_1E8FF9
+	applymovement 2, OldaleTown_Movement_1E8FCE
+	waitmovement 0
+	goto OldaleTown_EventScript_1E8F8C
+	end
+
+OldaleTown_EventScript_1E8F8C:: @ 81E8F8C
+	msgbox OldaleTown_Text_1E91FD, 4
+	giveitem_std ITEM_POTION
+	compare VAR_RESULT, 0
+	goto_eq OldaleTown_EventScript_1E8FC3
+	msgbox OldaleTown_Text_1E92AF, 4
+	setflag FLAG_0x084
+	fadedefaultbgm
+	release
+	end
+
+OldaleTown_EventScript_1E8FB9:: @ 81E8FB9
+	msgbox OldaleTown_Text_1E92AF, 4
+	release
+	end
+
+OldaleTown_EventScript_1E8FC3:: @ 81E8FC3
+	msgbox gUnknown_08272AD0, 4
+	fadedefaultbgm
+	release
+	end
+
+OldaleTown_Movement_1E8FCE: @ 81E8FCE
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+OldaleTown_Movement_1E8FD7: @ 81E8FD7
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+OldaleTown_Movement_1E8FE2: @ 81E8FE2
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	step_end
+
+OldaleTown_Movement_1E8FEB: @ 81E8FEB
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	walk_in_place_fastest_down
+	step_end
+
+OldaleTown_Movement_1E8FF9: @ 81E8FF9
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+OldaleTown_Movement_1E9001: @ 81E9001
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+OldaleTown_Movement_1E900B: @ 81E900B
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+OldaleTown_Movement_1E9013: @ 81E9013
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+OldaleTown_EventScript_1E901F:: @ 81E901F
+	lock
+	faceplayer
+	checkflag FLAG_0x074
+	goto_eq OldaleTown_EventScript_1E9066
+	msgbox OldaleTown_Text_1E939A, 4
+	closemessage
+	applymovement 3, OldaleTown_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+OldaleTown_EventScript_1E903F:: @ 81E903F
+	lockall
+	applymovement 255, OldaleTown_Movement_1E9182
+	applymovement 3, OldaleTown_Movement_1E9185
+	waitmovement 0
+	msgbox OldaleTown_Text_1E9313, 4
+	closemessage
+	applymovement 3, OldaleTown_Movement_1E918B
+	waitmovement 0
+	releaseall
+	end
+
+OldaleTown_EventScript_1E9066:: @ 81E9066
+	msgbox OldaleTown_Text_1E93F8, 4
+	release
+	end
+
+OldaleTown_EventScript_1E9070:: @ 81E9070
+	lockall
+	applymovement 4, OldaleTown_Movement_27259E
+	waitmovement 0
+	setvar VAR_0x8009, 0
+	goto OldaleTown_EventScript_1E90E6
+	end
+
+OldaleTown_EventScript_1E9086:: @ 81E9086
+	lockall
+	applymovement 4, OldaleTown_Movement_1E9170
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_2725A8
+	waitmovement 0
+	setvar VAR_0x8009, 1
+	goto OldaleTown_EventScript_1E90E6
+	end
+
+OldaleTown_EventScript_1E90A6:: @ 81E90A6
+	lockall
+	applymovement 4, OldaleTown_Movement_1E9173
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_2725A8
+	waitmovement 0
+	setvar VAR_0x8009, 1
+	goto OldaleTown_EventScript_1E90E6
+	end
+
+OldaleTown_EventScript_1E90C6:: @ 81E90C6
+	lockall
+	applymovement 4, OldaleTown_Movement_1E9175
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_2725A8
+	waitmovement 0
+	setvar VAR_0x8009, 1
+	goto OldaleTown_EventScript_1E90E6
+	end
+
+OldaleTown_EventScript_1E90E6:: @ 81E90E6
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq OldaleTown_EventScript_1E90FE
+	compare VAR_RESULT, 1
+	goto_eq OldaleTown_EventScript_1E910C
+	end
+
+OldaleTown_EventScript_1E90FE:: @ 81E90FE
+	msgbox OldaleTown_Text_1E9462, 4
+	goto OldaleTown_EventScript_1E911A
+	end
+
+OldaleTown_EventScript_1E910C:: @ 81E910C
+	msgbox OldaleTown_Text_1E948A, 4
+	goto OldaleTown_EventScript_1E911A
+	end
+
+OldaleTown_EventScript_1E911A:: @ 81E911A
+	closemessage
+	compare VAR_0x8009, 0
+	call_if 1, OldaleTown_EventScript_1E9148
+	compare VAR_0x8009, 1
+	call_if 1, OldaleTown_EventScript_1E915E
+	applymovement 4, OldaleTown_Movement_1E9177
+	waitmovement 0
+	removeobject 4
+	setvar VAR_0x40C7, 2
+	setflag FLAG_0x3D3
+	releaseall
+	end
+
+OldaleTown_EventScript_1E9148:: @ 81E9148
+	compare VAR_FACING, 1
+	goto_if 5, OldaleTown_EventScript_1E915E
+	applymovement 4, OldaleTown_Movement_1E9177
+	waitmovement 0
+	return
+
+OldaleTown_EventScript_1E915E:: @ 81E915E
+	applymovement 255, OldaleTown_Movement_1E917E
+	applymovement 4, OldaleTown_Movement_1E9177
+	waitmovement 0
+	return
+
+OldaleTown_Movement_1E9170: @ 81E9170
+	walk_left
+	walk_left
+	step_end
+
+OldaleTown_Movement_1E9173: @ 81E9173
+	walk_left
+	step_end
+
+OldaleTown_Movement_1E9175: @ 81E9175
+	face_left
+	step_end
+
+OldaleTown_Movement_1E9177: @ 81E9177
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+OldaleTown_Movement_1E917E: @ 81E917E
+	delay_8
+	delay_4
+	walk_in_place_fastest_down
+	step_end
+
+OldaleTown_Movement_1E9182: @ 81E9182
+	delay_8
+	walk_right
+	step_end
+
+OldaleTown_Movement_1E9185: @ 81E9185
+	walk_fast_up
+	walk_in_place_fastest_left
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	step_end
+
+OldaleTown_Movement_1E918B: @ 81E918B
+	walk_down
+	walk_left
+	step_end
+
+OldaleTown_Text_1E918E: @ 81E918E
+	.string "I want to take a rest, so I’m saving my\n"
+	.string "progress.$"
+
+OldaleTown_Text_1E91C0: @ 81E91C0
+	.string "Hi!\n"
+	.string "I work at a POKéMON MART.\p"
+	.string "Can I get you to come with me?$"
+
+OldaleTown_Text_1E91FD: @ 81E91FD
+	.string "This is a POKéMON MART.\n"
+	.string "Just look for our blue roof.\p"
+	.string "We sell a variety of goods including\n"
+	.string "POKé BALLS for catching POKéMON.\p"
+	.string "Here, I’d like you to have this as\n"
+	.string "a promotional item.$"
+
+OldaleTown_Text_1E92AF: @ 81E92AF
+	.string "A POTION can be used anytime, so it’s\n"
+	.string "even more useful than a POKéMON CENTER\l"
+	.string "in certain situations.$"
+
+OldaleTown_Text_1E9313: @ 81E9313
+	.string "Aaaaah! Wait!\n"
+	.string "Please don’t come in here.\p"
+	.string "I just discovered the footprints of\n"
+	.string "a rare POKéMON!\p"
+	.string "Wait until I finish sketching\n"
+	.string "them, okay?$"
+
+OldaleTown_Text_1E939A: @ 81E939A
+	.string "I just discovered the footprints of\n"
+	.string "a rare POKéMON!\p"
+	.string "Wait until I finish sketching\n"
+	.string "them, okay?$"
+
+OldaleTown_Text_1E93F8: @ 81E93F8
+	.string "I finished sketching the footprints of\n"
+	.string "a rare POKéMON.\p"
+	.string "But it turns out they were only my\n"
+	.string "own footprints…$"
+
+OldaleTown_Text_1E9462: @ 81E9462
+	.string "MAY: {PLAYER}{KUN}!\n"
+	.string "Over here!\l"
+	.string "Let’s hurry home!$"
+
+OldaleTown_Text_1E948A: @ 81E948A
+	.string "BRENDAN: I’m heading back to my dad’s\n"
+	.string "LAB now.\l"
+	.string "{PLAYER}, you should hustle back, too.$"
+
+OldaleTown_Text_1E94DA: @ 81E94DA
+	.string "OLDALE TOWN\n"
+	.string "“Where things start off scarce.”$"
+
diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc
new file mode 100644
index 000000000..4933604d4
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 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..934cb22b0 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -1,15 +1,15 @@
 OldaleTown_House1: @ 8482B80
-	.4byte OldaleTown_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte OldaleTown_House1_MapEvents
 	.4byte OldaleTown_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S4
 	.2byte 59
-	.byte 1
+	.byte MAPSEC_OLDALE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a57b07c26
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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..55a6fd8a3 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -1,15 +1,15 @@
 OldaleTown_House2: @ 8482B9C
-	.4byte OldaleTown_House2_MapAttributes
+	.4byte House2_Layout
 	.4byte OldaleTown_House2_MapEvents
 	.4byte OldaleTown_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S4
 	.2byte 60
-	.byte 1
+	.byte MAPSEC_OLDALE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..73adf3718
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 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..4727f0da9 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -1,15 +1,15 @@
 OldaleTown_Mart: @ 8482BF0
-	.4byte OldaleTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte OldaleTown_Mart_MapEvents
 	.4byte OldaleTown_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 1
+	.byte MAPSEC_OLDALE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ba50faea9
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..cdd572a95 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 1
+	.byte MAPSEC_OLDALE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fe8490c9c
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..24cf90aab 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 1
+	.byte MAPSEC_OLDALE_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a601c8381
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0
+	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73
+	bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE
+	bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..5b572682b 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -1,15 +1,15 @@
 PacifidlogTown: @ 848265C
-	.4byte PacifidlogTown_MapAttributes
+	.4byte PacifidlogTown_Layout
 	.4byte PacifidlogTown_MapEvents
 	.4byte PacifidlogTown_MapScripts
 	.4byte PacifidlogTown_MapConnections
 	.2byte MUS_MINAMO
 	.2byte 16
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4bc239ea6
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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..511692df1 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -1,15 +1,15 @@
 PacifidlogTown_House1: @ 8482F8C
-	.4byte PacifidlogTown_House1_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House1_MapEvents
 	.4byte PacifidlogTown_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 77
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fae916c73
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0
+	object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..04d685323 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -1,15 +1,15 @@
 PacifidlogTown_House2: @ 8482FA8
-	.4byte PacifidlogTown_House2_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House2_MapEvents
 	.4byte PacifidlogTown_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 78
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bdf1aae10
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..48f461797 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -1,15 +1,15 @@
 PacifidlogTown_House3: @ 8482FC4
-	.4byte PacifidlogTown_House3_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House3_MapEvents
 	.4byte PacifidlogTown_House3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 77
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bcd3dc6e9
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..a1edad163 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -1,15 +1,15 @@
 PacifidlogTown_House4: @ 8482FE0
-	.4byte PacifidlogTown_House4_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House4_MapEvents
 	.4byte PacifidlogTown_House4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 78
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f039b7694
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..850b4864b 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -1,15 +1,15 @@
 PacifidlogTown_House5: @ 8482FFC
-	.4byte PacifidlogTown_House5_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House5_MapEvents
 	.4byte PacifidlogTown_House5_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 77
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..8040086f8
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 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..b30133654 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1b961ee74
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..db6f8b3df 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 6
+	.byte MAPSEC_PACIFIDLOG_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b3fd71d2c
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, 728
+	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 726
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 830
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0
+	object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A
+	coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6
+	coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2
+	coord_event 8, 13, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4BE
+	coord_event 4, 10, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC691
+	coord_event 4, 11, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6A7
+	coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD
+	coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3
+
+PetalburgCity_MapBGEvents: @ 8526158
+	bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476
+	bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
+	bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
+	bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC47F
+	bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
+	bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
+	bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491
+	bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, 95
+
+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..4dae59652 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -1,15 +1,15 @@
 PetalburgCity: @ 84824B8
-	.4byte PetalburgCity_MapAttributes
+	.4byte PetalburgCity_Layout
 	.4byte PetalburgCity_MapEvents
 	.4byte gStdScripts_End
 	.4byte PetalburgCity_MapConnections
 	.2byte MUS_MACHI_S2
 	.2byte 1
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..209c789a0
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781
+	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 866
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 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, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137
+	bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187
+	bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC
+	bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051EF
+	bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205222
+	bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205255
+	bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205288
+	bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052BB
+	bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052EE
+	bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205321
+	bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205354
+	bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205387
+	bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E
+	bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, 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..e32063894 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -1,15 +1,15 @@
 PetalburgCity_Gym: @ 8483034
-	.4byte PetalburgCity_Gym_MapAttributes
+	.4byte PetalburgCity_Gym_Layout
 	.4byte PetalburgCity_Gym_MapEvents
 	.4byte PetalburgCity_Gym_MapScripts
 	.4byte 0x0
 	.2byte MUS_GIM
 	.2byte 79
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..4688eefe6
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..85bc3e460 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -1,15 +1,15 @@
 PetalburgCity_House1: @ 8483050
-	.4byte PetalburgCity_House1_MapAttributes
+	.4byte House1_Layout
 	.4byte PetalburgCity_House1_MapEvents
 	.4byte PetalburgCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S2
 	.2byte 59
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..17f9001e2
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 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..f7f16748f 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -1,15 +1,15 @@
 PetalburgCity_House2: @ 848306C
-	.4byte PetalburgCity_House2_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte PetalburgCity_House2_MapEvents
 	.4byte PetalburgCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S2
 	.2byte 80
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..88d99918d
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..624c8b6a1 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -1,15 +1,15 @@
 PetalburgCity_Mart: @ 84830C0
-	.4byte PetalburgCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte PetalburgCity_Mart_MapEvents
 	.4byte PetalburgCity_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..509ed0094
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..2a05feb29 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d83875c10
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..473e3c736 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..cc43ca814
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 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..91ee3622b 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -1,15 +1,15 @@
 PetalburgCity_WallysHouse: @ 8483018
-	.4byte PetalburgCity_WallysHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte PetalburgCity_WallysHouse_MapEvents
 	.4byte PetalburgCity_WallysHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S2
 	.2byte 60
-	.byte 7
+	.byte MAPSEC_PETALBURG_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e0bfbc630
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17
+	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 725
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 724
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0
+	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, 1117
+	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7
+	coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079
+
+PetalburgWoods_MapBGEvents: @ 853476C
+	bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B
+	bg_hidden_item_event 39, 35, 3, ITEM_POTION, 58
+	bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, 59
+	bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, 60
+	bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, 61
+	bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, 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..94b5bdfd1 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -1,15 +1,15 @@
 PetalburgWoods: @ 8483FF4
-	.4byte PetalburgWoods_MapAttributes
+	.4byte PetalburgWoods_Layout
 	.4byte PetalburgWoods_MapEvents
 	.4byte PetalburgWoods_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 135
-	.byte 59
+	.byte MAPSEC_PETALBURG_WOODS
 	.byte 0
-	.byte 11
-	.byte 3
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
new file mode 100644
index 000000000..7c9a1ae49
--- /dev/null
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -0,0 +1,486 @@
+PetalburgWoods_MapScripts:: @ 822DFD6
+	.byte 0
+
+PetalburgWoods_EventScript_22DFD7:: @ 822DFD7
+	lockall
+	call PetalburgWoods_EventScript_22E124
+	applymovement 4, PetalburgWoods_Movement_22E1CB
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E34F, 4
+	closemessage
+	playbgm MUS_AQA_0, 0
+	applymovement 3, PetalburgWoods_Movement_22E209
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E3AA, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_22E1F6
+	waitmovement 0
+	applymovement 4, PetalburgWoods_Movement_2725A6
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E428, 4
+	closemessage
+	applymovement 4, PetalburgWoods_Movement_22E1E4
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E457, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_22E20E
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E4A5, 4
+	trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542
+	applymovement 3, PetalburgWoods_Movement_22E1F9
+	waitmovement 0
+	call PetalburgWoods_EventScript_22E138
+	applymovement 255, PetalburgWoods_Movement_22E1E0
+	applymovement 4, PetalburgWoods_Movement_22E1C2
+	waitmovement 0
+	goto PetalburgWoods_EventScript_22E1A7
+	end
+
+PetalburgWoods_EventScript_22E079:: @ 822E079
+	lockall
+	call PetalburgWoods_EventScript_22E124
+	applymovement 4, PetalburgWoods_Movement_22E1D0
+	waitmovement 0
+	applymovement 255, PetalburgWoods_Movement_2725A4
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E34F, 4
+	closemessage
+	playbgm MUS_AQA_0, 0
+	applymovement 3, PetalburgWoods_Movement_22E209
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E3AA, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_22E205
+	waitmovement 0
+	applymovement 4, PetalburgWoods_Movement_2725A6
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E428, 4
+	closemessage
+	applymovement 4, PetalburgWoods_Movement_22E1EA
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E457, 4
+	applymovement 255, PetalburgWoods_Movement_2725A6
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E4A5, 4
+	trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542
+	applymovement 3, PetalburgWoods_Movement_22E1F9
+	waitmovement 0
+	call PetalburgWoods_EventScript_22E138
+	applymovement 255, PetalburgWoods_Movement_22E1E0
+	applymovement 4, PetalburgWoods_Movement_22E1D7
+	waitmovement 0
+	goto PetalburgWoods_EventScript_22E1A7
+	end
+
+PetalburgWoods_EventScript_22E124:: @ 822E124
+	applymovement 4, PetalburgWoods_Movement_22E1B1
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E332, 4
+	closemessage
+	return
+
+PetalburgWoods_EventScript_22E138:: @ 822E138
+	msgbox PetalburgWoods_Text_22E563, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_22E1FD
+	waitmovement 0
+	removeobject 3
+	applymovement 255, PetalburgWoods_Movement_2725AA
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E63D, 4
+	giveitem_std ITEM_GREAT_BALL
+	compare VAR_RESULT, 0
+	goto_eq PetalburgWoods_EventScript_22E17D
+	goto PetalburgWoods_EventScript_22E18B
+	end
+
+PetalburgWoods_EventScript_22E17D:: @ 822E17D
+	msgbox PetalburgWoods_Text_22E741, 4
+	goto PetalburgWoods_EventScript_22E18B
+	end
+
+PetalburgWoods_EventScript_22E18B:: @ 822E18B
+	msgbox PetalburgWoods_Text_22E6C7, 4
+	applymovement 4, PetalburgWoods_Movement_22E1EE
+	waitmovement 0
+	msgbox PetalburgWoods_Text_22E712, 4
+	closemessage
+	return
+
+PetalburgWoods_EventScript_22E1A7:: @ 822E1A7
+	removeobject 4
+	setvar VAR_0x4098, 1
+	releaseall
+	end
+
+PetalburgWoods_Movement_22E1B1: @ 822E1B1
+	face_up
+	delay_16
+	delay_4
+	face_right
+	delay_16
+	delay_8
+	face_left
+	delay_16
+	delay_8
+	face_down
+	delay_16
+	face_right
+	delay_16
+	delay_8
+	face_up
+	delay_16
+	step_end
+
+PetalburgWoods_Movement_22E1C2: @ 822E1C2
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+PetalburgWoods_Movement_22E1CB: @ 822E1CB
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	step_end
+
+PetalburgWoods_Movement_22E1D0: @ 822E1D0
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	step_end
+
+PetalburgWoods_Movement_22E1D7: @ 822E1D7
+	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
+
+PetalburgWoods_Movement_22E1E0: @ 822E1E0
+	delay_16
+	delay_16
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgWoods_Movement_22E1E4: @ 822E1E4
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgWoods_Movement_22E1EA: @ 822E1EA
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_up
+	step_end
+
+PetalburgWoods_Movement_22E1EE: @ 822E1EE
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_up
+	step_end
+
+PetalburgWoods_Movement_22E1F6: @ 822E1F6
+	walk_fast_down
+	walk_fast_down
+	step_end
+
+PetalburgWoods_Movement_22E1F9: @ 822E1F9
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	step_end
+
+PetalburgWoods_Movement_22E1FD: @ 822E1FD
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	delay_16
+	delay_16
+	step_end
+
+PetalburgWoods_Movement_22E205: @ 822E205
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	step_end
+
+PetalburgWoods_Movement_22E209: @ 822E209
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	step_end
+
+PetalburgWoods_Movement_22E20E: @ 822E20E
+	walk_down
+	step_end
+
+PetalburgWoods_EventScript_22E210:: @ 822E210
+	msgbox PetalburgWoods_Text_22EA0C, 2
+	end
+
+PetalburgWoods_EventScript_22E219:: @ 822E219
+	msgbox PetalburgWoods_Text_22EA8B, 2
+	end
+
+PetalburgWoods_EventScript_22E222:: @ 822E222
+	lock
+	faceplayer
+	checkflag FLAG_0x129
+	goto_eq PetalburgWoods_EventScript_22E251
+	msgbox PetalburgWoods_Text_22EAFE, 4
+	giveitem_std ITEM_MIRACLE_SEED
+	compare VAR_RESULT, 0
+	goto_eq PetalburgWoods_EventScript_272054
+	setflag FLAG_0x129
+	release
+	end
+
+PetalburgWoods_EventScript_22E251:: @ 822E251
+	msgbox PetalburgWoods_Text_22EB63, 4
+	release
+	end
+
+PetalburgWoods_EventScript_22E25B:: @ 822E25B
+	msgbox PetalburgWoods_Text_22EC10, 3
+	end
+
+PetalburgWoods_EventScript_22E264:: @ 822E264
+	msgbox PetalburgWoods_Text_22ED07, 3
+	end
+
+PetalburgWoods_EventScript_22E26D:: @ 822E26D
+	trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1
+	msgbox PetalburgWoods_Text_22E7EF, 6
+	end
+
+PetalburgWoods_EventScript_22E284:: @ 822E284
+	trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq PetalburgWoods_EventScript_22E31B
+	setvar VAR_0x8004, 621
+	specialvar VAR_RESULT, sub_813B4E0
+	compare VAR_RESULT, 0
+	goto_eq PetalburgWoods_EventScript_22E2EF
+	msgbox PetalburgWoods_Text_22E889, 4
+	release
+	end
+
+PetalburgWoods_EventScript_22E2C5:: @ 822E2C5
+	special sub_80B4808
+	waitmovement 0
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq PetalburgWoods_EventScript_22E2D6
+	release
+	end
+
+PetalburgWoods_EventScript_22E2D6:: @ 822E2D6
+	msgbox PetalburgWoods_Text_22E8C3, 4
+	setvar VAR_0x8004, 621
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 621
+	callstd 8
+	release
+	end
+
+PetalburgWoods_EventScript_22E2EF:: @ 822E2EF
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq PetalburgWoods_EventScript_22E302
+	msgbox PetalburgWoods_Text_22E889, 4
+	release
+	end
+
+PetalburgWoods_EventScript_22E302:: @ 822E302
+	msgbox PetalburgWoods_Text_22E914, 4
+	setvar VAR_0x8004, 621
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 621
+	callstd 8
+	release
+	end
+
+PetalburgWoods_EventScript_22E31B:: @ 822E31B
+	trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998
+	msgbox PetalburgWoods_Text_22E9B6, 6
+	end
+
+PetalburgWoods_Text_22E332: @ 822E332
+	.string "Hmmm…\n"
+	.string "Not a one to be found…$"
+
+PetalburgWoods_Text_22E34F: @ 822E34F
+	.string "Hello, have you seen any POKéMON\n"
+	.string "called SHROOMISH around here?\p"
+	.string "I really love that POKéMON.$"
+
+PetalburgWoods_Text_22E3AA: @ 822E3AA
+	.string "I was going to ambush you, but you\n"
+	.string "had to dawdle in PETALBURG WOODS\l"
+	.string "forever, didn’t you?\p"
+	.string "I got sick of waiting, so here I am!$"
+
+PetalburgWoods_Text_22E428: @ 822E428
+	.string "You! DEVON RESEARCHER!\p"
+	.string "Hand over those papers!$"
+
+PetalburgWoods_Text_22E457: @ 822E457
+	.string "Aiyeeeh!\p"
+	.string "You’re a POKéMON TRAINER, aren’t you?\n"
+	.string "You’ve got to help me, please!$"
+
+PetalburgWoods_Text_22E4A5: @ 822E4A5
+	.string "Hunh? What do you think you’re doing?\n"
+	.string "What, you’re going to protect him?\p"
+	.string "No one who crosses TEAM AQUA\n"
+	.string "gets any mercy, not even a kid!\p"
+	.string "Come on and battle me!$"
+
+PetalburgWoods_Text_22E542: @ 822E542
+	.string "You’re kidding me! You’re tough!$"
+
+PetalburgWoods_Text_22E563: @ 822E563
+	.string "Grrr… You’ve got some nerve\n"
+	.string "meddling with TEAM AQUA!\l"
+	.string "Come on and battle me again!\p"
+	.string "I wish I could say that, but I’m out of\n"
+	.string "POKéMON…\p"
+	.string "And, hey, we of TEAM AQUA are also\n"
+	.string "after something in RUSTBORO.\p"
+	.string "I’ll let you go today!$"
+
+PetalburgWoods_Text_22E63D: @ 822E63D
+	.string "Whew…\n"
+	.string "That was awfully close!\p"
+	.string "Thanks to you, he didn’t rob me of\n"
+	.string "these important papers.\p"
+	.string "I know, I’ll give you a GREAT BALL as\n"
+	.string "my thanks!$"
+
+PetalburgWoods_Text_22E6C7: @ 822E6C7
+	.string "Didn’t that TEAM AQUA thug say\n"
+	.string "they were after something in\l"
+	.string "RUSTBORO, too?$"
+
+PetalburgWoods_Text_22E712: @ 822E712
+	.string "Uh-oh! It’s a crisis!\n"
+	.string "I can’t be wasting time!$"
+
+PetalburgWoods_Text_22E741: @ 822E741
+	.string "You’re loaded with items.\n"
+	.string "I can’t give you this GREAT BALL.$"
+
+PetalburgWoods_Text_22E77D: @ 822E77D
+	.string "I caught a whole bunch of POKéMON!\p"
+	.string "Go, go, go!\n"
+	.string "My BUG POKéMON team!$"
+
+PetalburgWoods_Text_22E7C1: @ 822E7C1
+	.string "I have all these POKéMON,\n"
+	.string "but I couldn’t win…$"
+
+PetalburgWoods_Text_22E7EF: @ 822E7EF
+	.string "I caught a bunch of POKéMON.\n"
+	.string "Now I’m out of POKé BALLS.$"
+
+PetalburgWoods_Text_22E827: @ 822E827
+	.string "If you take BUG POKéMON to school,\n"
+	.string "you get to be instantly popular!$"
+
+PetalburgWoods_Text_22E86B: @ 822E86B
+	.string "I can’t be popular if I lose.$"
+
+PetalburgWoods_Text_22E889: @ 822E889
+	.string "If you have a big BUG POKéMON,\n"
+	.string "people respect you for it.$"
+
+PetalburgWoods_Text_22E8C3: @ 822E8C3
+	.string "I want a rematch when my BUG\n"
+	.string "POKéMON grow up!\p"
+	.string "I’m registering you in my POKéNAV!$"
+
+PetalburgWoods_Text_22E914: @ 822E914
+	.string "I want a rematch when my BUG \n"
+	.string "POKéMON grow up!\p"
+	.string "I’m registering you in my POKéNAV!$"
+
+PetalburgWoods_Text_22E966: @ 822E966
+	.string "My BUG POKéMON have grown.\n"
+	.string "I’ll be popular again.$"
+
+PetalburgWoods_Text_22E998: @ 822E998
+	.string "I can’t be popular if I lose.$"
+
+PetalburgWoods_Text_22E9B6: @ 822E9B6
+	.string "You get to be popular if you have\n"
+	.string "strong POKéMON, right?\l"
+	.string "So, I’ve been training hard.$"
+
+PetalburgWoods_Text_22EA0C: @ 822EA0C
+	.string "Yo, there!\n"
+	.string "Your POKéMON doing okay?\p"
+	.string "If your POKéMON are weak and you want\n"
+	.string "to avoid battles, you should stay out\l"
+	.string "of tall grass.$"
+
+PetalburgWoods_Text_22EA8B: @ 822EA8B
+	.string "Sometimes, there are things on the\n"
+	.string "ground even if you can’t see them.\p"
+	.string "That’s why I always check where I’m\n"
+	.string "walking.$"
+
+PetalburgWoods_Text_22EAFE: @ 822EAFE
+	.string "Oh, neat!\n"
+	.string "That’s the BADGE from RUSTBORO GYM!\p"
+	.string "You must be a TRAINER.\n"
+	.string "You should try using this item.$"
+
+PetalburgWoods_Text_22EB63: @ 822EB63
+	.string "It’s a MIRACLE SEED.\n"
+	.string "If a POKéMON holds that item, its\l"
+	.string "GRASS-type moves become stronger.\p"
+	.string "Besides MIRACLE SEED, I think there are\n"
+	.string "other convenient items for POKéMON\l"
+	.string "to hold.$"
+
+PetalburgWoods_Text_22EC10: @ 822EC10
+	.string "TRAINER TIPS\p"
+	.string "Any POKéMON that appears even once\n"
+	.string "in a battle is awarded EXP Points.\p"
+	.string "To raise a weak POKéMON, put it at the\n"
+	.string "left of the team list.\p"
+	.string "As soon as a battle starts, switch it\n"
+	.string "out. It will earn EXP Points without\l"
+	.string "being exposed to any harm.$"
+
+PetalburgWoods_Text_22ED07: @ 822ED07
+	.string "TRAINER TIPS\p"
+	.string "In addition to Hit Points (HP), POKéMON\n"
+	.string "have Power Points (PP) that are used to\l"
+	.string "make moves during battle.\p"
+	.string "If a POKéMON runs out of PP, it must be\n"
+	.string "taken to a POKéMON CENTER.$"
+
diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc
new file mode 100644
index 000000000..8e1916a5a
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_TEMP_0, 0, gUnknown_0827741D
+	coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447
+	coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432
+	coord_event 13, 6, 3, VAR_TEMP_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..9029f306f 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -1,15 +1,15 @@
 RecordCorner: @ 8484D68
-	.4byte RecordCorner_MapAttributes
+	.4byte RecordCorner_Layout
 	.4byte RecordCorner_MapEvents
 	.4byte RecordCorner_MapScripts
 	.4byte 0x0
 	.2byte MUS_RAINBOW
 	.2byte 223
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d43253baa
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, 720
+	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, 750
+	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, 897
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991
+
+Route101_MapCoordEvents: @ 8527F28
+	coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE
+	coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE
+	coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E
+	coord_event 11, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E
+	coord_event 6, 16, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
+	coord_event 6, 15, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
+	coord_event 6, 17, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
+	coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64
+	coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A
+
+Route101_MapBGEvents: @ 8527FB8
+	bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, 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..64836245f 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -1,15 +1,15 @@
 Route101: @ 8482678
-	.4byte Route101_MapAttributes
+	.4byte Route101_Layout
 	.4byte Route101_MapEvents
 	.4byte Route101_MapScripts
 	.4byte Route101_MapConnections
 	.2byte MUS_DOORO1
 	.2byte 17
-	.byte 16
+	.byte MAPSEC_ROUTE_101
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..58a0bf64b
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0
+	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0
+
+Route102_MapBGEvents: @ 85280B0
+	bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3
+	bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, 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..dc2b3240a 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -1,15 +1,15 @@
 Route102: @ 8482694
-	.4byte Route102_MapAttributes
+	.4byte Route102_Layout
 	.4byte Route102_MapEvents
 	.4byte Route102_MapScripts
 	.4byte Route102_MapConnections
 	.2byte MUS_DOORO1
 	.2byte 18
-	.byte 17
+	.byte MAPSEC_ROUTE_102
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6581eb582
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, 898
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, 1114
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 18
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, 19
+	object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0
+	object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0
+	object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..c7510701e 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -1,15 +1,15 @@
 Route103: @ 84826B0
-	.4byte Route103_MapAttributes
+	.4byte Route103_Layout
 	.4byte Route103_MapEvents
 	.4byte Route103_MapScripts
 	.4byte Route103_MapConnections
 	.2byte MUS_DOORO1
 	.2byte 19
-	.byte 18
+	.byte MAPSEC_ROUTE_103
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
new file mode 100644
index 000000000..8bf597902
--- /dev/null
+++ b/data/maps/Route103/scripts.inc
@@ -0,0 +1,368 @@
+Route103_MapScripts:: @ 81EC38E
+	map_script 3, Route103_MapScript1_1EC399
+	map_script 1, Route103_MapScript1_1EC3A4
+	.byte 0
+
+Route103_MapScript1_1EC399: @ 81EC399
+	call Route103_EventScript_271ED7
+	call Route103_EventScript_2720AD
+	end
+
+Route103_MapScript1_1EC3A4: @ 81EC3A4
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 1, Route103_EventScript_1EC3AE
+	end
+
+Route103_EventScript_1EC3AE:: @ 81EC3AE
+	setmetatile 45, 5, 159, 1
+	setmetatile 45, 6, 167, 0
+	return
+
+Route103_EventScript_1EC3C1:: @ 81EC3C1
+	lockall
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq Route103_EventScript_1EC3DA
+	compare VAR_RESULT, 1
+	goto_eq Route103_EventScript_1EC434
+	end
+
+Route103_EventScript_1EC3DA:: @ 81EC3DA
+	msgbox Route103_Text_1EC7A6, 4
+	closemessage
+	playbgm MUS_GIRL_SUP, 1
+	applymovement 2, Route103_Movement_27259E
+	waitmovement 0
+	applymovement 2, Route103_Movement_272598
+	waitmovement 0
+	applymovement 2, Route103_Movement_27259A
+	waitmovement 0
+	msgbox Route103_Text_1EC7DE, 4
+	switch VAR_FIRST_POKE
+	case 0, Route103_EventScript_1EC48E
+	case 1, Route103_EventScript_1EC49E
+	case 2, Route103_EventScript_1EC4AE
+	end
+
+Route103_EventScript_1EC434:: @ 81EC434
+	msgbox Route103_Text_1EC989, 4
+	closemessage
+	playbgm MUS_BOY_SUP, 1
+	applymovement 2, Route103_Movement_27259E
+	waitmovement 0
+	applymovement 2, Route103_Movement_272598
+	waitmovement 0
+	applymovement 2, Route103_Movement_27259A
+	waitmovement 0
+	msgbox Route103_Text_1EC9CE, 4
+	switch VAR_FIRST_POKE
+	case 0, Route103_EventScript_1EC4BE
+	case 1, Route103_EventScript_1EC4CE
+	case 2, Route103_EventScript_1EC4DE
+	end
+
+Route103_EventScript_1EC48E:: @ 81EC48E
+	trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881
+	goto Route103_EventScript_1EC4EE
+	end
+
+Route103_EventScript_1EC49E:: @ 81EC49E
+	trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881
+	goto Route103_EventScript_1EC4EE
+	end
+
+Route103_EventScript_1EC4AE:: @ 81EC4AE
+	trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881
+	goto Route103_EventScript_1EC4EE
+	end
+
+Route103_EventScript_1EC4BE:: @ 81EC4BE
+	trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59
+	goto Route103_EventScript_1EC4FC
+	end
+
+Route103_EventScript_1EC4CE:: @ 81EC4CE
+	trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59
+	goto Route103_EventScript_1EC4FC
+	end
+
+Route103_EventScript_1EC4DE:: @ 81EC4DE
+	trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59
+	goto Route103_EventScript_1EC4FC
+	end
+
+Route103_EventScript_1EC4EE:: @ 81EC4EE
+	msgbox Route103_Text_1EC8AE, 4
+	goto Route103_EventScript_1EC50A
+	end
+
+Route103_EventScript_1EC4FC:: @ 81EC4FC
+	msgbox Route103_Text_1ECA79, 4
+	goto Route103_EventScript_1EC50A
+	end
+
+Route103_EventScript_1EC50A:: @ 81EC50A
+	closemessage
+	switch VAR_FACING
+	case 1, Route103_EventScript_1EC585
+	case 2, Route103_EventScript_1EC53D
+	case 3, Route103_EventScript_1EC561
+	case 4, Route103_EventScript_1EC561
+	end
+
+Route103_EventScript_1EC53D:: @ 81EC53D
+	applymovement 255, Route103_Movement_1EC5C8
+	applymovement 2, Route103_Movement_1EC5BE
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_1EC5C1
+	waitmovement 0
+	goto Route103_EventScript_1EC5A2
+	end
+
+Route103_EventScript_1EC561:: @ 81EC561
+	applymovement 255, Route103_Movement_1EC5D6
+	applymovement 2, Route103_Movement_1EC5CE
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_1EC5D0
+	waitmovement 0
+	goto Route103_EventScript_1EC5A2
+	end
+
+Route103_EventScript_1EC585:: @ 81EC585
+	applymovement 2, Route103_Movement_1EC5CE
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_1EC5D0
+	waitmovement 0
+	goto Route103_EventScript_1EC5A2
+	end
+
+Route103_EventScript_1EC5A2:: @ 81EC5A2
+	removeobject 2
+	setvar VAR_0x4084, 4
+	clearflag FLAG_0x379
+	setflag FLAG_0x082
+	setvar VAR_0x40C7, 1
+	clearflag FLAG_0x3D3
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	releaseall
+	end
+
+Route103_Movement_1EC5BE: @ 81EC5BE
+	walk_left
+	walk_down
+	step_end
+
+Route103_Movement_1EC5C1: @ 81EC5C1
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+Route103_Movement_1EC5C8: @ 81EC5C8
+	delay_16
+	delay_4
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+Route103_Movement_1EC5CE: @ 81EC5CE
+	walk_down
+	step_end
+
+Route103_Movement_1EC5D0: @ 81EC5D0
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+Route103_Movement_1EC5D6: @ 81EC5D6
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+Route103_EventScript_1EC5D9:: @ 81EC5D9
+	msgbox Route103_Text_1ECB73, 2
+	end
+
+Route103_EventScript_1EC5E2:: @ 81EC5E2
+	msgbox Route103_Text_1ECBB5, 2
+	end
+
+Route103_EventScript_1EC5EB:: @ 81EC5EB
+	msgbox Route103_Text_1ECC1A, 3
+	end
+
+Route103_EventScript_1EC5F4:: @ 81EC5F4
+	trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F
+	msgbox Route103_Text_2949B4, 6
+	end
+
+Route103_EventScript_1EC60B:: @ 81EC60B
+	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route103_EventScript_1EC653
+	msgbox Route103_Text_294A52, 6
+	end
+
+Route103_EventScript_1EC63A:: @ 81EC63A
+	msgbox Route103_Text_294B8A, 4
+	setvar VAR_0x8004, 481
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 481
+	callstd 8
+	release
+	end
+
+Route103_EventScript_1EC653:: @ 81EC653
+	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF
+	msgbox Route103_Text_294C93, 6
+	end
+
+Route103_EventScript_1EC66E:: @ 81EC66E
+	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route103_EventScript_1EC6B6
+	msgbox Route103_Text_294B40, 6
+	end
+
+Route103_EventScript_1EC69D:: @ 81EC69D
+	msgbox Route103_Text_294B8A, 4
+	setvar VAR_0x8004, 481
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 481
+	callstd 8
+	release
+	end
+
+Route103_EventScript_1EC6B6:: @ 81EC6B6
+	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB
+	msgbox Route103_Text_294D89, 6
+	end
+
+Route103_EventScript_1EC6D1:: @ 81EC6D1
+	trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92
+	msgbox Route103_Text_294EBB, 6
+	end
+
+Route103_EventScript_1EC6E8:: @ 81EC6E8
+	trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route103_EventScript_1EC733
+	msgbox Route103_Text_294F42, 4
+	release
+	end
+
+Route103_EventScript_1EC714:: @ 81EC714
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route103_Text_294F7E, 4
+	setvar VAR_0x8004, 293
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 293
+	callstd 8
+	release
+	end
+
+Route103_EventScript_1EC733:: @ 81EC733
+	trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006
+	msgbox Route103_Text_29501E, 6
+	end
+
+Route103_EventScript_1EC74A:: @ 81EC74A
+	trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B
+	msgbox Route103_Text_295246, 6
+	end
+
+Route103_EventScript_1EC761:: @ 81EC761
+	trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6
+	msgbox Route103_Text_2951DE, 6
+	end
+
+Route103_EventScript_1EC778:: @ 81EC778
+	trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093
+	msgbox Route103_Text_2950AA, 6
+	end
+
+Route103_EventScript_1EC78F:: @ 81EC78F
+	trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146
+	msgbox Route103_Text_29514D, 6
+	end
+
+Route103_Text_1EC7A6: @ 81EC7A6
+	.string "MAY: Let’s see… The POKéMON found\n"
+	.string "on ROUTE 103 include…$"
+
+Route103_Text_1EC7DE: @ 81EC7DE
+	.string "Oh, hi, {PLAYER}{KUN}!\p"
+	.string "…Oh, I see, my dad gave you\n"
+	.string "a POKéMON as a gift.\p"
+	.string "Since we’re here, let’s have a quick\n"
+	.string "battle!\p"
+	.string "I’ll give you a taste of what being\n"
+	.string "a TRAINER is like.$"
+
+Route103_Text_1EC881: @ 81EC881
+	.string "Wow! That’s great!\n"
+	.string "{PLAYER}{KUN}, you’re pretty good!$"
+
+Route103_Text_1EC8AE: @ 81EC8AE
+	.string "MAY: I think I know why my dad has\n"
+	.string "an eye out for you now.\p"
+	.string "I mean, you just got that POKéMON,\n"
+	.string "but it already likes you.\p"
+	.string "You might be able to befriend any\n"
+	.string "kind of POKéMON easily.\p"
+	.string "Well, it’s time to head back to\n"
+	.string "the LAB.$"
+
+Route103_Text_1EC989: @ 81EC989
+	.string "BRENDAN: Okay, so it’s this one and\n"
+	.string "that one that live on ROUTE 103…$"
+
+Route103_Text_1EC9CE: @ 81EC9CE
+	.string "Hey, it’s {PLAYER}!\p"
+	.string "…Oh, yeah, Dad gave you a POKéMON.\p"
+	.string "Since we’re here, how about a little\n"
+	.string "battle?\p"
+	.string "I’ll teach you what being a TRAINER’s\n"
+	.string "about!$"
+
+Route103_Text_1ECA59: @ 81ECA59
+	.string "Huh, {PLAYER}, you’re not too shabby.$"
+
+Route103_Text_1ECA79: @ 81ECA79
+	.string "BRENDAN: I think I get it.\n"
+	.string "I think I know why my dad has his eye\l"
+	.string "out for you now.\p"
+	.string "Look, your POKéMON already likes you,\n"
+	.string "even though you just got it.\p"
+	.string "{PLAYER}, I get the feeling that you\n"
+	.string "could befriend any POKéMON with ease.\p"
+	.string "We should head back to the LAB.$"
+
+Route103_Text_1ECB73: @ 81ECB73
+	.string "My POKéMON is staggeringly tired…\n"
+	.string "I should have brought a POTION…$"
+
+Route103_Text_1ECBB5: @ 81ECBB5
+	.string "If you cross the sea from here,\n"
+	.string "it’ll be a shortcut to OLDALE TOWN.\p"
+	.string "Fufufu, that’s useful, isn’t it?$"
+
+Route103_Text_1ECC1A: @ 81ECC1A
+	.string "ROUTE 103\n"
+	.string "{0x7A} OLDALE TOWN$"
+
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..497ec2dec
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0
+	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 742
+	object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 738
+	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, BerryTreeScript, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002
+	object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906
+	object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0
+	object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0
+	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, 1057
+	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, 1115
+	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, 17
+	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, 1135
+	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0
+	object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0
+	object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_0x4063, 1, Route104_EventScript_1ECCB3
+
+Route104_MapBGEvents: @ 8528664
+	bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018
+	bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021
+	bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A
+	bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033
+	bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C
+	bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, 44
+	bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, 62
+	bg_hidden_item_event 14, 55, 3, ITEM_POTION, 37
+	bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, 85
+	bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, 88
+
+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..df6f0d34a 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -1,15 +1,15 @@
 Route104: @ 84826CC
-	.4byte Route104_MapAttributes
+	.4byte Route104_Layout
 	.4byte Route104_MapEvents
 	.4byte Route104_MapScripts
 	.4byte Route104_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 20
-	.byte 19
+	.byte MAPSEC_ROUTE_104
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6410f02fc
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 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..139efeb74 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -1,15 +1,15 @@
 Route104_MrBrineysHouse: @ 8483D70
-	.4byte Route104_MrBrineysHouse_MapAttributes
+	.4byte Route104_MrBrineysHouse_Layout
 	.4byte Route104_MrBrineysHouse_MapEvents
 	.4byte Route104_MrBrineysHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S2
 	.2byte 102
-	.byte 19
+	.byte MAPSEC_ROUTE_104
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3d622f106
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 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..cd34cd3f4 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -1,15 +1,15 @@
 Route104_PrettyPetalFlowerShop: @ 8483D8C
-	.4byte Route104_PrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S2
 	.2byte 117
-	.byte 19
+	.byte MAPSEC_ROUTE_104
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ea0b1390a 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -1,15 +1,15 @@
 Route104_Prototype: @ 8485AF8
-	.4byte Route104_Prototype_MapAttributes
+	.4byte Route104_Prototype_Layout
 	.4byte Route104_Prototype_MapEvents
 	.4byte Route104_Prototype_MapScripts
 	.4byte 0x0
 	.2byte MUS_NEXTROAD
 	.2byte 287
-	.byte 19
+	.byte MAPSEC_ROUTE_104
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fce17ef00 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -1,15 +1,15 @@
 Route104_PrototypePrettyPetalFlowerShop: @ 8485B14
-	.4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
 	.2byte MUS_NEXTROAD
 	.2byte 117
-	.byte 19
+	.byte MAPSEC_ROUTE_104
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..aa9b9b420
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, 1003
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
+	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
+
+Route105_MapWarps: @ 85287B0
+	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
+
+Route105_MapBGEvents: @ 85287B8
+	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, 89
+	bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, 111
+
+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..59ea4f3df 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -1,15 +1,15 @@
 Route105: @ 84826E8
-	.4byte Route105_MapAttributes
+	.4byte Route105_Layout
 	.4byte Route105_MapEvents
 	.4byte Route105_MapScripts
 	.4byte Route105_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 21
-	.byte 20
+	.byte MAPSEC_ROUTE_105
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..11541f2bf
--- /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, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0
+	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, 63
+	bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, 46
+	bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, 47
+	bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, 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..9292cae39 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,15 +1,15 @@
 Route106: @ 8482704
-	.4byte Route106_MapAttributes
+	.4byte Route106_Layout
 	.4byte Route106_MapEvents
 	.4byte Route106_MapScripts
 	.4byte Route106_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 22
-	.byte 21
+	.byte MAPSEC_ROUTE_106
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b67e98384
--- /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, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route107_EventScript_1EE625, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 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..e038ea705 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,15 +1,15 @@
 Route107: @ 8482720
-	.4byte Route107_MapAttributes
+	.4byte Route107_Layout
 	.4byte Route107_MapEvents
 	.4byte Route107_MapScripts
 	.4byte Route107_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 23
-	.byte 22
+	.byte MAPSEC_ROUTE_107
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e18cf16d0
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86
+
+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..a6314172f 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -1,15 +1,15 @@
 Route108: @ 848273C
-	.4byte Route108_MapAttributes
+	.4byte Route108_Layout
 	.4byte Route108_MapEvents
 	.4byte Route108_MapScripts
 	.4byte Route108_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 24
-	.byte 23
+	.byte MAPSEC_ROUTE_108
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f74e1ceab
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 744
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, 741
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0
+	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0
+	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005
+	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0
+	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0
+	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0
+	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0
+	object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0
+	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0
+	object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0
+	object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, 1140
+	object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B
+	bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34
+	bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, 50
+	bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, 52
+	bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, 51
+	bg_hidden_item_event 28, 20, 3, ITEM_ETHER, 64
+	bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, 90
+	bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, 91
+
+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..489ea8789 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -1,15 +1,15 @@
 Route109: @ 8482758
-	.4byte Route109_MapAttributes
+	.4byte Route109_Layout
 	.4byte Route109_MapEvents
 	.4byte Route109_MapScripts
 	.4byte Route109_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 25
-	.byte 24
+	.byte MAPSEC_ROUTE_109
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..9c12bd582
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0
+	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 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..1f6f067ca 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -1,15 +1,15 @@
 Route109_SeashoreHouse: @ 8485B30
-	.4byte Route109_SeashoreHouse_MapAttributes
+	.4byte Route109_SeashoreHouse_Layout
 	.4byte Route109_SeashoreHouse_MapEvents
 	.4byte Route109_SeashoreHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_HIGHTOWN
 	.2byte 243
-	.byte 24
+	.byte MAPSEC_ROUTE_109
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6e6d17d9a
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0
+	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0
+	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF314, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0
+	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF302, 0
+	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_1EF529, 0
+	object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_1EF540, 0
+	object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0
+	object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0
+	object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_1EF409, 0
+	object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 1, 4, Route110_EventScript_1EF420, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_1EF482, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, 1007
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, 1006
+	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0
+	object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900
+	object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 900
+	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0
+	object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, 919
+	object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 922
+	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0
+	object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0
+	object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0
+	object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, 1141
+	object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_0x40A9, 2, Route110_EventScript_1EF661
+	coord_event 29, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661
+	coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D
+	coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758
+	coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763
+	coord_event 7, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9CB
+	coord_event 8, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9D6
+	coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1
+	coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC
+
+Route110_MapBGEvents: @ 8529110
+	bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353
+	bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365
+	bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A
+	bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF341
+	bg_event 7, 79, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF35C
+	bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF36E
+	bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1
+	bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1
+	bg_event 33, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF377
+	bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380
+	bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389
+	bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392
+	bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, 54
+	bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, 53
+	bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, 65
+	bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, 55
+	bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, 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..c1dd03789 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -1,15 +1,15 @@
 Route110: @ 8482774
-	.4byte Route110_MapAttributes
+	.4byte Route110_Layout
 	.4byte Route110_MapEvents
 	.4byte Route110_MapScripts
 	.4byte Route110_MapConnections
 	.2byte MUS_DOORO_X1
 	.2byte 26
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
new file mode 100644
index 000000000..40d6a2e69
--- /dev/null
+++ b/data/maps/Route110/scripts.inc
@@ -0,0 +1,1030 @@
+Route110_MapScripts:: @ 81EF269
+	map_script 5, Route110_MapScript1_1EF279
+	map_script 3, Route110_MapScript1_1EF27D
+	map_script 2, Route110_MapScript2_1EF297
+	.byte 0
+
+Route110_MapScript1_1EF279: @ 81EF279
+	special UpdateCyclingRoadState
+	end
+
+Route110_MapScript1_1EF27D: @ 81EF27D
+	call Route110_EventScript_271ED7
+	call Route110_EventScript_271EFB
+	compare VAR_0x40A9, 1
+	call_if 1, Route110_EventScript_1EF293
+	end
+
+Route110_EventScript_1EF293:: @ 81EF293
+	savebgm MUS_CYCLING
+	return
+
+Route110_MapScript2_1EF297: @ 81EF297
+	map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1
+	.2byte 0
+
+Route110_EventScript_1EF2A1:: @ 81EF2A1
+	special Special_BeginCyclingRoadChallenge
+	setvar VAR_0x40A9, 2
+	return
+
+Route110_EventScript_1EF2AA:: @ 81EF2AA
+	lock
+	faceplayer
+	msgbox Route110_Text_1EFB5D, 4
+	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_1EF2C0:: @ 81EF2C0
+	lock
+	faceplayer
+	msgbox Route110_Text_1EFB93, 4
+	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_1EF2D6:: @ 81EF2D6
+	lock
+	faceplayer
+	msgbox Route110_Text_1EFBCA, 4
+	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_1EF2EC:: @ 81EF2EC
+	lock
+	faceplayer
+	msgbox Route110_Text_1EFC0D, 4
+	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_1EF302:: @ 81EF302
+	msgbox Route110_Text_1EFFC3, 2
+	end
+
+Route110_EventScript_1EF30B:: @ 81EF30B
+	msgbox Route110_Text_1F0006, 2
+	end
+
+Route110_EventScript_1EF314:: @ 81EF314
+	msgbox Route110_Text_1F006A, 2
+	end
+
+Route110_EventScript_1EF31D:: @ 81EF31D
+	msgbox Route110_Text_1F0261, 2
+	end
+
+Route110_EventScript_1EF326:: @ 81EF326
+	msgbox Route110_Text_1F02CA, 2
+	end
+
+Route110_EventScript_1EF32F:: @ 81EF32F
+	msgbox Route110_Text_1F030E, 2
+	end
+
+Route110_EventScript_1EF338:: @ 81EF338
+	msgbox Route110_Text_1F0390, 2
+	end
+
+Route110_EventScript_1EF341:: @ 81EF341
+	msgbox Route110_Text_1F0812, 3
+	end
+
+Route110_EventScript_1EF34A:: @ 81EF34A
+	msgbox Route110_Text_1F082D, 3
+	end
+
+Route110_EventScript_1EF353:: @ 81EF353
+	msgbox Route110_Text_1F0842, 3
+	end
+
+Route110_EventScript_1EF35C:: @ 81EF35C
+	msgbox Route110_Text_1F08CD, 3
+	end
+
+Route110_EventScript_1EF365:: @ 81EF365
+	msgbox Route110_Text_1F08E3, 3
+	end
+
+Route110_EventScript_1EF36E:: @ 81EF36E
+	msgbox Route110_Text_1F08F3, 3
+	end
+
+Route110_EventScript_1EF377:: @ 81EF377
+	msgbox Route110_Text_1F090D, 3
+	end
+
+Route110_EventScript_1EF380:: @ 81EF380
+	msgbox Route110_Text_1F0992, 3
+	end
+
+Route110_EventScript_1EF389:: @ 81EF389
+	msgbox Route110_Text_1F09DB, 3
+	end
+
+Route110_EventScript_1EF392:: @ 81EF392
+	lockall
+	specialvar VAR_RESULT, GetRecordedCyclingRoadResults
+	compare VAR_RESULT, 0
+	goto_eq Route110_EventScript_1EF3AD
+	msgbox Route110_Text_1F0A1E, 4
+	releaseall
+	end
+
+Route110_EventScript_1EF3AD:: @ 81EF3AD
+	msgbox Route110_Text_1F0A5E, 4
+	releaseall
+	end
+
+Route110_EventScript_1EF3B7:: @ 81EF3B7
+	lock
+	faceplayer
+	specialvar VAR_RESULT, GetPlayerAvatarBike
+	compare VAR_RESULT, 1
+	goto_eq Route110_EventScript_1EF3E8
+	compare VAR_0x40A9, 0
+	goto_eq Route110_EventScript_1EF3DE
+	msgbox Route110_Text_1F06FB, 4
+	release
+	end
+
+Route110_EventScript_1EF3DE:: @ 81EF3DE
+	msgbox Route110_Text_1F0661, 4
+	release
+	end
+
+Route110_EventScript_1EF3E8:: @ 81EF3E8
+	msgbox Route110_Text_1F0755, 4
+	release
+	end
+
+Route110_EventScript_1EF3F2:: @ 81EF3F2
+	trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064
+	msgbox Route110_Text_29808A, 6
+	end
+
+Route110_EventScript_1EF409:: @ 81EF409
+	trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5
+	msgbox Route110_Text_2980F8, 6
+	end
+
+Route110_EventScript_1EF420:: @ 81EF420
+	trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route110_EventScript_1EF46B
+	msgbox Route110_Text_2981B3, 4
+	release
+	end
+
+Route110_EventScript_1EF44C:: @ 81EF44C
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route110_Text_298201, 4
+	setvar VAR_0x8004, 512
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 512
+	callstd 8
+	release
+	end
+
+Route110_EventScript_1EF46B:: @ 81EF46B
+	trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288
+	msgbox Route110_Text_2982A2, 6
+	end
+
+Route110_EventScript_1EF482:: @ 81EF482
+	trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5
+	msgbox Route110_Text_298303, 6
+	end
+
+Route110_EventScript_1EF499:: @ 81EF499
+	trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77
+	msgbox Route110_Text_297B8F, 6
+	end
+
+Route110_EventScript_1EF4B0:: @ 81EF4B0
+	trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F
+	msgbox Route110_Text_297C1F, 6
+	end
+
+Route110_EventScript_1EF4C7:: @ 81EF4C7
+	trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route110_EventScript_1EF512
+	msgbox Route110_Text_297CB4, 4
+	release
+	end
+
+Route110_EventScript_1EF4F3:: @ 81EF4F3
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route110_Text_297CFE, 4
+	setvar VAR_0x8004, 353
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 353
+	callstd 8
+	release
+	end
+
+Route110_EventScript_1EF512:: @ 81EF512
+	trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E
+	msgbox Route110_Text_297DB0, 6
+	end
+
+Route110_EventScript_1EF529:: @ 81EF529
+	trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0
+	msgbox Route110_Text_297FF1, 6
+	end
+
+Route110_EventScript_1EF540:: @ 81EF540
+	trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route110_EventScript_1EF58B
+	msgbox Route110_Text_297E88, 4
+	release
+	end
+
+Route110_EventScript_1EF56C:: @ 81EF56C
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route110_Text_297ECD, 4
+	setvar VAR_0x8004, 358
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 358
+	callstd 8
+	release
+	end
+
+Route110_EventScript_1EF58B:: @ 81EF58B
+	trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37
+	msgbox Route110_Text_297F58, 6
+	end
+
+Route110_EventScript_1EF5A2:: @ 81EF5A2
+	trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route110_EventScript_1EF5ED
+	msgbox Route110_Text_2983A2, 4
+	release
+	end
+
+Route110_EventScript_1EF5CE:: @ 81EF5CE
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route110_Text_2983EE, 4
+	setvar VAR_0x8004, 302
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 302
+	callstd 8
+	release
+	end
+
+Route110_EventScript_1EF5ED:: @ 81EF5ED
+	trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF
+	msgbox Route110_Text_2984C8, 6
+	end
+
+Route110_EventScript_1EF604:: @ 81EF604
+	trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559
+	msgbox Route110_Text_298579, 6
+	end
+
+Route110_EventScript_1EF61B:: @ 81EF61B
+	end
+
+Route110_EventScript_1EF61C:: @ 81EF61C
+	trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735
+	msgbox Route110_Text_298755, 6
+	end
+
+Route110_EventScript_1EF633:: @ 81EF633
+	trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686
+	msgbox Route110_Text_2986A9, 6
+	end
+
+Route110_EventScript_1EF64A:: @ 81EF64A
+	trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9
+	msgbox Route110_Text_298612, 6
+	end
+
+Route110_EventScript_1EF661:: @ 81EF661
+	lockall
+	applymovement 21, Route110_Movement_2725A8
+	waitmovement 0
+	call Route110_EventScript_1EF673
+	releaseall
+	end
+
+Route110_EventScript_1EF673:: @ 81EF673
+	special FinishCyclingRoadChallenge
+	msgbox Route110_Text_1F03FF, 4
+	switch VAR_RESULT
+	case 10, Route110_EventScript_1EF6FD
+	case 9, Route110_EventScript_1EF70B
+	case 8, Route110_EventScript_1EF70B
+	case 7, Route110_EventScript_1EF70B
+	case 6, Route110_EventScript_1EF719
+	case 5, Route110_EventScript_1EF719
+	case 4, Route110_EventScript_1EF719
+	case 3, Route110_EventScript_1EF727
+	case 2, Route110_EventScript_1EF727
+	case 1, Route110_EventScript_1EF727
+	case 0, Route110_EventScript_1EF735
+	end
+
+Route110_EventScript_1EF6FD:: @ 81EF6FD
+	msgbox Route110_Text_1F0431, 4
+	goto Route110_EventScript_1EF743
+	end
+
+Route110_EventScript_1EF70B:: @ 81EF70B
+	msgbox Route110_Text_1F04A4, 4
+	goto Route110_EventScript_1EF743
+	end
+
+Route110_EventScript_1EF719:: @ 81EF719
+	msgbox Route110_Text_1F0500, 4
+	goto Route110_EventScript_1EF743
+	end
+
+Route110_EventScript_1EF727:: @ 81EF727
+	msgbox Route110_Text_1F0567, 4
+	goto Route110_EventScript_1EF743
+	end
+
+Route110_EventScript_1EF735:: @ 81EF735
+	msgbox Route110_Text_1F05CE, 4
+	goto Route110_EventScript_1EF743
+	end
+
+Route110_EventScript_1EF743:: @ 81EF743
+	setvar VAR_0x40A9, 3
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	return
+
+Route110_EventScript_1EF74D:: @ 81EF74D
+	setvar VAR_0x8008, 1
+	goto Route110_EventScript_1EF76E
+	end
+
+Route110_EventScript_1EF758:: @ 81EF758
+	setvar VAR_0x8008, 2
+	goto Route110_EventScript_1EF76E
+	end
+
+Route110_EventScript_1EF763:: @ 81EF763
+	setvar VAR_0x8008, 3
+	goto Route110_EventScript_1EF76E
+	end
+
+Route110_EventScript_1EF76E:: @ 81EF76E
+	lockall
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, Route110_EventScript_1EF7E1
+	compare VAR_RESULT, 1
+	call_if 1, Route110_EventScript_1EF7E6
+	applymovement 28, Route110_Movement_2725AA
+	waitmovement 0
+	applymovement 28, Route110_Movement_272598
+	waitmovement 0
+	applymovement 28, Route110_Movement_27259A
+	waitmovement 0
+	delay 30
+	compare VAR_0x8008, 1
+	call_if 1, Route110_EventScript_1EF94E
+	compare VAR_0x8008, 2
+	call_if 1, Route110_EventScript_1EF959
+	compare VAR_0x8008, 3
+	call_if 1, Route110_EventScript_1EF964
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq Route110_EventScript_1EF7EB
+	compare VAR_RESULT, 1
+	goto_eq Route110_EventScript_1EF865
+	releaseall
+	end
+
+Route110_EventScript_1EF7E1:: @ 81EF7E1
+	playbgm MUS_GIRL_SUP, 1
+	return
+
+Route110_EventScript_1EF7E6:: @ 81EF7E6
+	playbgm MUS_BOY_SUP, 1
+	return
+
+Route110_EventScript_1EF7EB:: @ 81EF7EB
+	msgbox Route110_Text_1EFC48, 4
+	switch VAR_FIRST_POKE
+	case 0, Route110_EventScript_1EF81A
+	case 1, Route110_EventScript_1EF82A
+	case 2, Route110_EventScript_1EF83A
+	end
+
+Route110_EventScript_1EF81A:: @ 81EF81A
+	trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB
+	goto Route110_EventScript_1EF84A
+	end
+
+Route110_EventScript_1EF82A:: @ 81EF82A
+	trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB
+	goto Route110_EventScript_1EF84A
+	end
+
+Route110_EventScript_1EF83A:: @ 81EF83A
+	trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB
+	goto Route110_EventScript_1EF84A
+	end
+
+Route110_EventScript_1EF84A:: @ 81EF84A
+	msgbox Route110_Text_1EFCF1, 4
+	call Route110_EventScript_1EF8DF
+	msgbox Route110_Text_1EFD58, 4
+	goto Route110_EventScript_1EF8EC
+	end
+
+Route110_EventScript_1EF865:: @ 81EF865
+	msgbox Route110_Text_1EFE3F, 4
+	switch VAR_FIRST_POKE
+	case 0, Route110_EventScript_1EF894
+	case 1, Route110_EventScript_1EF8A4
+	case 2, Route110_EventScript_1EF8B4
+	end
+
+Route110_EventScript_1EF894:: @ 81EF894
+	trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4
+	goto Route110_EventScript_1EF8C4
+	end
+
+Route110_EventScript_1EF8A4:: @ 81EF8A4
+	trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4
+	goto Route110_EventScript_1EF8C4
+	end
+
+Route110_EventScript_1EF8B4:: @ 81EF8B4
+	trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4
+	goto Route110_EventScript_1EF8C4
+	end
+
+Route110_EventScript_1EF8C4:: @ 81EF8C4
+	msgbox Route110_Text_1EFECD, 4
+	call Route110_EventScript_1EF8DF
+	msgbox Route110_Text_1EFF1C, 4
+	goto Route110_EventScript_1EF8EC
+	end
+
+Route110_EventScript_1EF8DF:: @ 81EF8DF
+	giveitem_std ITEM_ITEMFINDER
+	return
+
+Route110_EventScript_1EF8EC:: @ 81EF8EC
+	closemessage
+	compare VAR_0x8008, 1
+	call_if 1, Route110_EventScript_1EF990
+	compare VAR_0x8008, 2
+	call_if 1, Route110_EventScript_1EF998
+	compare VAR_0x8008, 3
+	call_if 1, Route110_EventScript_1EF9A0
+	setobjectmovementtype 28, 10
+	setobjectmovementtype 29, 10
+	removeobject 28
+	addobject 29
+	delay 45
+	compare VAR_0x8008, 1
+	call_if 1, Route110_EventScript_1EF96F
+	compare VAR_0x8008, 2
+	call_if 1, Route110_EventScript_1EF97A
+	compare VAR_0x8008, 3
+	call_if 1, Route110_EventScript_1EF985
+	removeobject 29
+	setvar VAR_0x4069, 1
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	releaseall
+	end
+
+Route110_EventScript_1EF94E:: @ 81EF94E
+	applymovement 28, Route110_Movement_1EF9A8
+	waitmovement 0
+	return
+
+Route110_EventScript_1EF959:: @ 81EF959
+	applymovement 28, Route110_Movement_1EF9AC
+	waitmovement 0
+	return
+
+Route110_EventScript_1EF964:: @ 81EF964
+	applymovement 28, Route110_Movement_1EF9AE
+	waitmovement 0
+	return
+
+Route110_EventScript_1EF96F:: @ 81EF96F
+	applymovement 29, Route110_Movement_1EF9B2
+	waitmovement 0
+	return
+
+Route110_EventScript_1EF97A:: @ 81EF97A
+	applymovement 29, Route110_Movement_1EF9BA
+	waitmovement 0
+	return
+
+Route110_EventScript_1EF985:: @ 81EF985
+	applymovement 29, Route110_Movement_1EF9C3
+	waitmovement 0
+	return
+
+Route110_EventScript_1EF990:: @ 81EF990
+	setobjectxyperm 29, 33, 55
+	return
+
+Route110_EventScript_1EF998:: @ 81EF998
+	setobjectxyperm 29, 34, 55
+	return
+
+Route110_EventScript_1EF9A0:: @ 81EF9A0
+	setobjectxyperm 29, 35, 55
+	return
+
+Route110_Movement_1EF9A8: @ 81EF9A8
+	walk_down
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+Route110_Movement_1EF9AC: @ 81EF9AC
+	walk_down
+	step_end
+
+Route110_Movement_1EF9AE: @ 81EF9AE
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+Route110_Movement_1EF9B2: @ 81EF9B2
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+Route110_Movement_1EF9BA: @ 81EF9BA
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_down
+	step_end
+
+Route110_Movement_1EF9C3: @ 81EF9C3
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+Route110_EventScript_1EF9CB:: @ 81EF9CB
+	lockall
+	setvar VAR_0x8008, 1
+	goto Route110_EventScript_1EF9F7
+
+Route110_EventScript_1EF9D6:: @ 81EF9D6
+	lockall
+	setvar VAR_0x8008, 2
+	goto Route110_EventScript_1EF9F7
+
+Route110_EventScript_1EF9E1:: @ 81EF9E1
+	lockall
+	setvar VAR_0x8008, 3
+	goto Route110_EventScript_1EF9F7
+
+Route110_EventScript_1EF9EC:: @ 81EF9EC
+	lockall
+	setvar VAR_0x8008, 4
+	goto Route110_EventScript_1EF9F7
+
+Route110_EventScript_1EF9F7:: @ 81EF9F7
+	addobject 36
+	applymovement 36, Route110_Movement_1EFB30
+	waitmovement 0
+	playse SE_PIN
+	applymovement 36, Route110_Movement_272598
+	waitmovement 0
+	applymovement 36, Route110_Movement_27259A
+	waitmovement 0
+	compare VAR_0x8008, 1
+	call_if 1, Route110_EventScript_1EFAD8
+	compare VAR_0x8008, 2
+	call_if 1, Route110_EventScript_1EFAE3
+	compare VAR_0x8008, 3
+	call_if 1, Route110_EventScript_1EFAEE
+	compare VAR_0x8008, 4
+	call_if 1, Route110_EventScript_1EFAF9
+	msgbox Route110_Text_1F0AB5, 4
+	closemessage
+	delay 20
+	applymovement 36, Route110_Movement_2725A4
+	waitmovement 0
+	delay 10
+	applymovement 36, Route110_Movement_2725A8
+	waitmovement 0
+	delay 20
+	applymovement 36, Route110_Movement_2725AA
+	waitmovement 0
+	delay 30
+	msgbox Route110_Text_1F0AFF, 4
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox Route110_Text_1F0C0C, 4
+	waitfanfare
+	closemessage
+	delay 30
+	setflag FLAG_0x119
+	msgbox Route110_Text_1F0C33, 4
+	closemessage
+	compare VAR_0x8008, 1
+	call_if 1, Route110_EventScript_1EFB04
+	compare VAR_0x8008, 2
+	call_if 1, Route110_EventScript_1EFB0F
+	compare VAR_0x8008, 3
+	call_if 1, Route110_EventScript_1EFB1A
+	compare VAR_0x8008, 4
+	call_if 1, Route110_EventScript_1EFB25
+	removeobject 36
+	setvar VAR_0x40DA, 2
+	releaseall
+	end
+
+Route110_EventScript_1EFAD8:: @ 81EFAD8
+	applymovement 36, Route110_Movement_1EFB34
+	waitmovement 0
+	return
+
+Route110_EventScript_1EFAE3:: @ 81EFAE3
+	applymovement 36, Route110_Movement_1EFB39
+	waitmovement 0
+	return
+
+Route110_EventScript_1EFAEE:: @ 81EFAEE
+	applymovement 36, Route110_Movement_1EFB3D
+	waitmovement 0
+	return
+
+Route110_EventScript_1EFAF9:: @ 81EFAF9
+	applymovement 36, Route110_Movement_1EFB40
+	waitmovement 0
+	return
+
+Route110_EventScript_1EFB04:: @ 81EFB04
+	applymovement 36, Route110_Movement_1EFB44
+	waitmovement 0
+	return
+
+Route110_EventScript_1EFB0F:: @ 81EFB0F
+	applymovement 36, Route110_Movement_1EFB4B
+	waitmovement 0
+	return
+
+Route110_EventScript_1EFB1A:: @ 81EFB1A
+	applymovement 36, Route110_Movement_1EFB51
+	waitmovement 0
+	return
+
+Route110_EventScript_1EFB25:: @ 81EFB25
+	applymovement 36, Route110_Movement_1EFB57
+	waitmovement 0
+	return
+
+Route110_Movement_1EFB30: @ 81EFB30
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+Route110_Movement_1EFB34: @ 81EFB34
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+Route110_Movement_1EFB39: @ 81EFB39
+	walk_down
+	walk_left
+	walk_down
+	step_end
+
+Route110_Movement_1EFB3D: @ 81EFB3D
+	walk_down
+	walk_down
+	step_end
+
+Route110_Movement_1EFB40: @ 81EFB40
+	walk_down
+	walk_right
+	walk_down
+	step_end
+
+Route110_Movement_1EFB44: @ 81EFB44
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Route110_Movement_1EFB4B: @ 81EFB4B
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Route110_Movement_1EFB51: @ 81EFB51
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Route110_Movement_1EFB57: @ 81EFB57
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Route110_Text_1EFB5D: @ 81EFB5D
+	.string "TEAM AQUA’s activities…\n"
+	.string "We can’t talk about them yet.$"
+
+Route110_Text_1EFB93: @ 81EFB93
+	.string "I want to get going to SLATEPORT and\n"
+	.string "kick up a ruckus!$"
+
+Route110_Text_1EFBCA: @ 81EFBCA
+	.string "This is my first job after joining\n"
+	.string "TEAM AQUA. It’s a little scary.$"
+
+Route110_Text_1EFC0D: @ 81EFC0D
+	.string "TEAM AQUA’s actions should bring\n"
+	.string "smiles to people’s faces!$"
+
+Route110_Text_1EFC48: @ 81EFC48
+	.string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p"
+	.string "While I was searching for other\n"
+	.string "POKéMON, my POKéMON grew stronger.\p"
+	.string "So…\n"
+	.string "How about a little battle?$"
+
+Route110_Text_1EFCCB: @ 81EFCCB
+	.string "Yikes!\n"
+	.string "You’re better than I expected!$"
+
+Route110_Text_1EFCF1: @ 81EFCF1
+	.string "MAY: {PLAYER}{KUN}, you’ve been busy\n"
+	.string "training, too, haven’t you?\p"
+	.string "I think you deserve a reward!\n"
+	.string "This is from me!$"
+
+Route110_Text_1EFD58: @ 81EFD58
+	.string "MAY: That’s an ITEMFINDER.\p"
+	.string "Try it out. If there is an item that’s\n"
+	.string "not visible, it emits a sound.\p"
+	.string "Okay, {PLAYER}{KUN}, let’s meet again!\p"
+	.string "I know it’s a little silly coming from\n"
+	.string "me, but I think you should train a lot\l"
+	.string "harder for the next time.$"
+
+Route110_Text_1EFE3F: @ 81EFE3F
+	.string "BRENDAN: Hey, {PLAYER}.\n"
+	.string "So this is where you were.\l"
+	.string "How’s it going?\p"
+	.string "Have you been raising your POKéMON?\n"
+	.string "I’ll check for you.$"
+
+Route110_Text_1EFEB4: @ 81EFEB4
+	.string "Hmm…\n"
+	.string "You’re pretty good.$"
+
+Route110_Text_1EFECD: @ 81EFECD
+	.string "BRENDAN: {PLAYER}, you’ve trained\n"
+	.string "without me noticing…\p"
+	.string "Good enough!\n"
+	.string "Here, take this.$"
+
+Route110_Text_1EFF1C: @ 81EFF1C
+	.string "BRENDAN: That’s an ITEMFINDER.\p"
+	.string "Use it to root around for items that\n"
+	.string "aren’t visible.\p"
+	.string "If it senses something, it emits\n"
+	.string "a sound.\p"
+	.string "Anyway, I’m off to look for new\n"
+	.string "POKéMON.$"
+
+Route110_Text_1EFFC3: @ 81EFFC3
+	.string "Wouldn’t it be great to ride a BIKE\n"
+	.string "at full speed on CYCLING ROAD?$"
+
+Route110_Text_1F0006: @ 81F0006
+	.string "How do you like the way my raven-\n"
+	.string "colored hair streams behind me?\p"
+	.string "I grew my hair out just for that.$"
+
+Route110_Text_1F006A: @ 81F006A
+	.string "Oh, hey, you got that BIKE from RYDEL!\p"
+	.string "Oh, it’s glaringly obvious.\n"
+	.string "It says right on your bike…\p"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
+	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL…\n"
+	.string "That name’s everywhere.\p"
+	.string "You should ride it around all over\n"
+	.string "the place--it’s good advertising!$"
+
+Route110_Text_1F0261: @ 81F0261
+	.string "The two roads, one above, one below…\p"
+	.string "A road each for people and POKéMON.\n"
+	.string "Perhaps that is right and fair.$"
+
+Route110_Text_1F02CA: @ 81F02CA
+	.string "I don’t have a BIKE, so I’ll take\n"
+	.string "a leisurely walk on the low road.$"
+
+Route110_Text_1F030E: @ 81F030E
+	.string "Learning techniques will make BIKE\n"
+	.string "riding even more fun.\p"
+	.string "There are some places that you can\n"
+	.string "reach only by using a BIKE technique.$"
+
+Route110_Text_1F0390: @ 81F0390
+	.string "Which should I choose?\p"
+	.string "Make a beeline for MAUVILLE on\n"
+	.string "CYCLING ROAD, or take the low road\l"
+	.string "and look for POKéMON?$"
+
+Route110_Text_1F03FF: @ 81F03FF
+	.string "Number of collisions:\n"
+	.string "… … {STR_VAR_1}!\p"
+	.string "Total time:\n"
+	.string "… … {STR_VAR_2}!$"
+
+Route110_Text_1F0431: @ 81F0431
+	.string "Bravo! Splendid showing!\p"
+	.string "Your love of cycling comes from deep\n"
+	.string "within your heart.\l"
+	.string "You’ve shaken me to my very soul!$"
+
+Route110_Text_1F04A4: @ 81F04A4
+	.string "Your technique is remarkable.\p"
+	.string "I suggest you speed up a bit while\n"
+	.string "still avoiding collisions.$"
+
+Route110_Text_1F0500: @ 81F0500
+	.string "I would consider you a work in\n"
+	.string "progress.\p"
+	.string "Still, I hope you don’t forget the\n"
+	.string "sheer pleasure of cycling.$"
+
+Route110_Text_1F0567: @ 81F0567
+	.string "My word… Your cycling skills border\n"
+	.string "on terrifying.\p"
+	.string "Most certainly, you need much more\n"
+	.string "practice riding.$"
+
+Route110_Text_1F05CE: @ 81F05CE
+	.string "…I am aghast…\p"
+	.string "You’re perhaps not cut out for this\n"
+	.string "unfortunate cycling business.\p"
+	.string "You ought to give serious thought to\n"
+	.string "returning that BIKE to RYDEL.$"
+
+Route110_Text_1F0661: @ 81F0661
+	.string "This is CYCLING ROAD.\p"
+	.string "If you were to ride from MAUVILLE to\n"
+	.string "SLATEPORT on a MACH BIKE, you would\l"
+	.string "be rated for the number of collisions\l"
+	.string "and your total time.$"
+
+Route110_Text_1F06FB: @ 81F06FB
+	.string "Regardless of the results, I count on\n"
+	.string "seeing more challenges from you.\l"
+	.string "Always aim higher!$"
+
+Route110_Text_1F0755: @ 81F0755
+	.string "On this CYCLING ROAD, those riding\n"
+	.string "MACH BIKES are rated for their number\l"
+	.string "of collisions and their total times.\p"
+	.string "ACRO BIKES do not qualify for rating.\n"
+	.string "They are easy to turn, so it’s not fair.$"
+
+Route110_Text_1F0812: @ 81F0812
+	.string "ROUTE 110\n"
+	.string "{0x7A} SLATEPORT CITY$"
+
+Route110_Text_1F082D: @ 81F082D
+	.string "SEASIDE CYCLING ROAD$"
+
+Route110_Text_1F0842: @ 81F0842
+	.string "“TEAM AQUA was here!”\p"
+	.string "Someone painted that onto this sign,\n"
+	.string "but then someone else painted over it.\p"
+	.string "“TEAM MAGMA rules!” is what it\n"
+	.string "says now.$"
+
+Route110_Text_1F08CD: @ 81F08CD
+	.string "ROUTE 110\n"
+	.string "{0x7B} ROUTE 103$"
+
+Route110_Text_1F08E3: @ 81F08E3
+	.string "SEASIDE PARKING$"
+
+Route110_Text_1F08F3: @ 81F08F3
+	.string "ROUTE 110\n"
+	.string "{0x79} MAUVILLE CITY$"
+
+Route110_Text_1F090D: @ 81F090D
+	.string "TRAINER TIPS\p"
+	.string "The foe can be made helpless by\n"
+	.string "paralyzing it or causing it to sleep.\p"
+	.string "It is an important technique for\n"
+	.string "POKéMON battles.$"
+
+Route110_Text_1F0992: @ 81F0992
+	.string "TRAINER TIPS\p"
+	.string "The items in the BAG can be reorganized\n"
+	.string "by pressing SELECT.$"
+
+Route110_Text_1F09DB: @ 81F09DB
+	.string "“Three steps {0x7C} and two steps {0x79}\n"
+	.string "to reach the wondrous TRICK HOUSE.”$"
+
+Route110_Text_1F0A1E: @ 81F0A1E
+	.string "THE BEST RECORD TO DATE…\p"
+	.string "No. of collisions: {STR_VAR_1}\p"
+	.string "Elapsed time: {STR_VAR_2}$"
+
+Route110_Text_1F0A5E: @ 81F0A5E
+	.string "THE BEST RECORD TO DATE…\p"
+	.string "No one seems to have taken the\n"
+	.string "challenge. There is no record…$"
+
+Route110_Text_1F0AB5: @ 81F0AB5
+	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
+	.string "Imagine seeing you here!\p"
+	.string "And where might my {RIVAL} be?$"
+
+Route110_Text_1F0AFF: @ 81F0AFF
+	.string "Oh, I see!\n"
+	.string "You two are running separately.\l"
+	.string "Well, that’s fine.\p"
+	.string "Oh, yes, I heard that your POKéNAV\n"
+	.string "had the MATCH CALL system installed.\p"
+	.string "Well, then, I should register you in\n"
+	.string "my POKéNAV as well.\p"
+	.string "That way, even when we’re apart,\n"
+	.string "I can rate your POKéDEX anytime.\p"
+	.string "… … … … … …$"
+
+Route110_Text_1F0C0C: @ 81F0C0C
+	.string "Registered PROF. BIRCH\n"
+	.string "in the POKéNAV.$"
+
+Route110_Text_1F0C33: @ 81F0C33
+	.string "PROF. BIRCH: {PLAYER}{KUN}…\p"
+	.string "Please keep an eye out for my {RIVAL}.\n"
+	.string "… … … … … …\p"
+	.string "Well, I had better get going.\n"
+	.string "See you again, {PLAYER}{KUN}!$"
+
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..ee7f5ef17
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84
+	coord_event 5, 4, 3, VAR_TEMP_1, 1, 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..d98361dd3
--- /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 MAPSEC_ROUTE_110
+	.byte 0
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
+	.2byte 0
+	.byte 1
+	.byte MAP_BATTLE_SCENE_NORMAL
+
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..8d10ce499
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0
+	coord_event 5, 4, 3, VAR_TEMP_1, 1, 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..24baeb042
--- /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 MAPSEC_ROUTE_110
+	.byte 0
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
+	.2byte 0
+	.byte 1
+	.byte MAP_BATTLE_SCENE_NORMAL
+
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..9d9cf23ed 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHouseCorridor: @ 8485B84
-	.4byte Route110_TrickHouseCorridor_MapAttributes
+	.4byte Route110_TrickHouseCorridor_Layout
 	.4byte Route110_TrickHouseCorridor_MapEvents
 	.4byte Route110_TrickHouseCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 246
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..44539d4cc
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 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, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041
+
+Route110_TrickHouseEnd_MapBGEvents: @ 853DF34
+	bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, 1
+
+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..3ea5a8eb8 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHouseEnd: @ 8485B68
-	.4byte Route110_TrickHouseEnd_MapAttributes
+	.4byte Route110_TrickHouseEnd_Layout
 	.4byte Route110_TrickHouseEnd_MapEvents
 	.4byte Route110_TrickHouseEnd_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 245
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5255e5acf
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+	coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+	coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+	coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8
+
+Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC
+	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..8e202e650 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHouseEntrance: @ 8485B4C
-	.4byte Route110_TrickHouseEntrance_MapAttributes
+	.4byte Route110_TrickHouseEntrance_Layout
 	.4byte Route110_TrickHouseEntrance_MapEvents
 	.4byte Route110_TrickHouseEntrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 244
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ae6de093d
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18
+	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20
+	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23
+	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22
+	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21
+	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25
+	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..593b807ce 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle1: @ 8485BA0
-	.4byte Route110_TrickHousePuzzle1_MapAttributes
+	.4byte Route110_TrickHousePuzzle1_Layout
 	.4byte Route110_TrickHousePuzzle1_MapEvents
 	.4byte Route110_TrickHousePuzzle1_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 247
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0e8d3607b
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD
+	coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0
+	coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03
+	coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16
+
+Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8
+	bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, 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..e632dbca9 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle2: @ 8485BBC
-	.4byte Route110_TrickHousePuzzle2_MapAttributes
+	.4byte Route110_TrickHousePuzzle2_Layout
 	.4byte Route110_TrickHousePuzzle2_MapEvents
 	.4byte Route110_TrickHousePuzzle2_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 248
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..38063f98d
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0
+	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD
+	coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9
+	coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5
+	coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1
+
+Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318
+	bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, 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..77e2e4a38 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle3: @ 8485BD8
-	.4byte Route110_TrickHousePuzzle3_MapAttributes
+	.4byte Route110_TrickHousePuzzle3_Layout
 	.4byte Route110_TrickHousePuzzle3_MapEvents
 	.4byte Route110_TrickHousePuzzle3_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 249
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f5406539f
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25
+	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..9ad6159f3 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle4: @ 8485BF4
-	.4byte Route110_TrickHousePuzzle4_MapAttributes
+	.4byte Route110_TrickHousePuzzle4_Layout
 	.4byte Route110_TrickHousePuzzle4_MapEvents
 	.4byte Route110_TrickHousePuzzle4_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 250
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f91d26f4d
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 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, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7
+	coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3
+	coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF
+	coord_event 2, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB
+	coord_event 1, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC13
+	coord_event 2, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F
+	coord_event 13, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B
+	coord_event 12, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC67
+	coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC73
+	coord_event 13, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CC97
+	coord_event 12, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3
+	coord_event 11, 4, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF
+	coord_event 1, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CC07
+	coord_event 3, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B
+	coord_event 4, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC37
+	coord_event 5, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC43
+	coord_event 6, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F
+	coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F
+	coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B
+	coord_event 11, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF
+	coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB
+	coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7
+
+Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0
+	bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, 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..910638d82 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle5: @ 8485C10
-	.4byte Route110_TrickHousePuzzle5_MapAttributes
+	.4byte Route110_TrickHousePuzzle5_Layout
 	.4byte Route110_TrickHousePuzzle5_MapEvents
 	.4byte Route110_TrickHousePuzzle5_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 251
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..df3ef829a
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..ab6c752cb 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle6: @ 8485C2C
-	.4byte Route110_TrickHousePuzzle6_MapAttributes
+	.4byte Route110_TrickHousePuzzle6_Layout
 	.4byte Route110_TrickHousePuzzle6_MapEvents
 	.4byte Route110_TrickHousePuzzle6_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 252
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..62a52420b
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0
+	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068
+	object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0
+	object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0
+	object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B
+	coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331
+	coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347
+	coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D
+
+Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8
+	bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, 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..68a7098fb 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle7: @ 8485C48
-	.4byte Route110_TrickHousePuzzle7_MapAttributes
+	.4byte Route110_TrickHousePuzzle7_Layout
 	.4byte Route110_TrickHousePuzzle7_MapEvents
 	.4byte Route110_TrickHousePuzzle7_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 253
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a5d4c0f8a
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..a330e3c1f 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -1,15 +1,15 @@
 Route110_TrickHousePuzzle8: @ 8485C64
-	.4byte Route110_TrickHousePuzzle8_MapAttributes
+	.4byte Route110_TrickHousePuzzle8_Layout
 	.4byte Route110_TrickHousePuzzle8_MapEvents
 	.4byte Route110_TrickHousePuzzle8_MapScripts
 	.4byte 0x0
 	.2byte MUS_KARAKURI
 	.2byte 254
-	.byte 25
+	.byte MAPSEC_ROUTE_110
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..cd11e1ef2
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 769
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, 770
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 771
+	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0
+	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1204, 0
+	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0
+	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0
+	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0
+	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796
+	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 17
+	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, 18
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0
+	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, 799
+	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799
+	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, 903
+	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, 903
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010
+	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, 19
+	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0
+	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0
+	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0
+	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, 960
+	object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0
+	object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0
+	object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0
+	object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0
+	object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0
+	object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0
+	object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, 1142
+	object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0
+	object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 876
+	object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 875
+	object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 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, Route111_EventScript_1F0FBD
+	coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
+	coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
+	coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
+	coord_event 7, 63, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
+	coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
+	coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
+	coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
+	coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A
+	coord_event 18, 32, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 17, 31, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 9, 37, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 10, 36, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
+	coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16
+	coord_event 8, 64, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 9, 65, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 10, 65, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 11, 66, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 12, 67, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 13, 68, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 14, 69, 3, 0, 0, Route111_EventScript_1F0FB0
+	coord_event 10, 61, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 11, 62, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 13, 62, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 14, 62, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 17, 38, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 16, 39, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 15, 40, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 14, 41, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 13, 42, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD
+	coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD
+
+Route111_MapBGEvents: @ 8529888
+	bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C
+	bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153
+	bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165
+	bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F116E
+	bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1
+	bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1
+	bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1
+	bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177
+	bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3
+	bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3
+	bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, 2
+	bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3
+	bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180
+	bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4
+	bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1
+	bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, 56
+	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, 57
+	bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, 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..449498ed4 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -1,15 +1,15 @@
 Route111: @ 8482790
-	.4byte Route111_MapAttributes
+	.4byte Route111_Layout
 	.4byte Route111_MapEvents
 	.4byte Route111_MapScripts
 	.4byte Route111_MapConnections
 	.2byte MUS_DOORO_X1
 	.2byte 27
-	.byte 26
+	.byte MAPSEC_ROUTE_111
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..16f480460
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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..70bbe3777 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -1,15 +1,15 @@
 Route111_OldLadysRestStop: @ 8483DC4
-	.4byte Route111_OldLadysRestStop_MapAttributes
+	.4byte House3_Layout
 	.4byte Route111_OldLadysRestStop_MapEvents
 	.4byte Route111_OldLadysRestStop_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 64
-	.byte 26
+	.byte MAPSEC_ROUTE_111
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e2c0a2fa5
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..dea0352e6 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -1,15 +1,15 @@
 Route111_WinstrateFamilysHouse: @ 8483DA8
-	.4byte Route111_WinstrateFamilysHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte Route111_WinstrateFamilysHouse_MapEvents
 	.4byte Route111_WinstrateFamilysHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 60
-	.byte 26
+	.byte MAPSEC_ROUTE_111
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d61286928
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011
+	object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F
+	bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46
+	bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, 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..5961e48c2 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -1,15 +1,15 @@
 Route112: @ 84827AC
-	.4byte Route112_MapAttributes
+	.4byte Route112_Layout
 	.4byte Route112_MapEvents
 	.4byte Route112_MapScripts
 	.4byte Route112_MapConnections
 	.2byte MUS_DOORO_X1
 	.2byte 28
-	.byte 27
+	.byte MAPSEC_ROUTE_112
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2fe084697
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..8e1dbc807 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -1,15 +1,15 @@
 Route112_CableCarStation: @ 8483DE0
-	.4byte Route112_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte Route112_CableCarStation_MapEvents
 	.4byte Route112_CableCarStation_MapScripts
 	.4byte 0x0
 	.2byte MUS_DOORO_X1
 	.2byte 118
-	.byte 27
+	.byte MAPSEC_ROUTE_112
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7af1afea7
--- /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, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013
+	object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143
+	object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0
+	object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0
+	object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 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_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 86, 9, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 85, 10, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 85, 11, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 87, 8, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH
+
+Route113_MapBGEvents: @ 8529DF4
+	bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C
+	bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5
+	bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7
+	bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE
+	bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3
+	bg_hidden_item_event 66, 3, 3, ITEM_ETHER, 3
+	bg_hidden_item_event 22, 5, 3, ITEM_TM32, 30
+	bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, 98
+
+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..e1b082712 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -1,15 +1,15 @@
 Route113: @ 84827C8
-	.4byte Route113_MapAttributes
+	.4byte Route113_Layout
 	.4byte Route113_MapEvents
 	.4byte Route113_MapScripts
 	.4byte Route113_MapConnections
 	.2byte MUS_KAZANBAI
 	.2byte 29
-	.byte 28
+	.byte MAPSEC_ROUTE_113
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..352f1fabb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..9f31f510f 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -1,15 +1,15 @@
 Route113_GlassWorkshop: @ 8485CB8
-	.4byte Route113_GlassWorkshop_MapAttributes
+	.4byte House4_Layout
 	.4byte Route113_GlassWorkshop_MapEvents
 	.4byte Route113_GlassWorkshop_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 67
-	.byte 28
+	.byte MAPSEC_ROUTE_113
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..70cabb8c5
--- /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, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route114_EventScript_1F2657, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_1F266E, 0
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, 1014
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, 1015
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, 17
+	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0
+	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0
+	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0
+	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 18
+	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 19
+	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 20
+	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, 21
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0
+	object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0
+	object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0
+	object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, 1160
+	object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625
+	bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E
+	bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1
+	bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1
+	bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1
+	bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1
+	bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2
+	bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2
+	bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637
+	bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, 4
+	bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3
+	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, 42
+
+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..c0920ada9 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -1,15 +1,15 @@
 Route114: @ 84827E4
-	.4byte Route114_MapAttributes
+	.4byte Route114_Layout
 	.4byte Route114_MapEvents
 	.4byte Route114_MapScripts
 	.4byte Route114_MapConnections
 	.2byte MUS_DOORO_X1
 	.2byte 30
-	.byte 29
+	.byte MAPSEC_ROUTE_114
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0a707820e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73
+	bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73
+	bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C
+	bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..a1ad307e4 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -1,15 +1,15 @@
 Route114_FossilManiacsHouse: @ 8483E18
-	.4byte Route114_FossilManiacsHouse_MapAttributes
+	.4byte Route114_FossilManiacsHouse_Layout
 	.4byte Route114_FossilManiacsHouse_MapEvents
 	.4byte Route114_FossilManiacsHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_TONEKUSA
 	.2byte 119
-	.byte 29
+	.byte MAPSEC_ROUTE_114
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ba3798f7b
--- /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, MOVEMENT_TYPE_FACE_UP, 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, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66
+	coord_event 6, 4, 3, VAR_0x40CC, 1, 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..250695671 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -1,15 +1,15 @@
 Route114_FossilManiacsTunnel: @ 8483E34
-	.4byte Route114_FossilManiacsTunnel_MapAttributes
+	.4byte Route114_FossilManiacsTunnel_Layout
 	.4byte Route114_FossilManiacsTunnel_MapEvents
 	.4byte Route114_FossilManiacsTunnel_MapScripts
 	.4byte 0x0
 	.2byte MUS_TONEKUSA
 	.2byte 120
-	.byte 29
+	.byte MAPSEC_ROUTE_114
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..47bd391fb
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309
+	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345
+	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..8ba9dd58c 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -1,15 +1,15 @@
 Route114_LanettesHouse: @ 8483E50
-	.4byte Route114_LanettesHouse_MapAttributes
+	.4byte Route114_LanettesHouse_Layout
 	.4byte Route114_LanettesHouse_MapEvents
 	.4byte Route114_LanettesHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_TONEKUSA
 	.2byte 121
-	.byte 29
+	.byte MAPSEC_ROUTE_114
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..36888bd7a
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0
+	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, 1017
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, 1018
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, 17
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0
+	object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
+	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0
+	object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2
+	bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2
+	bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C
+	bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F2985
+	bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3
+	bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2
+	bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2
+	bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3
+	bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3
+	bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4
+	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3
+	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3
+	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1
+	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, 97
+
+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..5da7c8990 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -1,15 +1,15 @@
 Route115: @ 8482800
-	.4byte Route115_MapAttributes
+	.4byte Route115_Layout
 	.4byte Route115_MapEvents
 	.4byte Route115_MapScripts
 	.4byte Route115_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 31
-	.byte 30
+	.byte MAPSEC_ROUTE_115
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d81cf31ee
--- /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, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 17
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 18
+	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, 1019
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, 1020
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 19
+	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, 20
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021
+	object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0
+	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, 947
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, 1001
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, 894
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, 813
+	object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0
+	object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, 1146
+	object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, 21
+	object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0
+	object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 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, VAR_0x406F, 1, Route116_EventScript_1F2D95
+
+Route116_MapBGEvents: @ 852A790
+	bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57
+	bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60
+	bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69
+	bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1
+	bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1
+	bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D72
+	bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B
+	bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2
+	bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2
+	bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, 45
+	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, 96
+
+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..d0f4bfedf 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -1,15 +1,15 @@
 Route116: @ 848281C
-	.4byte Route116_MapAttributes
+	.4byte Route116_Layout
 	.4byte Route116_MapEvents
 	.4byte Route116_MapScripts
 	.4byte Route116_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 32
-	.byte 31
+	.byte MAPSEC_ROUTE_116
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
new file mode 100644
index 000000000..68a32c3b5
--- /dev/null
+++ b/data/maps/Route116/scripts.inc
@@ -0,0 +1,511 @@
+Route116_MapScripts:: @ 81F2C0C
+	map_script 3, Route116_MapScript1_1F2C1C
+	map_script 1, Route116_MapScript1_1F2C4F
+	map_script 2, Route116_MapScript2_1F2C66
+	.byte 0
+
+Route116_MapScript1_1F2C1C: @ 81F2C1C
+	checkflag FLAG_0x08F
+	call_if 1, Route116_EventScript_1F2C47
+	compare VAR_0x4039, 1
+	call_if 1, Route116_EventScript_273D13
+	compare VAR_0x4037, 5
+	call_if 1, Route116_EventScript_273D1B
+	compare VAR_0x4037, 6
+	call_if 1, Route116_EventScript_273D1B
+	end
+
+Route116_EventScript_1F2C47:: @ 81F2C47
+	setobjectxyperm 21, 38, 10
+	return
+
+Route116_MapScript1_1F2C4F: @ 81F2C4F
+	compare VAR_0x4037, 5
+	call_if 1, Route116_EventScript_27395F
+	compare VAR_0x4037, 6
+	call_if 1, Route116_EventScript_273972
+	end
+
+Route116_MapScript2_1F2C66: @ 81F2C66
+	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	.2byte 0
+
+Route116_EventScript_1F2C70:: @ 81F2C70
+	lock
+	faceplayer
+	checkflag FLAG_0x08F
+	goto_eq Route116_EventScript_1F2C8E
+	checkflag FLAG_0x08E
+	goto_eq Route116_EventScript_1F2C98
+	msgbox Route116_Text_1F3140, 4
+	release
+	end
+
+Route116_EventScript_1F2C8E:: @ 81F2C8E
+	msgbox Route116_Text_1F32C1, 4
+	release
+	end
+
+Route116_EventScript_1F2C98:: @ 81F2C98
+	msgbox Route116_Text_1F3166, 4
+	release
+	end
+
+Route116_EventScript_1F2CA2:: @ 81F2CA2
+	lock
+	faceplayer
+	checkflag FLAG_0x11F
+	goto_eq Route116_EventScript_1F2D2B
+	msgbox Route116_Text_1F3317, 4
+	goto Route116_EventScript_1F2CBB
+	end
+
+Route116_EventScript_1F2CBB:: @ 81F2CBB
+	setflag FLAG_0x11F
+	giveitem_std ITEM_REPEAT_BALL
+	compare VAR_RESULT, 0
+	goto_eq Route116_EventScript_1F2D39
+	msgbox Route116_Text_1F3521, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, Route116_EventScript_1F2D15
+	compare VAR_FACING, 1
+	call_if 1, Route116_EventScript_1F2D15
+	compare VAR_FACING, 3
+	call_if 1, Route116_EventScript_1F2D15
+	compare VAR_FACING, 4
+	call_if 1, Route116_EventScript_1F2D20
+	removeobject VAR_LAST_TALKED
+	clearflag FLAG_0x3B5
+	setflag FLAG_0x100
+	release
+	end
+
+Route116_EventScript_1F2D15:: @ 81F2D15
+	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43
+	waitmovement 0
+	return
+
+Route116_EventScript_1F2D20:: @ 81F2D20
+	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C
+	waitmovement 0
+	return
+
+Route116_EventScript_1F2D2B:: @ 81F2D2B
+	msgbox Route116_Text_1F35CE, 4
+	goto Route116_EventScript_1F2CBB
+	end
+
+Route116_EventScript_1F2D39:: @ 81F2D39
+	msgbox Route116_Text_1F3593, 4
+	release
+	end
+
+Route116_Movement_1F2D43: @ 81F2D43
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+Route116_Movement_1F2D4C: @ 81F2D4C
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+Route116_EventScript_1F2D57:: @ 81F2D57
+	msgbox Route116_Text_1F379D, 3
+	end
+
+Route116_EventScript_1F2D60:: @ 81F2D60
+	msgbox Route116_Text_1F37B7, 3
+	end
+
+Route116_EventScript_1F2D69:: @ 81F2D69
+	msgbox Route116_Text_1F380F, 3
+	end
+
+Route116_EventScript_1F2D72:: @ 81F2D72
+	msgbox Route116_Text_1F3825, 3
+	end
+
+Route116_EventScript_1F2D7B:: @ 81F2D7B
+	msgbox Route116_Text_1F38D4, 3
+	end
+
+Route116_EventScript_1F2D84:: @ 81F2D84
+	lock
+	faceplayer
+	msgbox Route116_Text_1F309D, 4
+	setvar VAR_0x406F, 2
+	release
+	end
+
+Route116_EventScript_1F2D95:: @ 81F2D95
+	lockall
+	applymovement 11, Route116_Movement_2725A8
+	applymovement 255, Route116_Movement_2725A4
+	waitmovement 0
+	msgbox Route116_Text_1F309D, 4
+	setvar VAR_0x406F, 2
+	releaseall
+	end
+
+Route116_EventScript_1F2DB6:: @ 81F2DB6
+	lock
+	faceplayer
+	checkitem ITEM_BLACK_GLASSES, 1
+	compare VAR_RESULT, 1
+	goto_eq Route116_EventScript_1F2DF1
+	specialvar VAR_RESULT, sub_8139634
+	compare VAR_RESULT, 1
+	goto_eq Route116_EventScript_1F2DE2
+	msgbox Route116_Text_1F3657, 4
+	release
+	end
+
+Route116_EventScript_1F2DE2:: @ 81F2DE2
+	msgbox Route116_Text_1F3718, 4
+	closemessage
+	goto Route116_EventScript_1F2E2A
+	end
+
+Route116_EventScript_1F2DF1:: @ 81F2DF1
+	msgbox Route116_Text_1F3657, 4
+	msgbox Route116_Text_1F3688, 4
+	specialvar VAR_RESULT, sub_8139634
+	compare VAR_RESULT, 1
+	goto_eq Route116_EventScript_1F2E1B
+	msgbox Route116_Text_1F375E, 4
+	release
+	end
+
+Route116_EventScript_1F2E1B:: @ 81F2E1B
+	msgbox Route116_Text_1F36B4, 4
+	closemessage
+	goto Route116_EventScript_1F2E2A
+	end
+
+Route116_EventScript_1F2E2A:: @ 81F2E2A
+	delay 20
+	compare VAR_FACING, 2
+	call_if 1, Route116_EventScript_1F2E5E
+	compare VAR_FACING, 1
+	call_if 1, Route116_EventScript_1F2E5E
+	compare VAR_FACING, 3
+	call_if 1, Route116_EventScript_1F2E5E
+	compare VAR_FACING, 4
+	call_if 1, Route116_EventScript_1F2E69
+	removeobject VAR_LAST_TALKED
+	release
+	end
+
+Route116_EventScript_1F2E5E:: @ 81F2E5E
+	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74
+	waitmovement 0
+	return
+
+Route116_EventScript_1F2E69:: @ 81F2E69
+	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E
+	waitmovement 0
+	return
+
+Route116_Movement_1F2E74: @ 81F2E74
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+Route116_Movement_1F2E7E: @ 81F2E7E
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+Route116_EventScript_1F2E89:: @ 81F2E89
+	trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A
+	msgbox Route116_Text_29BBC6, 6
+	end
+
+Route116_EventScript_1F2EA0:: @ 81F2EA0
+	trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25
+	msgbox Route116_Text_29BC42, 6
+	end
+
+Route116_EventScript_1F2EB7:: @ 81F2EB7
+	trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route116_EventScript_1F2F4E
+	setvar VAR_0x8004, 273
+	specialvar VAR_RESULT, sub_813B4E0
+	compare VAR_RESULT, 0
+	goto_eq Route116_EventScript_1F2F22
+	msgbox Route116_Text_29BD92, 4
+	release
+	end
+
+Route116_EventScript_1F2EF8:: @ 81F2EF8
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route116_EventScript_1F2F03
+	release
+	end
+
+Route116_EventScript_1F2F03:: @ 81F2F03
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route116_Text_29BE71, 4
+	setvar VAR_0x8004, 273
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 273
+	callstd 8
+	release
+	end
+
+Route116_EventScript_1F2F22:: @ 81F2F22
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route116_EventScript_1F2F35
+	msgbox Route116_Text_29BD92, 4
+	release
+	end
+
+Route116_EventScript_1F2F35:: @ 81F2F35
+	msgbox Route116_Text_29BDEF, 4
+	setvar VAR_0x8004, 273
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 273
+	callstd 8
+	release
+	end
+
+Route116_EventScript_1F2F4E:: @ 81F2F4E
+	trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C
+	msgbox Route116_Text_29BF68, 6
+	end
+
+Route116_EventScript_1F2F65:: @ 81F2F65
+	trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F
+	msgbox Route116_Text_29BB31, 6
+	end
+
+Route116_EventScript_1F2F7C:: @ 81F2F7C
+	trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3
+	msgbox Route116_Text_29BCCC, 6
+	end
+
+Route116_EventScript_1F2F93:: @ 81F2F93
+	trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route116_EventScript_1F302A
+	setvar VAR_0x8004, 280
+	specialvar VAR_RESULT, sub_813B4E0
+	compare VAR_RESULT, 0
+	goto_eq Route116_EventScript_1F2FFE
+	msgbox Route116_Text_29C010, 4
+	release
+	end
+
+Route116_EventScript_1F2FD4:: @ 81F2FD4
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route116_EventScript_1F2FDF
+	release
+	end
+
+Route116_EventScript_1F2FDF:: @ 81F2FDF
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route116_Text_29C096, 4
+	setvar VAR_0x8004, 280
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 280
+	callstd 8
+	release
+	end
+
+Route116_EventScript_1F2FFE:: @ 81F2FFE
+	checkflag FLAG_HAS_MATCH_CALL
+	goto_eq Route116_EventScript_1F3011
+	msgbox Route116_Text_29C010, 4
+	release
+	end
+
+Route116_EventScript_1F3011:: @ 81F3011
+	msgbox Route116_Text_29C052, 4
+	setvar VAR_0x8004, 280
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 280
+	callstd 8
+	release
+	end
+
+Route116_EventScript_1F302A:: @ 81F302A
+	trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F
+	msgbox Route116_Text_29C13B, 6
+	end
+
+Route116_EventScript_1F3041:: @ 81F3041
+	trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8
+	msgbox Route116_Text_29C1EA, 6
+	end
+
+Route116_EventScript_1F3058:: @ 81F3058
+	trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2
+	msgbox Route116_Text_29C2DD, 6
+	end
+
+Route116_EventScript_1F306F:: @ 81F306F
+	trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365
+	msgbox Route116_Text_29C380, 6
+	end
+
+Route116_EventScript_1F3086:: @ 81F3086
+	trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7
+	msgbox Route116_Text_29C418, 6
+	end
+
+Route116_Text_1F309D: @ 81F309D
+	.string "Ohhh, what am I to do?\p"
+	.string "We were on our walk, PEEKO and I, when\n"
+	.string "we were jumped by an odd thug…\p"
+	.string "The scoundrel made off with my\n"
+	.string "darling PEEKO!\p"
+	.string "Wrrrooooooaaaar! PEEKO!$"
+
+Route116_Text_1F3140: @ 81F3140
+	.string "Nnn… Roar!\p"
+	.string "I want to dig that tunnel!$"
+
+Route116_Text_1F3166: @ 81F3166
+	.string "Nnn… Roar!\n"
+	.string "What’s going on?\p"
+	.string "I was digging the tunnel without any\n"
+	.string "tools when some goon ordered me out!\p"
+	.string "That tunnel’s filled with POKéMON\n"
+	.string "that react badly to loud noises.\l"
+	.string "They could cause an uproar.\p"
+	.string "That’s why we stopped using heavy\n"
+	.string "equipment for tunneling…\p"
+	.string "I’m worried that the goon will do\n"
+	.string "something stupid and startle the\l"
+	.string "POKéMON into an uproar.$"
+
+Route116_Text_1F32C1: @ 81F32C1
+	.string "Nnn… Roar!\p"
+	.string "That goofy goon hightailed it out of\n"
+	.string "the tunnel! I can go back to digging!$"
+
+Route116_Text_1F3317: @ 81F3317
+	.string "Oh! It’s you!\p"
+	.string "You’re that person who not only helped\n"
+	.string "me in PETALBURG WOODS, but also got\l"
+	.string "back my stolen package and then even\l"
+	.string "graciously delivered it to SLATEPORT!\p"
+	.string "CAPT. STERN informed us that the\n"
+	.string "package arrived, too!\p"
+	.string "I thank you very, very much!\p"
+	.string "Why, if I were a rain cloud, I would\n"
+	.string "shower you with gratitude and hail\l"
+	.string "you as a hero!\p"
+	.string "For you, the most wonderful TRAINER,\n"
+	.string "I bear good news!\p"
+	.string "Recently, our company developed\n"
+	.string "a new kind of POKé BALL.\p"
+	.string "As a token of our appreciation, this\n"
+	.string "is our gift to our wonderful TRAINER!$"
+
+Route116_Text_1F3521: @ 81F3521
+	.string "Our new POKé BALL will be available\n"
+	.string "at the POKéMON MART in RUSTBORO.\p"
+	.string "Please do try it out!\n"
+	.string "Thank you and bye-bye!$"
+
+Route116_Text_1F3593: @ 81F3593
+	.string "Your BAG is jam-packed.\n"
+	.string "I can’t give you this REPEAT BALL.$"
+
+Route116_Text_1F35CE: @ 81F35CE
+	.string "As a token of our appreciation for\n"
+	.string "your delivering our package, I have\l"
+	.string "a gift of a new kind of POKé BALL\l"
+	.string "for our most wonderful TRAINER!$"
+
+Route116_Text_1F3657: @ 81F3657
+	.string "I dropped my glasses…\n"
+	.string "Can you help me find them?$"
+
+Route116_Text_1F3688: @ 81F3688
+	.string "Those glasses!\n"
+	.string "May I see them for a second?$"
+
+Route116_Text_1F36B4: @ 81F36B4
+	.string "Hmm…\n"
+	.string "These are BLACKGLASSES.\l"
+	.string "They’re not what I’m looking for…\p"
+	.string "Maybe my glasses aren’t around\n"
+	.string "here…$"
+
+Route116_Text_1F3718: @ 81F3718
+	.string "Hmm…\n"
+	.string "I can’t find my glasses anywhere…\l"
+	.string "Maybe they’re not around here…$"
+
+Route116_Text_1F375E: @ 81F375E
+	.string "Hmm…\n"
+	.string "These are BLACKGLASSES.\l"
+	.string "They’re not what I’m looking for…$"
+
+Route116_Text_1F379D: @ 81F379D
+	.string "ROUTE 116\n"
+	.string "{0x7B} RUSTBORO CITY$"
+
+Route116_Text_1F37B7: @ 81F37B7
+	.string "RUSTURF TUNNEL\n"
+	.string "“Linking RUSTBORO and VERDANTURF\p"
+	.string "“The tunnel project has been\n"
+	.string "canceled.”$"
+
+Route116_Text_1F380F: @ 81F380F
+	.string "TUNNELER’S REST HOUSE$"
+
+Route116_Text_1F3825: @ 81F3825
+	.string "TRAINER TIPS\p"
+	.string "If you want to stop a POKéMON from\n"
+	.string "evolving, press the B Button while it\l"
+	.string "is trying to evolve.\l"
+	.string "The startled POKéMON will stop.\p"
+	.string "This is called an evolution cancel.$"
+
+Route116_Text_1F38D4: @ 81F38D4
+	.string "TRAINER TIPS\p"
+	.string "Your BAG has several POCKETS.\p"
+	.string "Items you obtain are automatically\n"
+	.string "placed in the appropriate POCKETS.\p"
+	.string "No TRAINER can afford to be without\n"
+	.string "a BAG of their own.$"
+
diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
new file mode 100644
index 000000000..896949ae8
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 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..ce7de5c71 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -1,15 +1,15 @@
 Route116_TunnelersRestHouse: @ 8483E6C
-	.4byte Route116_TunnelersRestHouse_MapAttributes
+	.4byte Route116_TunnelersRestHouse_Layout
 	.4byte Route116_TunnelersRestHouse_MapEvents
 	.4byte Route116_TunnelersRestHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 122
-	.byte 31
+	.byte MAPSEC_ROUTE_116
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ffdb9984f
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, 17
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0
+	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0
+	object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0
+	object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0
+	object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0
+	object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5
+	bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE
+	bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7
+	bg_hidden_item_event 3, 18, 3, ITEM_REPEL, 72
+
+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..c720839de 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -1,15 +1,15 @@
 Route117: @ 8482838
-	.4byte Route117_MapAttributes
+	.4byte Route117_Layout
 	.4byte Route117_MapEvents
 	.4byte Route117_MapScripts
 	.4byte Route117_MapConnections
 	.2byte MUS_DOORO_X1
 	.2byte 33
-	.byte 32
+	.byte MAPSEC_ROUTE_117
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a1a8e3673
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..d8fb67ce9 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -1,15 +1,15 @@
 Route117_PokemonDayCare: @ 8483E88
-	.4byte Route117_PokemonDayCare_MapAttributes
+	.4byte Route117_PokemonDayCare_Layout
 	.4byte Route117_PokemonDayCare_MapEvents
 	.4byte Route117_PokemonDayCare_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 123
-	.byte 32
+	.byte MAPSEC_ROUTE_117
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b24e21f44
--- /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, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, 797
+	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797
+	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, 901
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, 904
+	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
+	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 966
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121
+	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_0x4071, 0, Route118_EventScript_1F3E8E
+	coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE
+	coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4
+
+Route118_MapBGEvents: @ 852ACEC
+	bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1
+	bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C
+	bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85
+	bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1
+	bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2
+	bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3
+	bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1
+	bg_hidden_item_event 31, 13, 3, ITEM_IRON, 67
+	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66
+
+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..826281c09 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -1,15 +1,15 @@
 Route118: @ 8482854
-	.4byte Route118_MapAttributes
+	.4byte Route118_Layout
 	.4byte Route118_MapEvents
 	.4byte Route118_MapScripts
 	.4byte Route118_MapConnections
 	.2byte MUS_ROUTE_118
 	.2byte 34
-	.byte 33
+	.byte MAPSEC_ROUTE_118
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
new file mode 100644
index 000000000..818111b81
--- /dev/null
+++ b/data/maps/Route118/scripts.inc
@@ -0,0 +1,318 @@
+Route118_MapScripts:: @ 81F3DBC
+	map_script 3, Route118_MapScript1_1F3DCC
+	map_script 1, Route118_MapScript1_1F3DF3
+	map_script 2, Route118_MapScript2_1F3E0A
+	.byte 0
+
+Route118_MapScript1_1F3DCC: @ 81F3DCC
+	call Route118_EventScript_28CCC7
+	compare VAR_0x4039, 1
+	call_if 1, Route118_EventScript_273D13
+	compare VAR_0x4037, 7
+	call_if 1, Route118_EventScript_273D1B
+	compare VAR_0x4037, 8
+	call_if 1, Route118_EventScript_273D1B
+	end
+
+Route118_MapScript1_1F3DF3: @ 81F3DF3
+	compare VAR_0x4037, 7
+	call_if 1, Route118_EventScript_273985
+	compare VAR_0x4037, 8
+	call_if 1, Route118_EventScript_273998
+	end
+
+Route118_MapScript2_1F3E0A: @ 81F3E0A
+	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	.2byte 0
+
+Route118_EventScript_1F3E14:: @ 81F3E14
+	lock
+	faceplayer
+	checkflag FLAG_0x0E3
+	goto_eq Route118_EventScript_1F3E69
+	msgbox Route118_Text_1F427B, 5
+	compare VAR_RESULT, 1
+	goto_eq Route118_EventScript_1F3E3E
+	compare VAR_RESULT, 0
+	goto_eq Route118_EventScript_1F3E5F
+	end
+
+Route118_EventScript_1F3E3E:: @ 81F3E3E
+	msgbox Route118_Text_1F42AF, 4
+	giveitem_std ITEM_GOOD_ROD
+	setflag FLAG_0x0E3
+	msgbox Route118_Text_1F42E7, 4
+	release
+	end
+
+Route118_EventScript_1F3E5F:: @ 81F3E5F
+	msgbox Route118_Text_1F4319, 4
+	release
+	end
+
+Route118_EventScript_1F3E69:: @ 81F3E69
+	msgbox Route118_Text_1F4331, 4
+	release
+	end
+
+Route118_EventScript_1F3E73:: @ 81F3E73
+	msgbox Route118_Text_1F4367, 2
+	end
+
+Route118_EventScript_1F3E7C:: @ 81F3E7C
+	msgbox Route118_Text_1F43F4, 3
+	end
+
+Route118_EventScript_1F3E85:: @ 81F3E85
+	msgbox Route118_Text_1F440E, 3
+	end
+
+Route118_EventScript_1F3E8E:: @ 81F3E8E
+	lockall
+	setvar VAR_0x8008, 0
+	applymovement 255, Route118_Movement_2725B2
+	waitmovement 0
+	applymovement 19, Route118_Movement_1F3F61
+	waitmovement 0
+	goto Route118_EventScript_1F3EE4
+	end
+
+Route118_EventScript_1F3EAE:: @ 81F3EAE
+	lockall
+	setvar VAR_0x8008, 1
+	applymovement 255, Route118_Movement_2725B2
+	waitmovement 0
+	goto Route118_EventScript_1F3EE4
+	end
+
+Route118_EventScript_1F3EC4:: @ 81F3EC4
+	lockall
+	setvar VAR_0x8008, 2
+	applymovement 255, Route118_Movement_2725B2
+	waitmovement 0
+	applymovement 19, Route118_Movement_1F3F63
+	waitmovement 0
+	goto Route118_EventScript_1F3EE4
+	end
+
+Route118_EventScript_1F3EE4:: @ 81F3EE4
+	playse SE_DANSA
+	applymovement 19, Route118_Movement_1F3F65
+	waitmovement 0
+	delay 30
+	msgbox Route118_Text_1F40BE, 4
+	closemessage
+	compare VAR_0x8008, 0
+	call_if 1, Route118_EventScript_1F3F28
+	compare VAR_0x8008, 1
+	call_if 1, Route118_EventScript_1F3F3A
+	compare VAR_0x8008, 2
+	call_if 1, Route118_EventScript_1F3F4C
+	setvar VAR_0x4071, 1
+	removeobject 19
+	releaseall
+	end
+
+Route118_EventScript_1F3F28:: @ 81F3F28
+	applymovement 255, Route118_Movement_1F3F5E
+	applymovement 19, Route118_Movement_1F3F69
+	waitmovement 0
+	return
+
+Route118_EventScript_1F3F3A:: @ 81F3F3A
+	applymovement 255, Route118_Movement_1F3F5E
+	applymovement 19, Route118_Movement_1F3F74
+	waitmovement 0
+	return
+
+Route118_EventScript_1F3F4C:: @ 81F3F4C
+	applymovement 255, Route118_Movement_1F3F5E
+	applymovement 19, Route118_Movement_1F3F7E
+	waitmovement 0
+	return
+
+Route118_Movement_1F3F5E: @ 81F3F5E
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+Route118_Movement_1F3F61: @ 81F3F61
+	walk_left
+	step_end
+
+Route118_Movement_1F3F63: @ 81F3F63
+	walk_right
+	step_end
+
+Route118_Movement_1F3F65: @ 81F3F65
+	jump_2_down
+	delay_16
+	walk_down
+	step_end
+
+Route118_Movement_1F3F69: @ 81F3F69
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route118_Movement_1F3F74: @ 81F3F74
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route118_Movement_1F3F7E: @ 81F3F7E
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route118_EventScript_1F3F87:: @ 81F3F87
+	trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route118_EventScript_1F3FD2
+	msgbox Route118_Text_29D2FA, 4
+	release
+	end
+
+Route118_EventScript_1F3FB3:: @ 81F3FB3
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route118_Text_29D343, 4
+	setvar VAR_0x8004, 37
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 37
+	callstd 8
+	release
+	end
+
+Route118_EventScript_1F3FD2:: @ 81F3FD2
+	trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA
+	msgbox Route118_Text_29D3D9, 6
+	end
+
+Route118_EventScript_1F3FE9:: @ 81F3FE9
+	trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C
+	msgbox Route118_Text_29D587, 6
+	end
+
+Route118_EventScript_1F4000:: @ 81F4000
+	trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C
+	msgbox Route118_Text_29D663, 6
+	end
+
+Route118_EventScript_1F4017:: @ 81F4017
+	trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route118_EventScript_1F4062
+	msgbox Route118_Text_29D6D8, 4
+	release
+	end
+
+Route118_EventScript_1F4043:: @ 81F4043
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route118_Text_29D74A, 4
+	setvar VAR_0x8004, 196
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 196
+	callstd 8
+	release
+	end
+
+Route118_EventScript_1F4062:: @ 81F4062
+	trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA
+	msgbox Route118_Text_29D7D5, 6
+	end
+
+Route118_EventScript_1F4079:: @ 81F4079
+	trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B
+	msgbox Route118_Text_29D46C, 6
+	end
+
+Route118_EventScript_1F4090:: @ 81F4090
+	trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4
+	msgbox Route118_Text_29D4DA, 6
+	end
+
+Route118_EventScript_1F40A7:: @ 81F40A7
+	trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C
+	msgbox Route118_Text_29D872, 6
+	end
+
+Route118_Text_1F40BE: @ 81F40BE
+	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
+	.string "It’s me, STEVEN!\n"
+	.string "We met in the cave near DEWFORD.\p"
+	.string "Have you met many kinds of POKéMON\n"
+	.string "since I last saw you?\p"
+	.string "There are many, many kinds of POKéMON\n"
+	.string "in this wide world of ours.\p"
+	.string "If you wanted to raise only your\n"
+	.string "favorites, that’s fine.\p"
+	.string "Perhaps you find it more fun to raise\n"
+	.string "all sorts of POKéMON.\p"
+	.string "As a TRAINER of POKéMON,\n"
+	.string "what do you think?\p"
+	.string "Of course, it’s not any of my business.\p"
+	.string "It would be nice if we were to meet\n"
+	.string "again somewhere.$"
+
+Route118_Text_1F427B: @ 81F427B
+	.string "Hmm!\n"
+	.string "A GOOD ROD is really good!\p"
+	.string "Wouldn’t you agree?$"
+
+Route118_Text_1F42AF: @ 81F42AF
+	.string "Hmm!\n"
+	.string "We’re of identical minds!\p"
+	.string "Hmm!\n"
+	.string "Take this GOOD ROD!$"
+
+Route118_Text_1F42E7: @ 81F42E7
+	.string "Wherever there’s water, try your luck\n"
+	.string "at fishing.$"
+
+Route118_Text_1F4319: @ 81F4319
+	.string "Don’t you like to fish?$"
+
+Route118_Text_1F4331: @ 81F4331
+	.string "Try catching all sorts of POKéMON\n"
+	.string "with your GOOD ROD.$"
+
+Route118_Text_1F4367: @ 81F4367
+	.string "Even if there isn’t a boat, you can\n"
+	.string "cross rivers and the sea if you have\l"
+	.string "a POKéMON that knows SURF.\p"
+	.string "POKéMON can be counted on to do so\n"
+	.string "much!$"
+
+Route118_Text_1F43F4: @ 81F43F4
+	.string "ROUTE 118\n"
+	.string "{0x7B} MAUVILLE CITY$"
+
+Route118_Text_1F440E: @ 81F440E
+	.string "ROUTE 118\n"
+	.string "{0x79} ROUTE 119$"
+
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..587b60904
--- /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, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0
+	object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F479D, 0
+	object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F4810, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F4786, 0
+	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1F4872, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0
+	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0
+	object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0
+	object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0
+	object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 851
+	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, 1025
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, 1027
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, 1028
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, 1029
+	object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890
+	object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890
+	object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 923
+	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0
+	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0
+	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0
+	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0
+	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0
+	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, 1106
+	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0
+	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, 989
+	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, 990
+	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0
+	object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0
+	object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0
+	object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0
+	object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, 1134
+	object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, 1147
+	object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_0x4072, 0, Route119_EventScript_1F4472
+	coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D
+	coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+
+Route119_MapBGEvents: @ 852B2F4
+	bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D
+	bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774
+	bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1
+	bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2
+	bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1
+	bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2
+	bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1
+	bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1
+	bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3
+	bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3
+	bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, 5
+	bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, 6
+	bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3
+	bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3
+	bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3
+	bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3
+	bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3
+	bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, 68
+	bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, 87
+	bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, 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..cb9b211d9 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -1,15 +1,15 @@
 Route119: @ 8482870
-	.4byte Route119_MapAttributes
+	.4byte Route119_Layout
 	.4byte Route119_MapEvents
 	.4byte Route119_MapScripts
 	.4byte Route119_MapConnections
 	.2byte MUS_GRANROAD
 	.2byte 35
-	.byte 34
+	.byte MAPSEC_ROUTE_119
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
new file mode 100644
index 000000000..a4b6a5fb1
--- /dev/null
+++ b/data/maps/Route119/scripts.inc
@@ -0,0 +1,637 @@
+Route119_MapScripts:: @ 81F4424
+	map_script 5, Route119_MapScript1_1F442F
+	map_script 3, Route119_MapScript1_1F444D
+	.byte 0
+
+Route119_MapScript1_1F442F: @ 81F442F
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, Route119_EventScript_1F4439
+	end
+
+Route119_EventScript_1F4439:: @ 81F4439
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, Route119_EventScript_27374E
+	removeobject VAR_LAST_TALKED
+	return
+
+Route119_MapScript1_1F444D: @ 81F444D
+	call Route119_EventScript_271ED7
+	call Route119_EventScript_271EFB
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
+	call_if 1, Route119_EventScript_1F4466
+	special SetRoute119Weather
+	end
+
+Route119_EventScript_1F4466:: @ 81F4466
+	setflag FLAG_0x37D
+	clearflag FLAG_0x37C
+	setvar VAR_WEATHER_INSTITUTE_STATE, 2
+	return
+
+Route119_EventScript_1F4472:: @ 81F4472
+	setvar VAR_TEMP_1, 1
+	goto Route119_EventScript_1F4488
+	end
+
+Route119_EventScript_1F447D:: @ 81F447D
+	setvar VAR_TEMP_1, 2
+	goto Route119_EventScript_1F4488
+	end
+
+Route119_EventScript_1F4488:: @ 81F4488
+	lockall
+	addobject 25
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, Route119_EventScript_1F4501
+	compare VAR_RESULT, 1
+	call_if 1, Route119_EventScript_1F4506
+	delay 65
+	compare VAR_TEMP_1, 1
+	call_if 1, Route119_EventScript_1F46C6
+	compare VAR_TEMP_1, 2
+	call_if 1, Route119_EventScript_1F46D1
+	applymovement 255, Route119_Movement_2725AA
+	waitmovement 0
+	delay 30
+	compare VAR_TEMP_1, 1
+	call_if 1, Route119_EventScript_1F4700
+	compare VAR_TEMP_1, 2
+	call_if 1, Route119_EventScript_1F470F
+	removeobject 25
+	addobject 16
+	delay 30
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq Route119_EventScript_1F450B
+	compare VAR_RESULT, 1
+	goto_eq Route119_EventScript_1F4585
+	releaseall
+	end
+
+Route119_EventScript_1F4501:: @ 81F4501
+	playbgm MUS_GIRL_SUP, 1
+	return
+
+Route119_EventScript_1F4506:: @ 81F4506
+	playbgm MUS_BOY_SUP, 1
+	return
+
+Route119_EventScript_1F450B:: @ 81F450B
+	msgbox Route119_Text_1F49FD, 4
+	switch VAR_FIRST_POKE
+	case 0, Route119_EventScript_1F453A
+	case 1, Route119_EventScript_1F454A
+	case 2, Route119_EventScript_1F455A
+	end
+
+Route119_EventScript_1F453A:: @ 81F453A
+	trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98
+	goto Route119_EventScript_1F456A
+	end
+
+Route119_EventScript_1F454A:: @ 81F454A
+	trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98
+	goto Route119_EventScript_1F456A
+	end
+
+Route119_EventScript_1F455A:: @ 81F455A
+	trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98
+	goto Route119_EventScript_1F456A
+	end
+
+Route119_EventScript_1F456A:: @ 81F456A
+	msgbox Route119_Text_1F4AF3, 4
+	call Route119_EventScript_1F45FF
+	msgbox Route119_Text_1F4B56, 4
+	goto Route119_EventScript_1F460F
+	end
+
+Route119_EventScript_1F4585:: @ 81F4585
+	msgbox Route119_Text_1F4C9A, 4
+	switch VAR_FIRST_POKE
+	case 0, Route119_EventScript_1F45B4
+	case 1, Route119_EventScript_1F45C4
+	case 2, Route119_EventScript_1F45D4
+	end
+
+Route119_EventScript_1F45B4:: @ 81F45B4
+	trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24
+	goto Route119_EventScript_1F45E4
+	end
+
+Route119_EventScript_1F45C4:: @ 81F45C4
+	trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24
+	goto Route119_EventScript_1F45E4
+	end
+
+Route119_EventScript_1F45D4:: @ 81F45D4
+	trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24
+	goto Route119_EventScript_1F45E4
+	end
+
+Route119_EventScript_1F45E4:: @ 81F45E4
+	msgbox Route119_Text_1F4D4B, 4
+	call Route119_EventScript_1F45FF
+	msgbox Route119_Text_1F4DB5, 4
+	goto Route119_EventScript_1F460F
+	end
+
+Route119_EventScript_1F45FF:: @ 81F45FF
+	giveitem_std ITEM_HM02
+	setflag FLAG_0x06E
+	return
+
+Route119_EventScript_1F460F:: @ 81F460F
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if 1, Route119_EventScript_1F4700
+	compare VAR_TEMP_1, 2
+	call_if 1, Route119_EventScript_1F470F
+	removeobject 16
+	addobject 25
+	delay 30
+	compare VAR_TEMP_1, 1
+	call_if 1, Route119_EventScript_1F46DC
+	compare VAR_TEMP_1, 2
+	call_if 1, Route119_EventScript_1F46EE
+	removeobject 25
+	setvar VAR_0x4072, 1
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	delay 60
+	compare VAR_TEMP_1, 1
+	call_if 1, Route119_EventScript_1F46A0
+	compare VAR_TEMP_1, 2
+	call_if 1, Route119_EventScript_1F46A8
+	addobject 43
+	applymovement 43, Route119_Movement_1F4752
+	waitmovement 0
+	addvar VAR_0x40D1, 1
+	msgbox Route119_Text_1F4E60, 4
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if 1, Route119_EventScript_1F46B0
+	compare VAR_TEMP_1, 2
+	call_if 1, Route119_EventScript_1F46BB
+	removeobject 43
+	releaseall
+	end
+
+Route119_EventScript_1F46A0:: @ 81F46A0
+	setobjectxyperm 43, 27, 25
+	return
+
+Route119_EventScript_1F46A8:: @ 81F46A8
+	setobjectxyperm 43, 28, 25
+	return
+
+Route119_EventScript_1F46B0:: @ 81F46B0
+	applymovement 43, Route119_Movement_1F475A
+	waitmovement 0
+	return
+
+Route119_EventScript_1F46BB:: @ 81F46BB
+	applymovement 43, Route119_Movement_1F4763
+	waitmovement 0
+	return
+
+Route119_EventScript_1F46C6:: @ 81F46C6
+	applymovement 25, Route119_Movement_1F4728
+	waitmovement 0
+	return
+
+Route119_EventScript_1F46D1:: @ 81F46D1
+	applymovement 25, Route119_Movement_1F4732
+	waitmovement 0
+	return
+
+Route119_EventScript_1F46DC:: @ 81F46DC
+	applymovement 255, Route119_Movement_1F471E
+	applymovement 25, Route119_Movement_1F473D
+	waitmovement 0
+	return
+
+Route119_EventScript_1F46EE:: @ 81F46EE
+	applymovement 255, Route119_Movement_1F4723
+	applymovement 25, Route119_Movement_1F4747
+	waitmovement 0
+	return
+
+Route119_EventScript_1F4700:: @ 81F4700
+	setobjectxyperm 16, 25, 32
+	setobjectxyperm 25, 25, 32
+	return
+
+Route119_EventScript_1F470F:: @ 81F470F
+	setobjectxyperm 16, 26, 32
+	setobjectxyperm 25, 26, 32
+	return
+
+Route119_Movement_1F471E: @ 81F471E
+	delay_16
+	walk_in_place_fastest_right
+	delay_8
+	walk_in_place_fastest_up
+	step_end
+
+Route119_Movement_1F4723: @ 81F4723
+	delay_16
+	walk_in_place_fastest_left
+	delay_8
+	walk_in_place_fastest_up
+	step_end
+
+Route119_Movement_1F4728: @ 81F4728
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	step_end
+
+Route119_Movement_1F4732: @ 81F4732
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	step_end
+
+Route119_Movement_1F473D: @ 81F473D
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+Route119_Movement_1F4747: @ 81F4747
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+Route119_Movement_1F4752: @ 81F4752
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	step_end
+
+Route119_Movement_1F475A: @ 81F475A
+	walk_up
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Route119_Movement_1F4763: @ 81F4763
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Route119_EventScript_1F476B:: @ 81F476B
+	msgbox Route119_Text_1F5261, 2
+	end
+
+Route119_EventScript_1F4774:: @ 81F4774
+	msgbox Route119_Text_1F530E, 3
+	end
+
+Route119_EventScript_1F477D:: @ 81F477D
+	msgbox Route119_Text_1F5327, 3
+	end
+
+Route119_EventScript_1F4786:: @ 81F4786
+	trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0
+	msgbox Route119_Text_29D902, 6
+	end
+
+Route119_EventScript_1F479D:: @ 81F479D
+	trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C
+	msgbox Route119_Text_29D993, 6
+	end
+
+Route119_EventScript_1F47B4:: @ 81F47B4
+	trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14
+	msgbox Route119_Text_29DA2C, 6
+	end
+
+Route119_EventScript_1F47CB:: @ 81F47CB
+	trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC
+	msgbox Route119_Text_29DADB, 6
+	end
+
+Route119_EventScript_1F47E2:: @ 81F47E2
+	trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66
+	msgbox Route119_Text_29DB7C, 6
+	end
+
+Route119_EventScript_1F47F9:: @ 81F47F9
+	trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20
+	msgbox Route119_Text_29DC2B, 6
+	end
+
+Route119_EventScript_1F4810:: @ 81F4810
+	trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route119_EventScript_1F485B
+	msgbox Route119_Text_29DCC6, 4
+	release
+	end
+
+Route119_EventScript_1F483C:: @ 81F483C
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route119_Text_29DD1C, 4
+	setvar VAR_0x8004, 552
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 552
+	callstd 8
+	release
+	end
+
+Route119_EventScript_1F485B:: @ 81F485B
+	trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5
+	msgbox Route119_Text_29DDBD, 6
+	end
+
+Route119_EventScript_1F4872:: @ 81F4872
+	trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route119_EventScript_1F48BD
+	msgbox Route119_Text_29DE88, 4
+	release
+	end
+
+Route119_EventScript_1F489E:: @ 81F489E
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route119_Text_29DEF7, 4
+	setvar VAR_0x8004, 559
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 559
+	callstd 8
+	release
+	end
+
+Route119_EventScript_1F48BD:: @ 81F48BD
+	trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92
+	msgbox Route119_Text_29DFAF, 6
+	end
+
+Route119_EventScript_1F48D4:: @ 81F48D4
+	trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063
+	msgbox Route119_Text_29E071, 6
+	end
+
+Route119_EventScript_1F48EB:: @ 81F48EB
+	trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1
+	msgbox Route119_Text_29E0F6, 6
+	end
+
+Route119_EventScript_1F4902:: @ 81F4902
+	trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D
+	msgbox Route119_Text_29E19D, 6
+	end
+
+Route119_EventScript_1F4919:: @ 81F4919
+	trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B
+	msgbox Route119_Text_29E245, 6
+	end
+
+Route119_EventScript_1F4930:: @ 81F4930
+	trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288
+	msgbox Route119_Text_29E2A3, 6
+	end
+
+Route119_EventScript_1F4947:: @ 81F4947
+	trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372
+	msgbox Route119_Text_29E3A2, 6
+	end
+
+Route119_EventScript_1F495E:: @ 81F495E
+	trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F
+	msgbox Route119_Text_29E492, 6
+	end
+
+Route119_EventScript_1F4975:: @ 81F4975
+	trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513
+	msgbox Route119_Text_29E532, 6
+	end
+
+Route119_EventScript_1F498C:: @ 81F498C
+	trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1
+	msgbox Route119_Text_29E5CB, 6
+	end
+
+Route119_EventScript_1F49A3:: @ 81F49A3
+	lock
+	faceplayer
+	msgbox Route119_Text_1F50EB, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route119_EventScript_1F49BA:: @ 81F49BA
+	lock
+	faceplayer
+	msgbox Route119_Text_1F5147, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+Route119_EventScript_1F49D1:: @ 81F49D1
+	msgbox Route119_Text_1F51A2, 2
+	end
+
+Route119_EventScript_1F49DA:: @ 81F49DA
+	msgbox Route119_Text_1F52B9, 2
+	end
+
+Route119_EventScript_1F49E3:: @ 81F49E3
+	msgbox Route119_Text_1F5339, 3
+	end
+
+Route119_EventScript_1F49EC:: @ 81F49EC
+	lockall
+	pokenavcall Route119_Text_1F4FBA
+	waitmessage
+	clearflag FLAG_0x08A
+	addvar VAR_0x40D1, 1
+	releaseall
+	end
+
+Route119_Text_1F49FD: @ 81F49FD
+	.string "MAY: {PLAYER}{KUN}!\n"
+	.string "Where were you? I was looking for you!\p"
+	.string "How much stronger have you gotten?\n"
+	.string "Let me check for you!\p"
+	.string "Ready with your POKéMON?\n"
+	.string "Of course you are! Go!$"
+
+Route119_Text_1F4A98: @ 81F4A98
+	.string "Achah!\n"
+	.string "{PLAYER}{KUN}, you’re strong!\p"
+	.string "I was worried that you might be\n"
+	.string "struggling with your training.$"
+
+Route119_Text_1F4AF3: @ 81F4AF3
+	.string "MAY: But I had absolutely nothing to\n"
+	.string "worry about! Keep it up!\p"
+	.string "And, here! I have a present for you.$"
+
+Route119_Text_1F4B56: @ 81F4B56
+	.string "MAY: Use FLY, and your POKéMON will\n"
+	.string "instantly carry you to any town you’ve\l"
+	.string "already visited.\p"
+	.string "But, to use FLY, you have to get\n"
+	.string "the GYM BADGE from FORTREE CITY.\l"
+	.string "That’s important, so don’t forget.\p"
+	.string "You should FLY home and visit\n"
+	.string "LITTLEROOT for a change.\p"
+	.string "I bet your mom’s worried about you,\n"
+	.string "{PLAYER}{KUN}.\p"
+	.string "Well, let’s meet again somewhere!$"
+
+Route119_Text_1F4C9A: @ 81F4C9A
+	.string "BRENDAN: {PLAYER}! So this is where\n"
+	.string "you’ve been looking for POKéMON?\p"
+	.string "Let me see how good you got.\n"
+	.string "I’ll test you!\p"
+	.string "Now!\n"
+	.string "It’s a battle, so battle!$"
+
+Route119_Text_1F4D24: @ 81F4D24
+	.string "Hmm…\n"
+	.string "You’ve gotten pretty darn decent.$"
+
+Route119_Text_1F4D4B: @ 81F4D4B
+	.string "BRENDAN: I’d say you’re good enough\n"
+	.string "to search for POKéMON anywhere.\p"
+	.string "Here, I’ll give you this.\n"
+	.string "Try it out.$"
+
+Route119_Text_1F4DB5: @ 81F4DB5
+	.string "BRENDAN: Use FLY, and your POKéMON\n"
+	.string "instantly carries you to any town\l"
+	.string "you’ve already visited.\p"
+	.string "But you need the FORTREE GYM BADGE \n"
+	.string "to do that.\p"
+	.string "Anyway, I have to move along.$"
+
+Route119_Text_1F4E60: @ 81F4E60
+	.string "SCOTT: Hahahah!\n"
+	.string "Way to go, {PLAYER}{KUN}!\p"
+	.string "I just passed by a TRAINER riding\n"
+	.string "a BIKE.\p"
+	.string "You just beat that TRAINER, didn’t you?\n"
+	.string "It was pretty obvious that you did.\p"
+	.string "The kid looked really upset with\n"
+	.string "a face all red from anger.\p"
+	.string "I sure seem to run into you often.\n"
+	.string "Are you off to FORTREE GYM next?\p"
+	.string "I expect that you’ll do well at the GYM.\n"
+	.string "Well, I’ll be seeing you!$"
+
+
+Route119_Text_1F4FBA: @ 81F4FBA
+	.string "… … … … … …\n"
+	.string "… … … … … Beep!\p"
+	.string "SCOTT: Hiya, {PLAYER}{KUN}, it’s me!\p"
+	.string "Just as I thought, you won at\n"
+	.string "the FORTREE GYM.\p"
+	.string "Your strength…\n"
+	.string "Perhaps you really are the TRAINER\l"
+	.string "that I’ve been searching for.\p"
+	.string "Remember, you have a fan in me.\n"
+	.string "I’ll be cheering from the sidelines.\l"
+	.string "Keep up the great work!\p"
+	.string "… … … … … …\n"
+	.string "… … … … … Click!$"
+
+Route119_Text_1F50EB: @ 81F50EB
+	.string "We’re standing lookout here.\p"
+	.string "Hey, you! Stay away from the WEATHER\n"
+	.string "INSTITUTE. It’s not safe.$"
+
+Route119_Text_1F5147: @ 81F5147
+	.string "Lookout duty is surprisingly boring.\p"
+	.string "Hey, you! Please don’t go near the\n"
+	.string "WEATHER INSTITUTE.$"
+
+Route119_Text_1F51A2: @ 81F51A2
+	.string "I thought you FLY by catching a whole\n"
+	.string "flock of BIRD POKéMON, and then\l"
+	.string "hanging on to them somehow.\p"
+	.string "But it turns out there’s an HM move\n"
+	.string "called FLY!\p"
+	.string "I wish I’d known about that a long\n"
+	.string "time ago…$"
+
+Route119_Text_1F5261: @ 81F5261
+	.string "Tch…\n"
+	.string "It’s a no-go…\p"
+	.string "The tall grass snares BIKE tires.\n"
+	.string "There’s no way you can cycle here.$"
+
+Route119_Text_1F52B9: @ 81F52B9
+	.string "Can your POKéMON use its SECRET POWER\n"
+	.string "on a big pile of grass and make a\l"
+	.string "SECRET BASE?$"
+
+Route119_Text_1F530E: @ 81F530E
+	.string "ROUTE 119\n"
+	.string "{0x7C} FORTREE CITY$"
+
+Route119_Text_1F5327: @ 81F5327
+	.string "WEATHER INSTITUTE$"
+
+Route119_Text_1F5339: @ 81F5339
+	.string "TRAINER TIPS\p"
+	.string "Up to sixteen decorations and\n"
+	.string "furniture items can be placed in\l"
+	.string "a SECRET BASE.\p"
+	.string "Pick your favorite items and create\n"
+	.string "your very own SECRET BASE exactly the\l"
+	.string "way you want.$"
diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc
new file mode 100644
index 000000000..ebae9a0fc
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..e06dc3147 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -1,15 +1,15 @@
 Route119_House: @ 8485D28
-	.4byte Route119_House_MapAttributes
+	.4byte House1_Layout
 	.4byte Route119_House_MapEvents
 	.4byte Route119_House_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 59
-	.byte 34
+	.byte MAPSEC_ROUTE_119
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..01a93f7e6
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18
+	bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18
+	bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18
+	bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, 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..ce15e7ea7 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 271
-	.byte 34
+	.byte MAPSEC_ROUTE_119
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d3389f615
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 893
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 992
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 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..eb8d25cd0 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 272
-	.byte 34
+	.byte MAPSEC_ROUTE_119
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
new file mode 100644
index 000000000..b2341bf3d
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -0,0 +1,339 @@
+Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
+	map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24
+	.byte 0
+
+Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44
+	setobjectxyperm 5, 1, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50
+	setobjectxyperm 5, 4, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C
+	setobjectxyperm 5, 2, 2
+	setobjectmovementtype 5, 7
+	return
+
+Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68
+	trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F
+	msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F
+	trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208
+	msgbox Route119_WeatherInstitute_2F_Text_27022B, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96
+	trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE
+	msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD
+	trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8
+	msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
+	msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4
+	closemessage
+	addobject 7
+	applymovement 7, Route119_WeatherInstitute_2F_Movement_270170
+	applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C
+	waitmovement 0
+	msgbox Route119_WeatherInstitute_2F_Text_270568, 4
+	closemessage
+	playse SE_PIN
+	applymovement 3, Route119_WeatherInstitute_2F_Movement_272598
+	waitmovement 0
+	applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A
+	waitmovement 0
+	msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4
+	closemessage
+	setvar VAR_WEATHER_INSTITUTE_STATE, 1
+	clearflag FLAG_0x37D
+	fadedefaultbgm
+	fadescreen 1
+	setflag FLAG_0x37A
+	setflag FLAG_0x3E0
+	removeobject 1
+	removeobject 2
+	removeobject 3
+	removeobject 8
+	removeobject 7
+	applymovement 255, Route119_WeatherInstitute_2F_Movement_270184
+	waitmovement 0
+	fadescreen 0
+	applymovement 5, Route119_WeatherInstitute_2F_Movement_270187
+	waitmovement 0
+	moveobjectoffscreen 5
+	goto Route119_WeatherInstitute_2F_EventScript_27004D
+	end
+
+Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
+	msgbox Route119_WeatherInstitute_2F_Text_270650, 4
+	setvar VAR_TEMP_1, 385
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	compare VAR_RESULT, 0
+	goto_eq Route119_WeatherInstitute_2F_EventScript_270085
+	compare VAR_RESULT, 1
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD
+	goto Route119_WeatherInstitute_2F_EventScript_273811
+	end
+
+Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
+	call Route119_WeatherInstitute_2F_EventScript_2700DB
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA
+	call Route119_WeatherInstitute_2F_EventScript_27378B
+	call Route119_WeatherInstitute_2F_EventScript_2723DD
+	goto Route119_WeatherInstitute_2F_EventScript_2700EA
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
+	call Route119_WeatherInstitute_2F_EventScript_2700DB
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0
+	call Route119_WeatherInstitute_2F_EventScript_273797
+	goto Route119_WeatherInstitute_2F_EventScript_2700D0
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0
+	call Route119_WeatherInstitute_2F_EventScript_2737A0
+	goto Route119_WeatherInstitute_2F_EventScript_2700EA
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB
+	playfanfare MUS_FANFA4
+	message Route119_WeatherInstitute_2F_Text_2706E8
+	waitmessage
+	waitfanfare
+	bufferspeciesname 0, SPECIES_CASTFORM
+	return
+
+Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA
+	msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4
+	setflag FLAG_0x097
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq Route119_WeatherInstitute_2F_EventScript_27010A
+	msgbox Route119_WeatherInstitute_2F_Text_27077E, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A
+	setvar VAR_0x8004, 0
+	checkflag FLAG_0x1BE
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_270160
+	checkflag FLAG_0x1BF
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_270160
+	compare VAR_0x8004, 2
+	goto_eq Route119_WeatherInstitute_2F_EventScript_270166
+	checkflag FLAG_0x002
+	call_if 0, Route119_WeatherInstitute_2F_EventScript_270159
+	specialvar VAR_RESULT, sub_813B374
+	compare VAR_RESULT, 1
+	goto_eq Route119_WeatherInstitute_2F_EventScript_27014F
+	msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F
+	msgbox Route119_WeatherInstitute_2F_Text_270873, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159
+	special sub_813B2E4
+	setflag FLAG_0x002
+	return
+
+Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160
+	addvar VAR_0x8004, 1
+	return
+
+Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166
+	msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_Movement_270170: @ 8270170
+	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_fast_left
+	walk_fast_left
+	step_end
+
+Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	ride_water_current_up
+	walk_in_place_fastest_down
+	step_end
+
+Route119_WeatherInstitute_2F_Movement_270184: @ 8270184
+	slide_down
+	walk_in_place_fastest_left
+	step_end
+
+Route119_WeatherInstitute_2F_Movement_270187: @ 8270187
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B
+	lock
+	faceplayer
+	checkflag FLAG_0x097
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700F7
+	goto Route119_WeatherInstitute_2F_EventScript_27004D
+	end
+
+Route119_WeatherInstitute_2F_Text_27019C: @ 827019C
+	.string "The INSTITUTE created a type of\n"
+	.string "POKéMON that has something to do with\l"
+	.string "the weather. We’re here to take them!$"
+
+Route119_WeatherInstitute_2F_Text_270208: @ 8270208
+	.string "Our plan’s being spoiled by a kid?$"
+
+Route119_WeatherInstitute_2F_Text_27022B: @ 827022B
+	.string "If the POKéMON they made here can\n"
+	.string "control the weather freely, then we of\l"
+	.string "TEAM AQUA definitely need it!$"
+
+Route119_WeatherInstitute_2F_Text_270292: @ 8270292
+	.string "We’re TEAM AQUA!\n"
+	.string "We appear wherever anything rare is\l"
+	.string "found!$"
+
+Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE
+	.string "You got me!$"
+
+Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA
+	.string "You don’t have any idea what we of\n"
+	.string "TEAM AQUA are working towards!\l"
+	.string "You stay out of our way!$"
+
+Route119_WeatherInstitute_2F_Text_270335: @ 8270335
+	.string "Don’t tell me you’re looking for that\n"
+	.string "weather POKéMON, too?\p"
+	.string "That’s a no-no!\n"
+	.string "We were here to get it first!$"
+
+Route119_WeatherInstitute_2F_Text_27039F: @ 827039F
+	.string "Oh, will you look at my POKéMON?$"
+
+Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0
+	.string "Humph, so what?\n"
+	.string "What we want…\p"
+	.string "What we really want isn’t here…\n"
+	.string "Ihihihihi…$"
+
+Route119_WeatherInstitute_2F_Text_270409: @ 8270409
+	.string "Ahahahaha!\p"
+	.string "You’re going to meddle in TEAM AQUA’s\n"
+	.string "affairs?\p"
+	.string "You’re either absolutely fearless,\n"
+	.string "simply ignorant, or both!\p"
+	.string "You’re so cute, you’re disgusting!\n"
+	.string "I’ll put you down, kiddy!$"
+
+Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD
+	.string "Ahahahaha!\n"
+	.string "You’re disgustingly strong!$"
+
+Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4
+	.string "It’s bad enough to have TEAM MAGMA\n"
+	.string "blunder about, but now there’s you!\p"
+	.string "What makes you want to sniff around\n"
+	.string "in our business, anyway?$"
+
+Route119_WeatherInstitute_2F_Text_270568: @ 8270568
+	.string "We have a situation here!\p"
+	.string "A TEAM MAGMA mob just passed\n"
+	.string "the WEATHER INSTITUTE.\p"
+	.string "They appear to be headed for\n"
+	.string "MT. PYRE!$"
+
+Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD
+	.string "What?!\p"
+	.string "We can’t waste any more time here!\n"
+	.string "We have to hurry to MT. PYRE, too!\p"
+	.string "Ahahahaha!\n"
+	.string "TEAM MAGMA, just you wait!$"
+
+Route119_WeatherInstitute_2F_Text_270650: @ 8270650
+	.string "Thanks!\n"
+	.string "Thanks to you, we’re safe!\p"
+	.string "It might be an odd way of thanking you,\n"
+	.string "but take this POKéMON.$"
+
+Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2
+	.string "Hm? You don’t seem to have any room\n"
+	.string "for this POKéMON.$"
+
+Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8
+	.string "{PLAYER} received CASTFORM!$"
+
+Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE
+	.string "That POKéMON changes shape according\n"
+	.string "to the weather conditions.\p"
+	.string "There’re plenty of them in the\n"
+	.string "INSTITUTE--go ahead and take it.$"
+
+Route119_WeatherInstitute_2F_Text_27077E: @ 827077E
+	.string "I’ve been researching rain for many\n"
+	.string "years, but it’s ridiculous to think that\l"
+	.string "humans can freely change the weather.$"
+
+Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1
+	.string "I track weather patterns over\n"
+	.string "the HOENN region.\p"
+	.string "Presently, a drought has been recorded\n"
+	.string "in {STR_VAR_1}.\p"
+	.string "Could that mean, somewhere near\n"
+	.string "{STR_VAR_1}…$"
+
+Route119_WeatherInstitute_2F_Text_270873: @ 8270873
+	.string "I track weather patterns over\n"
+	.string "the HOENN region.\p"
+	.string "Presently, heavy rainfall has been\n"
+	.string "recorded over {STR_VAR_1}.\p"
+	.string "Could that mean, somewhere near\n"
+	.string "{STR_VAR_1}…$"
+
+Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC
+	.string "Abnormal weather conditions are\n"
+	.string "no longer being reported.\p"
+	.string "The occasional rainfall is a blessing,\n"
+	.string "really.$"
+
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..97ae62fe6
--- /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, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0
+	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0
+	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, 1030
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, 798
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, 798
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, 902
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, 902
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, 17
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, 1031
+	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0
+	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, 1108
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, 1107
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, 970
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, 972
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 20
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, 18
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0
+	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 981
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, 982
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, 985
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, 986
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, 988
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, 987
+	object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0
+	object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0
+	object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+
+Route120_MapBGEvents: @ 852B958
+	bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5
+	bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE
+	bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1
+	bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1
+	bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2
+	bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2
+	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3
+	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3
+	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3
+	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, 71
+	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, 84
+	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, 69
+	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, 70
+	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
+
+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..a3b062bca 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -1,15 +1,15 @@
 Route120: @ 848288C
-	.4byte Route120_MapAttributes
+	.4byte Route120_Layout
 	.4byte Route120_MapEvents
 	.4byte Route120_MapScripts
 	.4byte Route120_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 36
-	.byte 35
+	.byte MAPSEC_ROUTE_120
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
new file mode 100644
index 000000000..7d6876aeb
--- /dev/null
+++ b/data/maps/Route120/scripts.inc
@@ -0,0 +1,466 @@
+Route120_MapScripts:: @ 81F53EC
+	map_script 5, Route120_MapScript1_1F53FC
+	map_script 3, Route120_MapScript1_1F54CD
+	map_script 1, Route120_MapScript1_1F5474
+	.byte 0
+
+Route120_MapScript1_1F53FC: @ 81F53FC
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, Route120_EventScript_1F5406
+	end
+
+Route120_EventScript_1F5406:: @ 81F5406
+	compare VAR_0x8009, 0
+	call_if 1, Route120_EventScript_1F5449
+	compare VAR_0x8009, 1
+	call_if 1, Route120_EventScript_1F5460
+	compare VAR_0x8009, 2
+	call_if 1, Route120_EventScript_1F5460
+	compare VAR_0x8009, 3
+	call_if 1, Route120_EventScript_1F5460
+	compare VAR_0x8009, 4
+	call_if 1, Route120_EventScript_1F5460
+	compare VAR_0x8009, 5
+	call_if 1, Route120_EventScript_1F5460
+	return
+
+Route120_EventScript_1F5449:: @ 81F5449
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, Route120_EventScript_27374E
+	removeobject 30
+	removeobject 36
+	return
+
+Route120_EventScript_1F5460:: @ 81F5460
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, Route120_EventScript_27374E
+	removeobject VAR_LAST_TALKED
+	return
+
+Route120_MapScript1_1F5474: @ 81F5474
+	checkflag FLAG_0x0E4
+	call_if 0, Route120_EventScript_1F5490
+	checkflag FLAG_0x11D
+	call_if 1, Route120_EventScript_1F54A3
+	checkflag FLAG_0x11D
+	call_if 0, Route120_EventScript_1F54C8
+	end
+
+Route120_EventScript_1F5490:: @ 81F5490
+	setmetatile 7, 54, 124, 1
+	setmetatile 7, 55, 145, 1
+	return
+
+Route120_EventScript_1F54A3:: @ 81F54A3
+	setmetatile 13, 15, 663, 0
+	setmetatile 12, 16, 671, 0
+	setmetatile 12, 17, 161, 0
+	setmetatile 13, 17, 161, 0
+	return
+
+Route120_EventScript_1F54C8:: @ 81F54C8
+	setobjectmovementtype 36, 10
+	return
+
+Route120_MapScript1_1F54CD: @ 81F54CD
+	call Route120_EventScript_28CCC7
+	call Route120_EventScript_1F54D8
+	end
+
+Route120_EventScript_1F54D8:: @ 81F54D8
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_1, 14
+	goto_if 3, Route120_EventScript_1F5503
+	compare VAR_TEMP_1, 60
+	goto_if 3, Route120_EventScript_1F5507
+	compare VAR_TEMP_1, 61
+	goto_if 4, Route120_EventScript_1F54FF
+	return
+
+Route120_EventScript_1F54FF:: @ 81F54FF
+	setweather 1
+	return
+
+Route120_EventScript_1F5503:: @ 81F5503
+	setweather 2
+	return
+
+Route120_EventScript_1F5507:: @ 81F5507
+	compare VAR_TEMP_0, 7
+	goto_if 3, Route120_EventScript_1F5523
+	compare VAR_TEMP_0, 19
+	goto_if 3, Route120_EventScript_1F5503
+	goto Route120_EventScript_1F5523
+	end
+
+Route120_EventScript_1F5523:: @ 81F5523
+	setweather 3
+	return
+
+Route120_EventScript_1F5527:: @ 81F5527
+	lock
+	faceplayer
+	dodailyevents
+	checkflag FLAG_0x92E
+	goto_eq Route120_EventScript_1F5625
+	msgbox Route120_Text_2A70C7, 5
+	compare VAR_RESULT, 1
+	call_if 1, Route120_EventScript_1F562F
+	compare VAR_RESULT, 0
+	call_if 1, Route120_EventScript_1F5638
+	specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit
+	switch VAR_RESULT
+	case 0, Route120_EventScript_1F55CA
+	case 5, Route120_EventScript_1F55CA
+	case 1, Route120_EventScript_1F55D5
+	case 6, Route120_EventScript_1F55D5
+	case 2, Route120_EventScript_1F55E0
+	case 7, Route120_EventScript_1F55E0
+	case 3, Route120_EventScript_1F55EB
+	case 8, Route120_EventScript_1F55EB
+	case 4, Route120_EventScript_1F55F6
+	case 9, Route120_EventScript_1F55F6
+	end
+
+Route120_EventScript_1F55CA:: @ 81F55CA
+	setvar VAR_0x8004, 143
+	goto Route120_EventScript_1F5601
+	end
+
+Route120_EventScript_1F55D5:: @ 81F55D5
+	setvar VAR_0x8004, 144
+	goto Route120_EventScript_1F5601
+	end
+
+Route120_EventScript_1F55E0:: @ 81F55E0
+	setvar VAR_0x8004, 145
+	goto Route120_EventScript_1F5601
+	end
+
+Route120_EventScript_1F55EB:: @ 81F55EB
+	setvar VAR_0x8004, 146
+	goto Route120_EventScript_1F5601
+	end
+
+Route120_EventScript_1F55F6:: @ 81F55F6
+	setvar VAR_0x8004, 147
+	goto Route120_EventScript_1F5601
+	end
+
+Route120_EventScript_1F5601:: @ 81F5601
+	giveitem_std VAR_0x8004
+	compare VAR_RESULT, 0
+	goto_eq Route120_EventScript_272054
+	setflag FLAG_0x92E
+	msgbox Route120_Text_2A71D5, 4
+	release
+	end
+
+Route120_EventScript_1F5625:: @ 81F5625
+	msgbox Route120_Text_2A7217, 4
+	release
+	end
+
+Route120_EventScript_1F562F:: @ 81F562F
+	msgbox Route120_Text_2A7147, 4
+	return
+
+Route120_EventScript_1F5638:: @ 81F5638
+	msgbox Route120_Text_2A7183, 4
+	return
+
+Route120_EventScript_1F5641:: @ 81F5641
+	lock
+	faceplayer
+	checkflag FLAG_0x122
+	goto_eq Route120_EventScript_1F5672
+	msgbox Route120_Text_1F5998, 5
+	compare VAR_RESULT, 0
+	goto_eq Route120_EventScript_1F5665
+	goto Route120_EventScript_1F568B
+	end
+
+Route120_EventScript_1F5665:: @ 81F5665
+	msgbox Route120_Text_1F5AAC, 4
+	setflag FLAG_0x122
+	release
+	end
+
+Route120_EventScript_1F5672:: @ 81F5672
+	msgbox Route120_Text_1F5ADE, 5
+	compare VAR_RESULT, 0
+	goto_eq Route120_EventScript_1F5665
+	goto Route120_EventScript_1F568B
+	end
+
+Route120_EventScript_1F568B:: @ 81F568B
+	msgbox Route120_Text_1F5B0F, 4
+	closemessage
+	compare VAR_FACING, 2
+	call_if 1, Route120_EventScript_1F57A3
+	compare VAR_FACING, 3
+	call_if 1, Route120_EventScript_1F57AE
+	applymovement 31, Route120_Movement_2725A4
+	waitmovement 0
+	delay 20
+	msgbox Route120_Text_1F5B43, 4
+	closemessage
+	applymovement 30, Route120_Movement_2725A8
+	waitmovement 0
+	applymovement 30, Route120_Movement_2723C7
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KECLEON, 2
+	delay 40
+	waitmoncry
+	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
+	setvar VAR_0x8009, 0
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	dowildbattle
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq Route120_EventScript_1F571C
+	compare VAR_RESULT, 4
+	goto_eq Route120_EventScript_1F571C
+	compare VAR_RESULT, 5
+	goto_eq Route120_EventScript_1F571C
+	goto Route120_EventScript_1F572C
+	end
+
+Route120_EventScript_1F571C:: @ 81F571C
+	fadescreenswapbuffers 1
+	removeobject 30
+	removeobject 36
+	fadescreenswapbuffers 0
+	goto Route120_EventScript_1F572C
+	end
+
+Route120_EventScript_1F572C:: @ 81F572C
+	applymovement 31, Route120_Movement_2725AA
+	applymovement 255, Route120_Movement_2725A6
+	waitmovement 0
+	msgbox Route120_Text_1F5BAF, 4
+	giveitem_std ITEM_DEVON_SCOPE
+	setflag FLAG_0x11D
+	msgbox Route120_Text_1F5C7B, 4
+	closemessage
+	applymovement 31, Route120_Movement_2725AA
+	waitmovement 0
+	delay 50
+	setfieldeffectargument 0, 1
+	dofieldeffect 30
+	delay 15
+	removeobject 31
+	waitfieldeffect 30
+	setmetatile 13, 15, 663, 0
+	setmetatile 12, 16, 671, 0
+	setmetatile 12, 17, 161, 0
+	setmetatile 13, 17, 161, 0
+	special DrawWholeMapView
+	release
+	end
+
+Route120_EventScript_1F57A3:: @ 81F57A3
+	applymovement 255, Route120_Movement_2725A4
+	waitmovement 0
+	return
+
+Route120_EventScript_1F57AE:: @ 81F57AE
+	applymovement 255, Route120_Movement_1F57B9
+	waitmovement 0
+	return
+
+Route120_Movement_1F57B9: @ 81F57B9
+	walk_down
+	walk_left
+	step_end
+
+Route120_EventScript_1F57BC:: @ 81F57BC
+	msgbox Route120_Text_1F5D00, 2
+	end
+
+Route120_EventScript_1F57C5:: @ 81F57C5
+	msgbox Route120_Text_1F5DCB, 3
+	end
+
+Route120_EventScript_1F57CE:: @ 81F57CE
+	msgbox Route120_Text_1F5DE4, 3
+	end
+
+Route120_EventScript_1F57D7:: @ 81F57D7
+	trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665
+	msgbox Route120_Text_29E67A, 6
+	end
+
+Route120_EventScript_1F57EE:: @ 81F57EE
+	trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route120_EventScript_1F5839
+	msgbox Route120_Text_29E726, 4
+	release
+	end
+
+Route120_EventScript_1F581A:: @ 81F581A
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route120_Text_29E75D, 4
+	setvar VAR_0x8004, 406
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 406
+	callstd 8
+	release
+	end
+
+Route120_EventScript_1F5839:: @ 81F5839
+	trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1
+	msgbox Route120_Text_29E804, 6
+	end
+
+Route120_EventScript_1F5850:: @ 81F5850
+	trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884
+	msgbox Route120_Text_29E8C5, 6
+	end
+
+Route120_EventScript_1F5867:: @ 81F5867
+	trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980
+	msgbox Route120_Text_29E996, 6
+	end
+
+Route120_EventScript_1F587E:: @ 81F587E
+	trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route120_EventScript_1F58C9
+	msgbox Route120_Text_29EA08, 4
+	release
+	end
+
+Route120_EventScript_1F58AA:: @ 81F58AA
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route120_Text_29EA31, 4
+	setvar VAR_0x8004, 226
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 226
+	callstd 8
+	release
+	end
+
+Route120_EventScript_1F58C9:: @ 81F58C9
+	trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F
+	msgbox Route120_Text_29EAA9, 6
+	end
+
+Route120_EventScript_1F58E0:: @ 81F58E0
+	trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53
+	msgbox Route120_Text_29EB6E, 6
+	end
+
+Route120_EventScript_1F58F7:: @ 81F58F7
+	trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25
+	msgbox Route120_Text_29EC41, 6
+	end
+
+Route120_EventScript_1F590E:: @ 81F590E
+	trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF
+	msgbox Route120_Text_29ED19, 6
+	end
+
+Route120_EventScript_1F5925:: @ 81F5925
+	trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3
+	msgbox Route120_Text_29EDF7, 6
+	end
+
+Route120_EventScript_1F593C:: @ 81F593C
+	trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97
+	msgbox Route120_Text_29EED4, 6
+	end
+
+Route120_EventScript_1F5953:: @ 81F5953
+	trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63
+	msgbox Route120_Text_29EF89, 6
+	end
+
+Route120_EventScript_1F596A:: @ 81F596A
+	trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080
+	msgbox Route120_Text_29F0A1, 6
+	end
+
+Route120_EventScript_1F5981:: @ 81F5981
+	trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1
+	msgbox Route120_Text_29F002, 6
+	end
+
+Route120_Text_1F5998: @ 81F5998
+	.string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n"
+	.string "It’s been a while.\p"
+	.string "There’s something here that you can’t\n"
+	.string "see, right?\p"
+	.string "Now, if I were to use this device on\n"
+	.string "the invisible obstacle…\p"
+	.string "No, no. Rather than describing it,\n"
+	.string "I should just show you.\l"
+	.string "That would be more fun.\p"
+	.string "{PLAYER}{KUN}, are your POKéMON ready for\n"
+	.string "battle?$"
+
+Route120_Text_1F5AAC: @ 81F5AAC
+	.string "STEVEN: No?\p"
+	.string "I’ll wait here, so you can get ready.$"
+
+Route120_Text_1F5ADE: @ 81F5ADE
+	.string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n"
+	.string "ready for battle?$"
+
+Route120_Text_1F5B0F: @ 81F5B0F
+	.string "STEVEN: {PLAYER}{KUN}, show me your true\n"
+	.string "power as a TRAINER!$"
+
+Route120_Text_1F5B43: @ 81F5B43
+	.string "STEVEN used the DEVON SCOPE.\p"
+	.string "An invisible POKéMON became completely\n"
+	.string "visible!\p"
+	.string "The startled POKéMON attacked!$"
+
+Route120_Text_1F5BAF: @ 81F5BAF
+	.string "STEVEN: I see…\n"
+	.string "Your battle style is intriguing.\p"
+	.string "Your POKéMON have obviously grown\n"
+	.string "since I first met you in DEWFORD.\p"
+	.string "I’d like you to have this\n"
+	.string "DEVON SCOPE.\p"
+	.string "Who knows, there may be other\n"
+	.string "concealed POKéMON.$"
+
+Route120_Text_1F5C7B: @ 81F5C7B
+	.string "STEVEN: {PLAYER}{KUN}.\p"
+	.string "I enjoy seeing POKéMON and TRAINERS\n"
+	.string "who strive together.\p"
+	.string "I think you’re doing great.\p"
+	.string "Well, let’s meet again somewhere.$"
+
+Route119_Text_1F5D00: @ 81F5D00
+Route120_Text_1F5D00: @ 81F5D00
+	.string "Something unseeable is in the way.$"
+
+Route119_Text_1F5D23: @ 81F5D23
+	.string "Something unseeable is in the way.\p"
+	.string "Want to use the DEVON SCOPE?$"
+
+Route119_Text_1F5D63: @ 81F5D63
+	.string "{PLAYER} used the DEVON SCOPE.\p"
+	.string "An invisible POKéMON became completely\n"
+	.string "visible!\p"
+	.string "The startled POKéMON attacked!$"
+
+Route120_Text_1F5DCB: @ 81F5DCB
+	.string "ROUTE 120\n"
+	.string "{0x7B} FORTREE CITY$"
+
+Route120_Text_1F5DE4: @ 81F5DE4
+	.string "{0x7C} ROUTE 121\n"
+	.string "{0x7B} ROUTE 120$"
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..03f86df42
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0
+	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0
+	object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 914
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 914
+	object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18
+	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0
+	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0
+	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0
+	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, 1103
+	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19
+	object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0
+	object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0
+	object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0
+	object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, 1149
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_0x4074, 0, Route121_EventScript_1F5E18
+	coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
+	coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
+	coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18
+
+Route121_MapBGEvents: @ 852BD14
+	bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06
+	bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2
+	bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2
+	bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2
+	bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2
+	bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F
+	bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, 39
+	bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, 40
+	bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, 73
+	bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, 100
+
+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..5f744afaf 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -1,15 +1,15 @@
 Route121: @ 84828A8
-	.4byte Route121_MapAttributes
+	.4byte Route121_Layout
 	.4byte Route121_MapEvents
 	.4byte Route121_MapScripts
 	.4byte Route121_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 37
-	.byte 36
+	.byte MAPSEC_ROUTE_121
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
new file mode 100644
index 000000000..f133ffe56
--- /dev/null
+++ b/data/maps/Route121/scripts.inc
@@ -0,0 +1,200 @@
+Route121_MapScripts:: @ 81F5DFC
+	.byte 0
+
+Route121_EventScript_1F5DFD:: @ 81F5DFD
+	msgbox Route121_Text_1F607F, 2
+	end
+
+Route121_EventScript_1F5E06:: @ 81F5E06
+	msgbox Route121_Text_1F60D3, 3
+	end
+
+Route121_EventScript_1F5E0F:: @ 81F5E0F
+	msgbox Route121_Text_1F611E, 3
+	end
+
+Route121_EventScript_1F5E18:: @ 81F5E18
+	lockall
+	playbgm MUS_AQA_0, 0
+	applymovement 13, Route121_Movement_2725B8
+	waitmovement 0
+	msgbox Route121_Text_1F605A, 4
+	closemessage
+	applymovement 12, Route121_Movement_1F5E59
+	applymovement 13, Route121_Movement_1F5E62
+	applymovement 14, Route121_Movement_1F5E6B
+	waitmovement 0
+	fadedefaultbgm
+	removeobject 12
+	removeobject 13
+	removeobject 14
+	setvar VAR_0x4074, 1
+	releaseall
+	end
+
+Route121_Movement_1F5E59: @ 81F5E59
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+Route121_Movement_1F5E62: @ 81F5E62
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+Route121_Movement_1F5E6B: @ 81F5E6B
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+Route121_EventScript_1F5E74:: @ 81F5E74
+	trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F
+	msgbox Route121_Text_29F138, 6
+	end
+
+Route121_EventScript_1F5E8B:: @ 81F5E8B
+	trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route121_EventScript_1F5ED6
+	msgbox Route121_Text_29F21E, 4
+	release
+	end
+
+Route121_EventScript_1F5EB7:: @ 81F5EB7
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route121_Text_29F25B, 4
+	setvar VAR_0x8004, 254
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 254
+	callstd 8
+	release
+	end
+
+Route121_EventScript_1F5ED6:: @ 81F5ED6
+	trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A
+	msgbox Route121_Text_29F32B, 6
+	end
+
+Route121_EventScript_1F5EED:: @ 81F5EED
+	trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9
+	msgbox Route121_Text_29F3C6, 6
+	end
+
+Route121_EventScript_1F5F04:: @ 81F5F04
+	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9
+	msgbox Route121_Text_29F476, 6
+	end
+
+Route121_EventScript_1F5F1F:: @ 81F5F1F
+	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE
+	msgbox Route121_Text_29F582, 6
+	end
+
+Route121_EventScript_1F5F3A:: @ 81F5F3A
+	trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route121_EventScript_1F5F85
+	msgbox Route121_Text_29F66F, 4
+	release
+	end
+
+Route121_EventScript_1F5F66:: @ 81F5F66
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route121_Text_29F69F, 4
+	setvar VAR_0x8004, 127
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 127
+	callstd 8
+	release
+	end
+
+Route121_EventScript_1F5F85:: @ 81F5F85
+	trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710
+	msgbox Route121_Text_29F740, 6
+	end
+
+Route121_EventScript_1F5F9C:: @ 81F5F9C
+	trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B
+	msgbox Route121_Text_29F9AE, 6
+	end
+
+Route121_EventScript_1F5FB3:: @ 81F5FB3
+	trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64
+	msgbox Route121_Text_29FA73, 6
+	end
+
+Route121_EventScript_1F5FCA:: @ 81F5FCA
+	trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8
+	msgbox Route121_Text_29FAEA, 6
+	end
+
+Route121_EventScript_1F5FE1:: @ 81F5FE1
+	trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C
+	msgbox Route121_Text_29FBA8, 6
+	end
+
+Route121_EventScript_1F5FF8:: @ 81F5FF8
+	trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route121_EventScript_1F6043
+	msgbox Route121_Text_29F7D4, 4
+	release
+	end
+
+Route121_EventScript_1F6024:: @ 81F6024
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route121_Text_29F80D, 4
+	setvar VAR_0x8004, 767
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 767
+	callstd 8
+	release
+	end
+
+Route121_EventScript_1F6043:: @ 81F6043
+	trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8
+	msgbox Route121_Text_29F8D0, 6
+	end
+
+Route121_Text_1F605A: @ 81F605A
+	.string "Okay!\n"
+	.string "We’re to move out to MT. PYRE!$"
+
+Route121_Text_1F607F: @ 81F607F
+	.string "Ahead looms MT. PYRE…\p"
+	.string "It is a natural monument to the spirits \n"
+	.string "of departed POKéMON…$"
+
+Route121_Text_1F60D3: @ 81F60D3
+	.string "MT. PYRE PIER\p"
+	.string "…The sign is old and worn out.\n"
+	.string "The words are barely legible…$"
+
+Route121_Text_1F611E: @ 81F611E
+	.string "“Filled with rare POKéMON!”\n"
+	.string "SAFARI ZONE$"
+
diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc
new file mode 100644
index 000000000..658be476f
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18
+
+Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54
+	bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..3617aa5b0 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -1,15 +1,15 @@
 Route121_SafariZoneEntrance: @ 8483EA4
-	.4byte Route121_SafariZoneEntrance_MapAttributes
+	.4byte Route121_SafariZoneEntrance_Layout
 	.4byte Route121_SafariZoneEntrance_MapEvents
 	.4byte Route121_SafariZoneEntrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 124
-	.byte 36
+	.byte MAPSEC_ROUTE_121
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7e6dc55c2 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -1,15 +1,15 @@
 Route122: @ 84828C4
-	.4byte Route122_MapAttributes
+	.4byte Route122_Layout
 	.4byte Route122_MapEvents
 	.4byte Route122_MapScripts
 	.4byte Route122_MapConnections
 	.2byte MUS_DOORO_X4
 	.2byte 38
-	.byte 37
+	.byte MAPSEC_ROUTE_122
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3f17c6c3d
--- /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, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0
+	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 17
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 18
+	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, 19
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032
+	object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0
+	object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0
+	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0
+	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0
+	object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0
+	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0
+	object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0
+	object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0
+	object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, 1104
+	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, 1109
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0
+	object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0
+	object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0
+	object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0
+	object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0
+	object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0
+	object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, 1152
+	object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0
+	object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0
+	object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+
+Route123_MapBGEvents: @ 852C32C
+	bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3
+	bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2
+	bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2
+	bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA
+	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, 7
+	bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC
+	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3
+	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, 41
+	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, 74
+	bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, 99
+	bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, 110
+
+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..9eba6be87 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -1,15 +1,15 @@
 Route123: @ 84828E0
-	.4byte Route123_MapAttributes
+	.4byte Route123_Layout
 	.4byte Route123_MapEvents
 	.4byte Route123_MapScripts
 	.4byte Route123_MapConnections
 	.2byte MUS_DOORO_X4
 	.2byte 39
-	.byte 38
+	.byte MAPSEC_ROUTE_123
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c848f341b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..009b6fa98 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -1,15 +1,15 @@
 Route123_BerryMastersHouse: @ 8485CD4
-	.4byte Route123_BerryMastersHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte Route123_BerryMastersHouse_MapEvents
 	.4byte Route123_BerryMastersHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 60
-	.byte 38
+	.byte MAPSEC_ROUTE_123
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..30ff07ee9
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0
+	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0
+	object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0
+	object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, 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..43aab1b68 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -1,15 +1,15 @@
 Route124: @ 84828FC
-	.4byte Route124_MapAttributes
+	.4byte Route124_Layout
 	.4byte Route124_MapEvents
 	.4byte Route124_MapScripts
 	.4byte Route124_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 40
-	.byte 39
+	.byte MAPSEC_ROUTE_124
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f76468efe
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, 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..777edeff2 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -1,15 +1,15 @@
 Route124_DivingTreasureHuntersHouse: @ 8485D44
-	.4byte Route124_DivingTreasureHuntersHouse_MapAttributes
+	.4byte Route124_DivingTreasureHuntersHouse_Layout
 	.4byte Route124_DivingTreasureHuntersHouse_MapEvents
 	.4byte Route124_DivingTreasureHuntersHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_MINAMO
 	.2byte 301
-	.byte 39
+	.byte MAPSEC_ROUTE_124
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b8ced006c
--- /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, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 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_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2
+	bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2
+	bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2
+	bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2
+
+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..8cf6f8531 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -1,15 +1,15 @@
 Route125: @ 8482918
-	.4byte Route125_MapAttributes
+	.4byte Route125_Layout
 	.4byte Route125_MapEvents
 	.4byte Route125_MapScripts
 	.4byte Route125_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 41
-	.byte 40
+	.byte MAPSEC_ROUTE_125
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0c3180a79
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, 1105
+	object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0
+	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 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..3e489dffd 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -1,15 +1,15 @@
 Route126: @ 8482934
-	.4byte Route126_MapAttributes
+	.4byte Route126_Layout
 	.4byte Route126_MapEvents
 	.4byte Route126_MapScripts
 	.4byte Route126_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 42
-	.byte 41
+	.byte MAPSEC_ROUTE_126
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6a7c07b9b
--- /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, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, 1034
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, 1035
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
+	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155
+
+Route127_MapBGEvents: @ 852C83C
+	bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
+	bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2
+	bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1
+	bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3
+	bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3
+
+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..950e11df7 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -1,15 +1,15 @@
 Route127: @ 8482950
-	.4byte Route127_MapAttributes
+	.4byte Route127_Layout
 	.4byte Route127_MapEvents
 	.4byte Route127_MapScripts
 	.4byte Route127_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 43
-	.byte 42
+	.byte MAPSEC_ROUTE_127
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..02d28acfd
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0
+	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 834
+	object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944
+	object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0
+	object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0
+
+Route128_MapBGEvents: @ 852C97C
+	bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, 92
+	bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, 93
+	bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, 94
+
+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..6065e257c 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -1,15 +1,15 @@
 Route128: @ 848296C
-	.4byte Route128_MapAttributes
+	.4byte Route128_Layout
 	.4byte Route128_MapEvents
 	.4byte Route128_MapScripts
 	.4byte Route128_MapConnections
 	.2byte MUS_DOORO_X3
 	.2byte 44
-	.byte 43
+	.byte MAPSEC_ROUTE_128
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
new file mode 100644
index 000000000..8e2742ff5
--- /dev/null
+++ b/data/maps/Route128/scripts.inc
@@ -0,0 +1,311 @@
+Route128_MapScripts:: @ 81F6B38
+	map_script 3, Route128_MapScript1_1F6B43
+	map_script 2, Route128_MapScript2_1F6B4D
+	.byte 0
+
+Route128_MapScript1_1F6B43: @ 81F6B43
+	checkflag FLAG_SYS_WEATHER_CTRL
+	call_if 1, Route128_EventScript_27207A
+	end
+
+Route128_MapScript2_1F6B4D: @ 81F6B4D
+	map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57
+	.2byte 0
+
+Route128_EventScript_1F6B57:: @ 81F6B57
+	lockall
+	delay 20
+	applymovement 4, Route128_Movement_1F6C89
+	waitmovement 0
+	msgbox Route128_Text_1F6DF5, 4
+	closemessage
+	applymovement 4, Route128_Movement_1F6C91
+	waitmovement 0
+	msgbox Route128_Text_1F6E48, 4
+	closemessage
+	applymovement 5, Route128_Movement_1F6CAD
+	waitmovement 0
+	applymovement 4, Route128_Movement_2725A6
+	waitmovement 0
+	msgbox Route128_Text_1F6E5A, 4
+	closemessage
+	applymovement 5, Route128_Movement_1F6CBB
+	waitmovement 0
+	applymovement 255, Route128_Movement_2725A6
+	waitmovement 0
+	msgbox Route128_Text_1F6F1E, 4
+	closemessage
+	applymovement 4, Route128_Movement_1F6C96
+	applymovement 255, Route128_Movement_2725A4
+	applymovement 5, Route128_Movement_1F6CA8
+	waitmovement 0
+	msgbox Route128_Text_1F704F, 4
+	closemessage
+	delay 40
+	applymovement 5, Route128_Movement_1F6CB0
+	applymovement 4, Route128_Movement_1F6C9B
+	waitmovement 0
+	removeobject 5
+	removeobject 4
+	delay 100
+	setfieldeffectargument 0, 1
+	dofieldeffect 30
+	waitfieldeffect 30
+	addobject 3
+	applymovement 3, Route128_Movement_1F6C87
+	waitmovement 0
+	applymovement 255, Route128_Movement_2725A8
+	waitmovement 0
+	msgbox Route128_Text_1F70C9, 4
+	closemessage
+	applymovement 3, Route128_Movement_1F6C85
+	applymovement 255, Route128_Movement_2725A6
+	waitmovement 0
+	msgbox Route128_Text_1F70EA, 4
+	applymovement 3, Route128_Movement_2725AA
+	waitmovement 0
+	msgbox Route128_Text_1F721B, 4
+	closemessage
+	applymovement 3, Route128_Movement_2725AA
+	waitmovement 0
+	delay 50
+	setfieldeffectargument 0, 1
+	dofieldeffect 30
+	delay 15
+	removeobject 3
+	waitfieldeffect 30
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_0x407B, 2
+	releaseall
+	end
+
+Route128_Movement_1F6C76: @ 81F6C76
+	walk_fast_left
+	step_end
+
+Route128_Movement_1F6C78: @ 81F6C78
+	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
+
+Route128_Movement_1F6C85: @ 81F6C85
+	walk_up
+	step_end
+
+Route128_Movement_1F6C87: @ 81F6C87
+	walk_fast_left
+	step_end
+
+Route128_Movement_1F6C89: @ 81F6C89
+	walk_fast_down
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+Route128_Movement_1F6C91: @ 81F6C91
+	lock_facing_direction
+	walk_slow_up
+	delay_16
+	unlock_facing_direction
+	step_end
+
+Route128_Movement_1F6C96: @ 81F6C96
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_in_place_fastest_right
+	step_end
+
+Route128_Movement_1F6C9B: @ 81F6C9B
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_left
+	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
+
+Route128_Movement_1F6CA8: @ 81F6CA8
+	walk_left
+	walk_left
+	delay_8
+	delay_4
+	step_end
+
+Route128_Movement_1F6CAD: @ 81F6CAD
+	walk_left
+	walk_in_place_fastest_down
+	step_end
+
+Route128_Movement_1F6CB0: @ 81F6CB0
+	walk_fast_left
+	walk_fast_left
+	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
+
+Route128_Movement_1F6CBB: @ 81F6CBB
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+Route128_EventScript_1F6CBE:: @ 81F6CBE
+	trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route128_EventScript_1F6D09
+	msgbox Route128_Text_2A28D7, 4
+	release
+	end
+
+Route128_EventScript_1F6CEA:: @ 81F6CEA
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route128_Text_2A2916, 4
+	setvar VAR_0x8004, 376
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 376
+	callstd 8
+	release
+	end
+
+Route128_EventScript_1F6D09:: @ 81F6D09
+	trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8
+	msgbox Route128_Text_2A29DC, 6
+	end
+
+Route128_EventScript_1F6D20:: @ 81F6D20
+	trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route128_EventScript_1F6D6B
+	msgbox Route128_Text_2A2AB7, 4
+	release
+	end
+
+Route128_EventScript_1F6D4C:: @ 81F6D4C
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route128_Text_2A2AF9, 4
+	setvar VAR_0x8004, 386
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 386
+	callstd 8
+	release
+	end
+
+Route128_EventScript_1F6D6B:: @ 81F6D6B
+	trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB
+	msgbox Route128_Text_2A2BDD, 6
+	end
+
+Route128_EventScript_1F6D82:: @ 81F6D82
+	trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79
+	msgbox Route128_Text_2A2C95, 6
+	end
+
+Route128_EventScript_1F6D99:: @ 81F6D99
+	trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE
+	msgbox Route128_Text_2A2D0D, 6
+	end
+
+Route128_EventScript_1F6DB0:: @ 81F6DB0
+	trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9
+	msgbox Route128_Text_2A2DBA, 6
+	end
+
+Route128_EventScript_1F6DC7:: @ 81F6DC7
+	trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44
+	msgbox Route128_Text_2A2E6C, 6
+	end
+
+Route128_EventScript_1F6DDE:: @ 81F6DDE
+	trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA
+	msgbox Route128_Text_2A2F2F, 6
+	end
+
+Route128_Text_1F6DF5: @ 81F6DF5
+	.string "ARCHIE: What happened…\n"
+	.string "What is this wretched scene…\p"
+	.string "Did I…make a horrible mistake?$"
+
+Route128_Text_1F6E48: @ 81F6E48
+	.string "I…\n"
+	.string "I only wanted…$"
+
+Route128_Text_1F6E5A: @ 81F6E5A
+	.string "MAXIE: Do you understand now,\n"
+	.string "ARCHIE?\p"
+	.string "Do you finally see how disastrous\n"
+	.string "your dream turned out to be?\p"
+	.string "We have to hurry! We have to do\n"
+	.string "something before the situation goes\l"
+	.string "completely out of control!$"
+
+Route128_Text_1F6F1E: @ 81F6F1E
+	.string "MAXIE: {PLAYER}, don’t say anything.\p"
+	.string "I know that I have no right to be\n"
+	.string "critical of ARCHIE…\p"
+	.string "But the way things are now, I doubt\n"
+	.string "that we humans will be capable of\l"
+	.string "doing anything about it.\p"
+	.string "But neither can we stand by and\n"
+	.string "just watch helplessly.\p"
+	.string "The responsibility for putting an end\n"
+	.string "to this falls to ARCHIE and me…$"
+
+Route128_Text_1F704F: @ 81F704F
+	.string "MAXIE: This defies belief…\p"
+	.string "Those super-ancient POKéMON…\p"
+	.string "Their power is unbelievable.\n"
+	.string "They’ve upset the balance of nature…$"
+
+Route128_Text_1F70C9: @ 81F70C9
+	.string "STEVEN: {PLAYER}{KUN}!\n"
+	.string "What is happening?$"
+
+Route128_Text_1F70EA: @ 81F70EA
+	.string "This is terrible…\p"
+	.string "After the scorching heat wave ended,\n"
+	.string "this deluge began.\p"
+	.string "If this doesn’t stop, all of HOENN…\n"
+	.string "No, the whole world will drown.\p"
+	.string "This huge rain cloud is spreading\n"
+	.string "from above SOOTOPOLIS…\p"
+	.string "What in the world is taking place there?\p"
+	.string "There’s no point arguing here…\n"
+	.string "SOOTOPOLIS might provide answers…$"
+
+Route128_Text_1F721B: @ 81F721B
+	.string "{PLAYER}{KUN}…\n"
+	.string "I don’t know what you intend to do,\l"
+	.string "but don’t do anything reckless.\p"
+	.string "Okay.\n"
+	.string "I’m going to SOOTOPOLIS.$"
+
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..c127ec5e3
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 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..1bc9ac5f0 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -1,15 +1,15 @@
 Route129: @ 8482988
-	.4byte Route129_MapAttributes
+	.4byte Route129_Layout
 	.4byte Route129_MapEvents
 	.4byte Route129_MapScripts
 	.4byte Route129_MapConnections
 	.2byte MUS_GRANROAD
 	.2byte 45
-	.byte 44
+	.byte MAPSEC_ROUTE_129
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..227e359b6
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, 17
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 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..bff8b4e40 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,15 +1,15 @@
 Route130: @ 84829A4
-	.4byte Route130_MapAttributes
+	.4byte Route130_Layout
 	.4byte Route130_MapEvents
 	.4byte Route130_MapScripts
 	.4byte Route130_MapConnections
 	.2byte MUS_GRANROAD
 	.2byte 263
-	.byte 45
+	.byte MAPSEC_ROUTE_130
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1c321a6cb
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 3, 5, 1, 3, Route131_EventScript_1F746E, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F7485, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0
+	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0
+	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 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..3e6bf34b3 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -1,15 +1,15 @@
 Route131: @ 84829C0
-	.4byte Route131_MapAttributes
+	.4byte Route131_Layout
 	.4byte Route131_MapEvents
 	.4byte Route131_MapScripts
 	.4byte Route131_MapConnections
 	.2byte MUS_GRANROAD
 	.2byte 47
-	.byte 46
+	.byte MAPSEC_ROUTE_131
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7d62fb306
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, 1036
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0
+	object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..4e292a92b 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -1,15 +1,15 @@
 Route132: @ 84829DC
-	.4byte Route132_MapAttributes
+	.4byte Route132_Layout
 	.4byte Route132_MapEvents
 	.4byte Route132_MapScripts
 	.4byte Route132_MapConnections
 	.2byte MUS_GRANROAD
 	.2byte 48
-	.byte 47
+	.byte MAPSEC_ROUTE_132
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ba1ac2ac0
--- /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, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, 1037
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038
+	object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..26428b3dc 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -1,15 +1,15 @@
 Route133: @ 84829F8
-	.4byte Route133_MapAttributes
+	.4byte Route133_Layout
 	.4byte Route133_MapEvents
 	.4byte Route133_MapScripts
 	.4byte Route133_MapConnections
 	.2byte MUS_GRANROAD
 	.2byte 49
-	.byte 48
+	.byte MAPSEC_ROUTE_133
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..03339b081
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0
+	object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0
+	object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..d1df504ed 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -1,15 +1,15 @@
 Route134: @ 8482A14
-	.4byte Route134_MapAttributes
+	.4byte Route134_Layout
 	.4byte Route134_MapEvents
 	.4byte Route134_MapScripts
 	.4byte Route134_MapConnections
 	.2byte MUS_GRANROAD
 	.2byte 50
-	.byte 49
+	.byte MAPSEC_ROUTE_134
 	.byte 0
-	.byte 2
-	.byte 6
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_6
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4471d06e0
--- /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, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, 732
+	object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 731
+	object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041
+	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0
+	object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, 814
+	object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 844
+	object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_0x405A, 1, RustboroCity_EventScript_1E095A
+	coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971
+	coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988
+	coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F
+	coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6
+	coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE
+	coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A
+	coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16
+	coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22
+	coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B
+	coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37
+	coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43
+	coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F
+	coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3
+	coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33
+	coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73
+	coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3
+	coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3
+	coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33
+	coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73
+	coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3
+
+RustboroCity_MapBGEvents: @ 8526B10
+	bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5
+	bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910
+	bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A
+	bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73
+	bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907
+	bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A
+	bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73
+	bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC
+	bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3
+	bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, 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..6e7bb70d4 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -1,15 +1,15 @@
 RustboroCity: @ 848250C
-	.4byte RustboroCity_MapAttributes
+	.4byte RustboroCity_Layout
 	.4byte RustboroCity_MapEvents
 	.4byte RustboroCity_MapScripts
 	.4byte RustboroCity_MapConnections
 	.2byte MUS_GOTOWN
 	.2byte 4
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6657c9305
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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..40742887b 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -1,15 +1,15 @@
 RustboroCity_CuttersHouse: @ 8483478
-	.4byte RustboroCity_CuttersHouse_MapAttributes
+	.4byte RustboroCity_CuttersHouse_Layout
 	.4byte RustboroCity_CuttersHouse_MapEvents
 	.4byte RustboroCity_CuttersHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 98
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..baef1be49
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312
+	bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, 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..d86b8537c 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 92
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f10c94780
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0
+	object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 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..b0da75514 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 93
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..164391cf6
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 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, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600
+	bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, 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..21a33d5b8 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 269
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
new file mode 100644
index 000000000..ffc2614cb
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -0,0 +1,311 @@
+RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D
+	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D
+	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455
+	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464
+	.byte 0
+
+RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D
+	compare VAR_0x408F, 0
+	call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
+	setobjectxyperm 2, 3, 2
+	setobjectmovementtype 2, 9
+	return
+
+RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
+	map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
+	.2byte 0
+
+RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
+	turnobject 255, 4
+	end
+
+RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464
+	map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
+	.2byte 0
+
+RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
+	lockall
+	msgbox RustboroCity_DevonCorp_3F_Text_212C37, 4
+	closemessage
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546
+	waitmovement 0
+	delay 80
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4
+	closemessage
+	playbgm MUS_TSURETEK, 0
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_212E2F, 4
+	closemessage
+	fadedefaultbgm
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_212609, 4
+	giveitem_std ITEM_LETTER
+	msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4
+	playfanfare MUS_FANFA4
+	message RustboroCity_DevonCorp_3F_Text_212820
+	waitfanfare
+	setflag FLAG_SYS_POKENAV_GET
+	setflag FLAG_0x0BC
+	setflag FLAG_0x3E7
+	msgbox RustboroCity_DevonCorp_3F_Text_212837, 4
+	closemessage
+	call RustboroCity_DevonCorp_3F_EventScript_272083
+	msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4
+	setflag FLAG_0x37E
+	clearflag FLAG_0x327
+	clearflag FLAG_0x3D7
+	clearflag FLAG_0x2E3
+	clearflag FLAG_0x371
+	setvar VAR_0x4096, 1
+	clearflag FLAG_0x32E
+	setvar VAR_0x408F, 1
+	setvar VAR_0x405A, 6
+	releaseall
+	end
+
+RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	step_end
+
+RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_left
+	step_end
+
+RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	step_end
+
+RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C
+	lock
+	faceplayer
+	checkflag FLAG_0x110
+	goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC
+	checkflag FLAG_0x0BD
+	goto_eq RustboroCity_DevonCorp_3F_EventScript_212595
+	msgbox RustboroCity_DevonCorp_3F_Text_212A09, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595
+	msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4
+	giveitem_std ITEM_EXP_SHARE
+	compare VAR_RESULT, 0
+	goto_eq RustboroCity_DevonCorp_3F_EventScript_272054
+	setflag FLAG_0x110
+	msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC
+	msgbox RustboroCity_DevonCorp_3F_Text_212B78, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1
+	lock
+	faceplayer
+	checkflag FLAG_0x100
+	goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6
+	msgbox RustboroCity_DevonCorp_3F_Text_212E41, 4
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6
+	msgbox RustboroCity_DevonCorp_3F_Text_212E88, 4
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600
+	msgbox RustboroCity_DevonCorp_3F_Text_212EE9, 3
+	end
+
+RustboroCity_DevonCorp_3F_Text_212609: @ 8212609
+	.string "I’m MR. STONE, the PRESIDENT of\n"
+	.string "the DEVON CORPORATION.\p"
+	.string "I’d just got word about you!\p"
+	.string "You saved our staff not just once,\n"
+	.string "but twice!\p"
+	.string "I have a favor to ask of an amazing\n"
+	.string "person like you.\p"
+	.string "I understand that you’re delivering\n"
+	.string "a package to SLATEPORT’s SHIPYARD.\p"
+	.string "Well, on the way, could you stop off in\n"
+	.string "DEWFORD TOWN?\p"
+	.string "I was hoping that you’d deliver a\n"
+	.string "LETTER to STEVEN in DEWFORD.$"
+
+RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C
+	.string "MR. STONE: Now, you should know that\n"
+	.string "I am a great PRESIDENT.\p"
+	.string "So, I’d never be so cheap as to ask\n"
+	.string "a favor for nothing in return.\p"
+	.string "That’s why I want you to have this!$"
+
+RustboroCity_DevonCorp_3F_Text_212820: @ 8212820
+	.string "{PLAYER} received a POKéNAV.$"
+
+RustboroCity_DevonCorp_3F_Text_212837: @ 8212837
+	.string "MR. STONE: That device…\p"
+	.string "It’s a POKéMON NAVIGATOR, or POKéNAV\n"
+	.string "for short.\p"
+	.string "It’s an indispensable tool for any\n"
+	.string "TRAINER on an adventure.\p"
+	.string "It has a map of the HOENN region.\p"
+	.string "You can check the locations of\n"
+	.string "DEWFORD and SLATEPORT easily!\p"
+	.string "By the way, I’ve heard that sinister\n"
+	.string "criminals--MAGMA and AQUA, I believe--\l"
+	.string "have been making trouble far and wide.\p"
+	.string "I think it would be best if you rested\n"
+	.string "up before you go on your way.$"
+
+RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2
+	.string "MR. STONE: Well, then, {PLAYER}{KUN},\n"
+	.string "go with caution and care!$"
+
+RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09
+	.string "MR. STONE: I’m counting on you!$"
+
+RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29
+	.string "MR. STONE: You delivered my LETTER?\n"
+	.string "Thank you kindly!\p"
+	.string "This is my way of thanking you.\n"
+	.string "It should help you, a TRAINER.$"
+
+RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E
+	.string "MR. STONE: A POKéMON holding that\n"
+	.string "EXP. SHARE will be given some of the\l"
+	.string "EXP Points from battle.\p"
+	.string "It will get EXP Points even if it didn’t\n"
+	.string "actually battle.\p"
+	.string "I would say EXP. SHARE is quite useful\n"
+	.string "for raising weak POKéMON.$"
+
+RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78
+	.string "MR. STONE: Since my youth, I’ve immersed\n"
+	.string "myself in work.\p"
+	.string "Consequently, I’m not familiar with\n"
+	.string "trends and that sort of thing.\p"
+	.string "But do young people all want to be\n"
+	.string "TRAINERS in the POKéMON LEAGUE?$"
+
+RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37
+	.string "This is the DEVON CORPORATION’s\n"
+	.string "third floor.\p"
+	.string "Our PRESIDENT’s OFFICE is on\n"
+	.string "this floor.\p"
+	.string "Anyway, I can’t tell you how much I’m\n"
+	.string "grateful for what you’ve done.\p"
+	.string "Um… By the way, that parcel\n"
+	.string "you got back for us…\p"
+	.string "Could I get you to deliver that to\n"
+	.string "the SHIPYARD in SLATEPORT?\p"
+	.string "It would be awful if those robbers\n"
+	.string "tried to take it again.\p"
+	.string "Uh… Hehehe, so, uh, could I count\n"
+	.string "on you to do that for me?\p"
+	.string "Oh, that’s right.\n"
+	.string "Could you wait here a second?$"
+
+RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8
+	.string "Our PRESIDENT would like to have\n"
+	.string "a word with you.\p"
+	.string "Please come with me.$"
+
+RustboroCity_DevonCorp_3F_Text_212E2F: @ 8212E2F
+	.string "Please, go ahead.$"
+
+RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41
+	.string "If you visit the SHIPYARD in SLATEPORT,\n"
+	.string "you should go see CAPT. STERN.$"
+
+RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88
+	.string "DEVON’s new products, the REPEAT BALL\n"
+	.string "and TIMER BALL, have become hugely\l"
+	.string "popular among TRAINERS.$"
+
+RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9
+	.string "It’s a collection of rare rocks and\n"
+	.string "stones assembled by the PRESIDENT.$"
+
diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
new file mode 100644
index 000000000..d52b495eb
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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..b2a4da317 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 313
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..13ebbbc0d
--- /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, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0
+	object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0
+	object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..5a9a5a133 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 314
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..16c79649a
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..8df565936 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 294
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..559c6e6e0
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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..92161bb4d 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 295
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..71d03ddb1
--- /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, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 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..fafca84e7 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GOTOWN
 	.2byte 296
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0d1f57cdd
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047
+	bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..8c07e3637 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -1,15 +1,15 @@
 RustboroCity_Gym: @ 8483398
-	.4byte RustboroCity_Gym_MapAttributes
+	.4byte RustboroCity_Gym_Layout
 	.4byte RustboroCity_Gym_MapEvents
 	.4byte RustboroCity_Gym_MapScripts
 	.4byte 0x0
 	.2byte MUS_GIM
 	.2byte 94
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..2fc0284a9
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 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..94ae5e1e4 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -1,15 +1,15 @@
 RustboroCity_House1: @ 848345C
-	.4byte RustboroCity_House1_MapAttributes
+	.4byte RustboroCity_House1_Layout
 	.4byte RustboroCity_House1_MapEvents
 	.4byte RustboroCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 97
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5c5ab205e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 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..51a6f7984 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -1,15 +1,15 @@
 RustboroCity_House2: @ 8483494
-	.4byte RustboroCity_House2_MapAttributes
+	.4byte RustboroCity_House_Layouts
 	.4byte RustboroCity_House2_MapEvents
 	.4byte RustboroCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 96
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2fc6a6233
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0
+	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..89e62cf50 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -1,15 +1,15 @@
 RustboroCity_House3: @ 8483504
-	.4byte RustboroCity_House3_MapAttributes
+	.4byte RustboroCity_House_Layouts
 	.4byte RustboroCity_House3_MapEvents
 	.4byte RustboroCity_House3_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOTOWN
 	.2byte 96
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..683ed5ff7
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 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..766c1cb0c 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -1,15 +1,15 @@
 RustboroCity_Mart: @ 8483408
-	.4byte RustboroCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte RustboroCity_Mart_MapEvents
 	.4byte RustboroCity_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..597eace15
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..17f717230 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f1f9fe356
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..e7a1999cc 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..84548b44a
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0
+	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0
+	object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 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, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9
+	bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, 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..909e85c69 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -1,15 +1,15 @@
 RustboroCity_PokemonSchool: @ 84833B4
-	.4byte RustboroCity_PokemonSchool_MapAttributes
+	.4byte RustboroCity_PokemonSchool_Layout
 	.4byte RustboroCity_PokemonSchool_MapEvents
 	.4byte RustboroCity_PokemonSchool_MapScripts
 	.4byte 0x0
 	.2byte MUS_P_SCHOOL
 	.2byte 95
-	.byte 10
+	.byte MAPSEC_RUSTBORO_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
new file mode 100644
index 000000000..f5030facd
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
@@ -0,0 +1,359 @@
+RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8
+	.byte 0
+
+RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9
+	lockall
+	msgbox RustboroCity_PokemonSchool_Text_2140B2, 4
+	goto RustboroCity_PokemonSchool_EventScript_213EB8
+	end
+
+RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8
+	message RustboroCity_PokemonSchool_Text_2140F9
+	waitmessage
+	multichoicegrid 8, 1, 13, 3, 0
+	switch VAR_RESULT
+	case 0, RustboroCity_PokemonSchool_EventScript_213F17
+	case 1, RustboroCity_PokemonSchool_EventScript_213F25
+	case 2, RustboroCity_PokemonSchool_EventScript_213F33
+	case 3, RustboroCity_PokemonSchool_EventScript_213F41
+	case 4, RustboroCity_PokemonSchool_EventScript_213F4F
+	case 5, RustboroCity_PokemonSchool_EventScript_213F5D
+	case 127, RustboroCity_PokemonSchool_EventScript_213F5D
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17
+	msgbox RustboroCity_PokemonSchool_Text_21411A, 4
+	goto RustboroCity_PokemonSchool_EventScript_213EB8
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25
+	msgbox RustboroCity_PokemonSchool_Text_2141D8, 4
+	goto RustboroCity_PokemonSchool_EventScript_213EB8
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33
+	msgbox RustboroCity_PokemonSchool_Text_21427D, 4
+	goto RustboroCity_PokemonSchool_EventScript_213EB8
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41
+	msgbox RustboroCity_PokemonSchool_Text_214336, 4
+	goto RustboroCity_PokemonSchool_EventScript_213EB8
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F
+	msgbox RustboroCity_PokemonSchool_Text_2143B8, 4
+	goto RustboroCity_PokemonSchool_EventScript_213EB8
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D
+	releaseall
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F
+	msgbox RustboroCity_PokemonSchool_Text_21459F, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68
+	msgbox RustboroCity_PokemonSchool_Text_2145CD, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71
+	msgbox RustboroCity_PokemonSchool_Text_214604, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A
+	msgbox RustboroCity_PokemonSchool_Text_214669, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83
+	msgbox RustboroCity_PokemonSchool_Text_214719, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C
+	msgbox RustboroCity_PokemonSchool_Text_2147A2, 3
+	end
+
+RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
+	lock
+	faceplayer
+	checkflag FLAG_0x113
+	goto_eq RustboroCity_PokemonSchool_EventScript_213FFB
+	compare VAR_FACING, 4
+	call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5
+	compare VAR_FACING, 3
+	call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0
+	msgbox RustboroCity_PokemonSchool_Text_214433, 4
+	giveitem_std ITEM_QUICK_CLAW
+	compare VAR_RESULT, 0
+	goto_eq RustboroCity_PokemonSchool_EventScript_272054
+	closemessage
+	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
+	waitmovement 0
+	setflag FLAG_0x113
+	release
+	end
+
+RustboroCity_PokemonSchool_EventScript_213FE5:: @ 8213FE5
+	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214027
+	waitmovement 0
+	return
+
+RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0
+	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214010
+	waitmovement 0
+	return
+
+RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
+	msgbox RustboroCity_PokemonSchool_Text_2144C8, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
+	waitmovement 0
+	release
+	end
+
+RustboroCity_PokemonSchool_Movement_214010: @ 8214010
+	walk_left
+	walk_down
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	step_end
+
+RustboroCity_PokemonSchool_Movement_214027: @ 8214027
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	step_end
+
+RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
+	lock
+	faceplayer
+	checkflag FLAG_0x1CB
+	goto_eq RustboroCity_PokemonSchool_EventScript_2140A8
+	checkflag FLAG_0x136
+	goto_eq RustboroCity_PokemonSchool_EventScript_21406F
+	checkflag FLAG_BADGE01_GET
+	goto_eq RustboroCity_PokemonSchool_EventScript_214082
+	msgbox RustboroCity_PokemonSchool_Text_2148C0, 4
+	addvar VAR_0x40D1, 1
+	setflag FLAG_0x136
+	release
+	end
+
+RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F
+	checkflag FLAG_BADGE01_GET
+	goto_eq RustboroCity_PokemonSchool_EventScript_214090
+	msgbox RustboroCity_PokemonSchool_Text_214A5F, 4
+	release
+	end
+
+RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082
+	msgbox RustboroCity_PokemonSchool_Text_214B8A, 4
+	goto RustboroCity_PokemonSchool_EventScript_21409E
+	end
+
+RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090
+	msgbox RustboroCity_PokemonSchool_Text_214AB6, 4
+	goto RustboroCity_PokemonSchool_EventScript_21409E
+	end
+
+RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E
+	addvar VAR_0x40D1, 1
+	setflag FLAG_0x1CB
+	release
+	end
+
+RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8
+	msgbox RustboroCity_PokemonSchool_Text_214A5F, 4
+	release
+	end
+
+RustboroCity_PokemonSchool_Text_2140B2: @ 82140B2
+	.string "The blackboard lists status changes\n"
+	.string "that may affect POKéMON in battle.$"
+
+RustboroCity_PokemonSchool_Text_2140F9: @ 82140F9
+	.string "Which topic do you want to read?$"
+
+RustboroCity_PokemonSchool_Text_21411A: @ 821411A
+	.string "If a POKéMON is poisoned, it will\n"
+	.string "steadily lose HP.\p"
+	.string "The effects of poison remain after\n"
+	.string "a battle.\p"
+	.string "A poisoned POKéMON’s HP will drop\n"
+	.string "while it is traveling.\p"
+	.string "Heal a poisoning using an ANTIDOTE.$"
+
+RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8
+	.string "If a POKéMON becomes paralyzed,\n"
+	.string "its SPEED drops.\p"
+	.string "It may also not be able to move while\n"
+	.string "it is in battle.\p"
+	.string "Paralysis remains after battle.\n"
+	.string "Cure it using a PARLYZ HEAL.$"
+
+RustboroCity_PokemonSchool_Text_21427D: @ 821427D
+	.string "If a POKéMON falls asleep, it will be\n"
+	.string "unable to attack.\p"
+	.string "A POKéMON may wake up on its own,\n"
+	.string "but if a battle ends while it is\l"
+	.string "sleeping, it will stay asleep.\p"
+	.string "Wake it up using an AWAKENING.$"
+
+RustboroCity_PokemonSchool_Text_214336: @ 8214336
+	.string "A burn reduces ATTACK power, and it\n"
+	.string "steadily reduces the victim’s HP.\p"
+	.string "A burn lingers after battle.\n"
+	.string "Cure a burn using a BURN HEAL.$"
+
+RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8
+	.string "If a POKéMON is frozen, it becomes\n"
+	.string "completely helpless.\p"
+	.string "It will remain frozen after battle.\n"
+	.string "Thaw it out using an ICE HEAL.$"
+
+RustboroCity_PokemonSchool_Text_214433: @ 8214433
+	.string "Students who don’t study get a little\n"
+	.string "taste of my QUICK CLAW.\p"
+	.string "Whether or not you are a good student \n"
+	.string "will be evident from the way you use\l"
+	.string "this item.$"
+
+RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8
+	.string "A POKéMON holding the QUICK CLAW will\n"
+	.string "occasionally speed up and get to move\l"
+	.string "before its opponent.\p"
+	.string "There are many other items that are\n"
+	.string "meant to be held by POKéMON.\p"
+	.string "Just those alone will give you many\n"
+	.string "topics to study!$"
+
+RustboroCity_PokemonSchool_Text_21459F: @ 821459F
+	.string "I’m trading POKéMON with my friend\n"
+	.string "right now.$"
+
+RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD
+	.string "I always wanted a SEEDOT, and\n"
+	.string "I’m finally getting one!$"
+
+RustboroCity_PokemonSchool_Text_214604: @ 8214604
+	.string "POKéMON can hold items, but they\n"
+	.string "don’t know what to do with man-made\l"
+	.string "items like POTION and ANTIDOTE.$"
+
+RustboroCity_PokemonSchool_Text_214669: @ 8214669
+	.string "You know how some POKéMON moves can\n"
+	.string "confuse a POKéMON?\p"
+	.string "A confused POKéMON will sometimes\n"
+	.string "attack itself without meaning to.\p"
+	.string "But once it leaves battle, it will\n"
+	.string "return to normal.$"
+
+RustboroCity_PokemonSchool_Text_214719: @ 8214719
+	.string "A POKéMON holding a BERRY will heal\n"
+	.string "itself…\p"
+	.string "There are many kinds of items that\n"
+	.string "POKéMON can hold…\p"
+	.string "Boy, it sure is hard taking notes\n"
+	.string "down…$"
+
+RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2
+	.string "It’s this student’s notebook…\p"
+	.string "POKéMON are to be caught using\n"
+	.string "POKé BALLS.\p"
+	.string "Up to six POKéMON can accompany\n"
+	.string "a TRAINER.\p"
+	.string "A TRAINER is someone who catches\n"
+	.string "POKéMON, raises them, and battles\l"
+	.string "with them.\p"
+	.string "A TRAINER’s mission is to defeat\n"
+	.string "the strong TRAINERS who await\l"
+	.string "challengers in POKéMON GYMS.$"
+
+RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0
+	.string "Hello? Didn’t we meet before?\n"
+	.string "I think back in PETALBURG CITY.\p"
+	.string "Let me introduce myself.\n"
+	.string "My name’s SCOTT.\p"
+	.string "I’ve been traveling everywhere in\n"
+	.string "search of outstanding TRAINERS.\p"
+	.string "More specifically, I’m looking for\n"
+	.string "POKéMON battle experts.\p"
+	.string "So, what brings you to this SCHOOL?\n"
+	.string "Are you a TRAINER, too?\p"
+	.string "The first thing you should do is to\n"
+	.string "have a POKéMON learn the move CUT.\p"
+	.string "If I remember correctly, someone in\n"
+	.string "this town has CUT.$"
+
+RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F
+	.string "SCOTT: Hmm…\p"
+	.string "The talent levels of the students here\n"
+	.string "are unknown. The potential’s there.$"
+
+RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6
+	.string "SCOTT: Oh, what’s that?\p"
+	.string "It’s a STONE BADGE, isn’t it?\n"
+	.string "That’s pretty impressive, I’d say.\p"
+	.string "But, you know, I would’ve loved to see\n"
+	.string "you in battle.\p"
+	.string "It’s hard to tell what you’re like as\n"
+	.string "a TRAINER from a LEAGUE BADGE.$"
+
+RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A
+	.string "Hello? Didn’t we meet before?\n"
+	.string "I think back in PETALBURG CITY.\p"
+	.string "Let me introduce myself.\n"
+	.string "My name’s SCOTT.\p"
+	.string "I’ve been traveling everywhere in\n"
+	.string "search of outstanding TRAINERS.\p"
+	.string "More specifically, I’m looking for\n"
+	.string "POKéMON battle experts.\p"
+	.string "Oh, what’s that?\n"
+	.string "It’s a STONE BADGE, isn’t it?\p"
+	.string "That’s pretty impressive, I’d say, for\n"
+	.string "a starting TRAINER like yourself.\p"
+	.string "But, you know, I would’ve loved to see\n"
+	.string "you in battle.\p"
+	.string "It’s hard to tell what you’re like as\n"
+	.string "a TRAINER from a LEAGUE BADGE.$"
+
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
new file mode 100644
index 000000000..d0d56e6fa
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 879
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932
+	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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, RusturfTunnel_EventScript_22D071
+	coord_event 9, 4, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083
+	coord_event 9, 5, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083
+	coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077
+	coord_event 25, 5, 3, 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..4dc4e2797 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -1,15 +1,15 @@
 RusturfTunnel: @ 8483F30
-	.4byte RusturfTunnel_MapAttributes
+	.4byte RusturfTunnel_Layout
 	.4byte RusturfTunnel_MapEvents
 	.4byte RusturfTunnel_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 129
-	.byte 60
+	.byte MAPSEC_RUSTURF_TUNNEL
 	.byte 0
-	.byte 6
-	.byte 4
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
new file mode 100644
index 000000000..5e42be78d
--- /dev/null
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -0,0 +1,539 @@
+RusturfTunnel_MapScripts:: @ 822CE27
+	map_script 3, RusturfTunnel_MapScript1_22CE44
+	map_script 2, RusturfTunnel_MapScript2_22CE32
+	.byte 0
+
+RusturfTunnel_MapScript2_22CE32: @ 822CE32
+	map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE
+	map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE
+	.2byte 0
+
+RusturfTunnel_MapScript1_22CE44: @ 822CE44
+	compare VAR_0x409A, 2
+	call_if 1, RusturfTunnel_EventScript_22CE50
+	end
+
+RusturfTunnel_EventScript_22CE50:: @ 822CE50
+	setobjectxyperm 7, 13, 4
+	setobjectxyperm 6, 13, 5
+	return
+
+RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
+	lock
+	faceplayer
+	msgbox RusturfTunnel_Text_22D7A3, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_22CE76:: @ 822CE76
+	lock
+	faceplayer
+	checkflag FLAG_0x001
+	goto_eq RusturfTunnel_EventScript_22CE99
+	setflag FLAG_0x001
+	msgbox RusturfTunnel_Text_22D510, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_22CE99:: @ 822CE99
+	msgbox RusturfTunnel_Text_22D5F3, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_22CEAE:: @ 822CEAE
+	lockall
+	compare VAR_TEMP_1, 1
+	call_if 1, RusturfTunnel_EventScript_22CFA7
+	compare VAR_TEMP_1, 2
+	call_if 1, RusturfTunnel_EventScript_22CFBC
+	compare VAR_TEMP_1, 3
+	call_if 1, RusturfTunnel_EventScript_22CFC7
+	call RusturfTunnel_EventScript_22CFFF
+	msgbox RusturfTunnel_Text_22D65C, 4
+	compare VAR_TEMP_1, 2
+	call_if 1, RusturfTunnel_EventScript_22CFC8
+	compare VAR_TEMP_1, 3
+	call_if 1, RusturfTunnel_EventScript_22CFC8
+	giveitem_std ITEM_HM04
+	setflag FLAG_0x06A
+	msgbox RusturfTunnel_Text_22D6D2, 4
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if 1, RusturfTunnel_EventScript_22CF5D
+	compare VAR_TEMP_1, 2
+	call_if 1, RusturfTunnel_EventScript_22CF6F
+	compare VAR_TEMP_1, 3
+	call_if 1, RusturfTunnel_EventScript_22CF8B
+	msgbox RusturfTunnel_Text_22D745, 4
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if 1, RusturfTunnel_EventScript_22CFD4
+	compare VAR_TEMP_1, 2
+	call_if 1, RusturfTunnel_EventScript_22CFE6
+	compare VAR_TEMP_1, 3
+	call_if 1, RusturfTunnel_EventScript_22CFE6
+	call RusturfTunnel_EventScript_272216
+	releaseall
+	end
+
+RusturfTunnel_EventScript_22CF5D:: @ 822CF5D
+	applymovement 255, RusturfTunnel_Movement_22D042
+	applymovement 1, RusturfTunnel_Movement_22D067
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
+	applymovement 255, RusturfTunnel_Movement_22D045
+	applymovement 1, RusturfTunnel_Movement_22D06C
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_2725AA
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
+	applymovement 255, RusturfTunnel_Movement_22D045
+	applymovement 1, RusturfTunnel_Movement_22D06C
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_2725AA
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
+	applymovement 1, RusturfTunnel_Movement_2725A6
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_2725AA
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CFBC:: @ 822CFBC
+	applymovement 1, RusturfTunnel_Movement_22D048
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CFC7:: @ 822CFC7
+	return
+
+RusturfTunnel_EventScript_22CFC8:: @ 822CFC8
+	closemessage
+	applymovement 1, RusturfTunnel_Movement_22D065
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CFD4:: @ 822CFD4
+	applymovement 10, RusturfTunnel_Movement_22D017
+	applymovement 1, RusturfTunnel_Movement_22D04B
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CFE6:: @ 822CFE6
+	applymovement 255, RusturfTunnel_Movement_22D02F
+	applymovement 10, RusturfTunnel_Movement_22D023
+	applymovement 1, RusturfTunnel_Movement_22D058
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
+	playse SE_PIN
+	applymovement 1, RusturfTunnel_Movement_272598
+	waitmovement 0
+	applymovement 1, RusturfTunnel_Movement_27259A
+	waitmovement 0
+	return
+
+RusturfTunnel_Movement_22D017: @ 822D017
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+RusturfTunnel_Movement_22D023: @ 822D023
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+RusturfTunnel_Movement_22D02F: @ 822D02F
+	delay_8
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+RusturfTunnel_Movement_22D035: @ 822D035
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+RusturfTunnel_Movement_22D038: @ 822D038
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	step_end
+
+RusturfTunnel_Movement_22D03D: @ 822D03D
+	walk_up
+	walk_in_place_fastest_down
+	delay_8
+	walk_in_place_fastest_right
+	step_end
+
+RusturfTunnel_Movement_22D042: @ 822D042
+	walk_left
+	walk_in_place_fastest_right
+	step_end
+
+RusturfTunnel_Movement_22D045: @ 822D045
+	walk_right
+	walk_in_place_fastest_left
+	step_end
+
+RusturfTunnel_Movement_22D048: @ 822D048
+	walk_up
+	walk_in_place_fastest_right
+	step_end
+
+RusturfTunnel_Movement_22D04B: @ 822D04B
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+RusturfTunnel_Movement_22D058: @ 822D058
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
+RusturfTunnel_Movement_22D065: @ 822D065
+	walk_right
+	step_end
+
+RusturfTunnel_Movement_22D067: @ 822D067
+	walk_in_place_fast_up
+	walk_in_place_fast_up
+	walk_fast_up
+	walk_fast_right
+	step_end
+
+RusturfTunnel_Movement_22D06C: @ 822D06C
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_fast_right
+	walk_in_place_fastest_up
+	step_end
+
+RusturfTunnel_EventScript_22D071:: @ 822D071
+	setvar VAR_TEMP_1, 1
+	end
+
+RusturfTunnel_EventScript_22D077:: @ 822D077
+	setvar VAR_TEMP_1, 2
+	end
+
+RusturfTunnel_EventScript_22D07D:: @ 822D07D
+	setvar VAR_TEMP_1, 3
+	end
+
+RusturfTunnel_EventScript_22D083:: @ 822D083
+	lockall
+	msgbox RusturfTunnel_Text_22D1C8, 4
+	closemessage
+	applymovement 6, RusturfTunnel_Movement_22D0AB
+	applymovement 7, RusturfTunnel_Movement_22D0AB
+	waitmovement 0
+	moveobjectoffscreen 6
+	moveobjectoffscreen 7
+	setvar VAR_0x409A, 3
+	releaseall
+	end
+
+RusturfTunnel_Movement_22D0AB: @ 822D0AB
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	step_end
+
+RusturfTunnel_EventScript_22D0AF:: @ 822D0AF
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox RusturfTunnel_Text_22D1F7, 4
+	waitmoncry
+	release
+	end
+
+RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
+	lock
+	faceplayer
+	playbgm MUS_AQA_0, 0
+	msgbox RusturfTunnel_Text_22D20A, 4
+	trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0
+	msgbox RusturfTunnel_Text_22D2E1, 4
+	giveitem_std ITEM_DEVON_GOODS
+	closemessage
+	applymovement 255, RusturfTunnel_Movement_22D178
+	applymovement 6, RusturfTunnel_Movement_22D181
+	waitmovement 0
+	removeobject 6
+	delay 50
+	addobject 5
+	applymovement 5, RusturfTunnel_Movement_22D18B
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_22D17E
+	applymovement 5, RusturfTunnel_Movement_22D1A4
+	waitmovement 0
+	msgbox RusturfTunnel_Text_22D395, 4
+	applymovement 5, RusturfTunnel_Movement_27259E
+	waitmovement 0
+	message RusturfTunnel_Text_22D3BA
+	waitmessage
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	waitbuttonpress
+	waitmoncry
+	closemessage
+	applymovement 255, RusturfTunnel_Movement_22D19F
+	applymovement 5, RusturfTunnel_Movement_22D193
+	applymovement 7, RusturfTunnel_Movement_22D1A7
+	waitmovement 0
+	removeobject 5
+	removeobject 7
+	clearflag FLAG_0x08E
+	setflag FLAG_0x08F
+	setvar VAR_0x405A, 4
+	setvar VAR_0x4090, 1
+	setflag FLAG_0x37B
+	release
+	end
+
+RusturfTunnel_Movement_22D178: @ 822D178
+	face_down
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	walk_in_place_fastest_left
+	step_end
+
+RusturfTunnel_Movement_22D17E: @ 822D17E
+	walk_down
+	walk_in_place_fastest_up
+	step_end
+
+RusturfTunnel_Movement_22D181: @ 822D181
+	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
+	step_end
+
+RusturfTunnel_Movement_22D18B: @ 822D18B
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+RusturfTunnel_Movement_22D193: @ 822D193
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+RusturfTunnel_Movement_22D19F: @ 822D19F
+	delay_16
+	delay_8
+	delay_4
+	walk_in_place_fastest_left
+	step_end
+
+RusturfTunnel_Movement_22D1A4: @ 822D1A4
+	delay_16
+	walk_right
+	step_end
+
+RusturfTunnel_Movement_22D1A7: @ 822D1A7
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	step_end
+
+RusturfTunnel_EventScript_22D1B1:: @ 822D1B1
+	trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
+	msgbox RusturfTunnel_Text_22D8F9, 6
+	end
+
+RusturfTunnel_Text_22D1C8: @ 822D1C8
+	.string "What, are you coming?\n"
+	.string "Come and get some, then!$"
+
+RusturfTunnel_Text_22D1F7: @ 822D1F7
+	.string "PEEKO: Pii pihyoh!$"
+
+RusturfTunnel_Text_22D20A: @ 822D20A
+	.string "Grah, keelhaul it all!\p"
+	.string "That hostage POKéMON turned out to\n"
+	.string "be worthless!\p"
+	.string "And to think I made a getaway…\n"
+	.string "In this tunnel to nowhere!\p"
+	.string "Hey! You!\n"
+	.string "So you want to battle me?$"
+
+RusturfTunnel_Text_22D2B0: @ 822D2B0
+	.string "Urrrggh! My career in crime comes to\n"
+	.string "a dead end!$"
+
+RusturfTunnel_Text_22D2E1: @ 822D2E1
+	.string "This is plain not right…\p"
+	.string "The BOSS told me this would be a\n"
+	.string "slick-and-easy job to pull.\p"
+	.string "All I had to do was steal some package\n"
+	.string "from DEVON.\p"
+	.string "Tch!\n"
+	.string "You want it back that badly, take it!$"
+
+RusturfTunnel_Text_22D395: @ 822D395
+	.string "PEEKO!\n"
+	.string "Am I glad to see you’re safe!$"
+
+RusturfTunnel_Text_22D3BA: @ 822D3BA
+	.string "PEEKO owes her life to you!\p"
+	.string "They call me MR. BRINEY.\n"
+	.string "And, you are?\p"
+	.string "… … … … … … … …\n"
+	.string "… … … … … … … …\p"
+	.string "Ah, so you are {PLAYER}{KUN}!\n"
+	.string "I sincerely thank you!\p"
+	.string "Now, if there’s anything that troubles\n"
+	.string "you, don’t hesitate to tell me!\p"
+	.string "You can usually find me in my cottage\n"
+	.string "by the sea near PETALBURG WOODS.\p"
+	.string "Come, PEEKO, we should make our way\n"
+	.string "home.\p"
+	.string "PEEKO: Pihyoh!$"
+
+RusturfTunnel_Text_22D510: @ 822D510
+	.string "… …\p"
+	.string "Why can’t they keep digging?\n"
+	.string "Is the bedrock too hard?\p"
+	.string "My beloved awaits me in VERDANTURF\n"
+	.string "TOWN just beyond here…\p"
+	.string "If RUSTBORO and VERDANTURF were\n"
+	.string "joined by this tunnel, I could visit\l"
+	.string "her every day…\p"
+	.string "But this…\n"
+	.string "What am I to do?$"
+
+RusturfTunnel_Text_22D5F3: @ 822D5F3
+	.string "To get from RUSTBORO to VERDANTURF,\n"
+	.string "you need to go to DEWFORD, then pass\l"
+	.string "through SLATEPORT and MAUVILLE…$"
+
+RusturfTunnel_Text_22D65C: @ 822D65C
+	.string "Wow! You shattered that boulder\n"
+	.string "blocking the way.\p"
+	.string "To show you how much I appreciate it,\n"
+	.string "I’d like you to have this HM.$"
+
+RusturfTunnel_Text_22D6D2: @ 822D6D2
+	.string "That HM contains STRENGTH.\p"
+	.string "If a muscular POKéMON were to learn\n"
+	.string "that, it would be able to move even\l"
+	.string "large boulders.$"
+
+RusturfTunnel_Text_22D745: @ 822D745
+	.string "WANDA!\n"
+	.string "Now I can see you anytime!\p"
+	.string "WANDA: That’s…wonderful.\p"
+	.string "Please, take some rest at my home.$"
+
+RusturfTunnel_Text_22D7A3: @ 822D7A3
+	.string "On the other side of this rock…\n"
+	.string "My boyfriend is there.\p"
+	.string "He… He’s not just digging the tunnel\n"
+	.string "to come see me.\p"
+	.string "He works his hands raw and rough\n"
+	.string "for the benefit of everyone.$"
+
+RusturfTunnel_Text_22D84D: @ 822D84D
+	.string "What do you call a wild man up in the\n"
+	.string "mountains? A mountain man, right?\p"
+	.string "So why don’t they call a POKéMON in\n"
+	.string "the mountains a mountain POKéMON?$"
+
+RusturfTunnel_Text_22D8DB: @ 822D8DB
+	.string "My POKéMON…\n"
+	.string "Ran out of power…$"
+
+RusturfTunnel_Text_22D8F9: @ 822D8F9
+	.string "They halted development here to\n"
+	.string "protect POKéMON, right?\l"
+	.string "There’s a feel-good story!$"
+
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc
new file mode 100644
index 000000000..8494f36e5
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
+	bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0F5
+	bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0FE
+	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107
+	bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..9c1f2bab2 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -1,15 +1,15 @@
 SSTidalCorridor: @ 8484F0C
-	.4byte SSTidalCorridor_MapAttributes
+	.4byte SSTidalCorridor_Layout
 	.4byte SSTidalCorridor_MapEvents
 	.4byte SSTidalCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_BOAT
 	.2byte 277
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..be32d9ad4
--- /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, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 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_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, 35
+
+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..6db9d2415 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,15 +1,15 @@
 SSTidalLowerDeck: @ 8484F28
-	.4byte SSTidalLowerDeck_MapAttributes
+	.4byte SSTidalLowerDeck_Layout
 	.4byte SSTidalLowerDeck_MapEvents
 	.4byte SSTidalLowerDeck_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_BOAT
 	.2byte 278
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5ef669f48
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 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, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33
+	bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, 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..a5788a49f 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -1,15 +1,15 @@
 SSTidalRooms: @ 8484F44
-	.4byte SSTidalRooms_MapAttributes
+	.4byte SSTidalRooms_Layout
 	.4byte SSTidalRooms_MapEvents
 	.4byte SSTidalRooms_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_BOAT
 	.2byte 279
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1057b4ecd
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 17
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 18
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 19
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 20
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 21
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, 22
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..3e667fafc 100644
--- a/data/maps/SafariZone_North/header.inc
+++ b/data/maps/SafariZone_North/header.inc
@@ -1,15 +1,15 @@
 SafariZone_North: @ 8485158
-	.4byte SafariZone_North_MapAttributes
+	.4byte SafariZone_North_Layout
 	.4byte SafariZone_North_MapEvents
 	.4byte SafariZone_North_MapScripts
 	.4byte SafariZone_North_MapConnections
 	.2byte MUS_SAFARI
 	.2byte 239
-	.byte 57
+	.byte MAPSEC_SAFARI_ZONE
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a3d1ad0a3
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169
+
+SafariZone_Northeast_MapBGEvents: @ 853BA40
+	bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, 106
+	bg_hidden_item_event 21, 5, 3, ITEM_ZINC, 107
+
+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..734254611 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -1,15 +1,15 @@
 SafariZone_Northeast: @ 848528C
-	.4byte SafariZone_Northeast_MapAttributes
+	.4byte SafariZone_Northeast_Layout
 	.4byte SafariZone_Northeast_MapEvents
 	.4byte SafariZone_Northeast_MapScripts
 	.4byte SafariZone_Northeast_MapConnections
 	.2byte MUS_SAFARI
 	.2byte 394
-	.byte 57
+	.byte MAPSEC_SAFARI_ZONE
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c43db4125
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..786316fcd 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -1,15 +1,15 @@
 SafariZone_Northwest: @ 848513C
-	.4byte SafariZone_Northwest_MapAttributes
+	.4byte SafariZone_Northwest_Layout
 	.4byte SafariZone_Northwest_MapEvents
 	.4byte SafariZone_Northwest_MapScripts
 	.4byte SafariZone_Northwest_MapConnections
 	.2byte MUS_SAFARI
 	.2byte 238
-	.byte 57
+	.byte MAPSEC_SAFARI_ZONE
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5a54de961
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..1f02725b0 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -1,15 +1,15 @@
 SafariZone_RestHouse: @ 8485270
-	.4byte SafariZone_RestHouse_MapAttributes
+	.4byte SafariZone_RestHouse_Layout
 	.4byte SafariZone_RestHouse_MapEvents
 	.4byte SafariZone_RestHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_SAFARI
 	.2byte 329
-	.byte 57
+	.byte MAPSEC_SAFARI_ZONE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..01a016f02
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, 717
+	object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 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..5c60a541b 100644
--- a/data/maps/SafariZone_South/header.inc
+++ b/data/maps/SafariZone_South/header.inc
@@ -1,15 +1,15 @@
 SafariZone_South: @ 8485190
-	.4byte SafariZone_South_MapAttributes
+	.4byte SafariZone_South_Layout
 	.4byte SafariZone_South_MapEvents
 	.4byte SafariZone_South_MapScripts
 	.4byte SafariZone_South_MapConnections
 	.2byte MUS_SAFARI
 	.2byte 241
-	.byte 57
+	.byte MAPSEC_SAFARI_ZONE
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3ba71ee8e
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, 747
+
+SafariZone_Southeast_MapBGEvents: @ 853BAE4
+	bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, 108
+	bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, 105
+
+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..54f2c505a 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -1,15 +1,15 @@
 SafariZone_Southeast: @ 84852A8
-	.4byte SafariZone_Southeast_MapAttributes
+	.4byte SafariZone_Southeast_Layout
 	.4byte SafariZone_Southeast_MapEvents
 	.4byte SafariZone_Southeast_MapScripts
 	.4byte SafariZone_Southeast_MapConnections
 	.2byte MUS_SAFARI
 	.2byte 395
-	.byte 57
+	.byte MAPSEC_SAFARI_ZONE
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..468a0013d
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..332d2f9a4 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -1,15 +1,15 @@
 SafariZone_Southwest: @ 8485174
-	.4byte SafariZone_Southwest_MapAttributes
+	.4byte SafariZone_Southwest_Layout
 	.4byte SafariZone_Southwest_MapEvents
 	.4byte SafariZone_Southwest_MapScripts
 	.4byte SafariZone_Southwest_MapConnections
 	.2byte MUS_SAFARI
 	.2byte 240
-	.byte 57
+	.byte MAPSEC_SAFARI_ZONE
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5bbe88c20
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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..1de3fd413 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,15 +1,15 @@
 ScorchedSlab: @ 84846BC
-	.4byte ScorchedSlab_MapAttributes
+	.4byte ScorchedSlab_Layout
 	.4byte ScorchedSlab_MapEvents
 	.4byte ScorchedSlab_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 311
-	.byte 80
+	.byte MAPSEC_SCORCHED_SLAB
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..11a8211de
--- /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, MOVEMENT_TYPE_FACE_UP, 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..417467ac5 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Entrance: @ 84841B4
-	.4byte SeafloorCavern_Entrance_MapAttributes
+	.4byte SeafloorCavern_Entrance_Layout
 	.4byte SeafloorCavern_Entrance_MapEvents
 	.4byte SeafloorCavern_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 147
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2c8e51e30
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 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..e259b065b 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room1: @ 84841D0
-	.4byte SeafloorCavern_Room1_MapAttributes
+	.4byte SeafloorCavern_Room1_Layout
 	.4byte SeafloorCavern_Room1_MapEvents
 	.4byte SeafloorCavern_Room1_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 148
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..82f924121
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..6331b3b18 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room2: @ 84841EC
-	.4byte SeafloorCavern_Room2_MapAttributes
+	.4byte SeafloorCavern_Room2_Layout
 	.4byte SeafloorCavern_Room2_MapEvents
 	.4byte SeafloorCavern_Room2_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 149
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..9a1399705
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..a91ef42ef 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room3: @ 8484208
-	.4byte SeafloorCavern_Room3_MapAttributes
+	.4byte SeafloorCavern_Room3_Layout
 	.4byte SeafloorCavern_Room3_MapEvents
 	.4byte SeafloorCavern_Room3_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 150
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e67cb0d5b
--- /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, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 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..7385a41fb 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room4: @ 8484224
-	.4byte SeafloorCavern_Room4_MapAttributes
+	.4byte SeafloorCavern_Room4_Layout
 	.4byte SeafloorCavern_Room4_MapEvents
 	.4byte SeafloorCavern_Room4_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 151
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f0c69175b
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..aa2b0dc56 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room5: @ 8484240
-	.4byte SeafloorCavern_Room5_MapAttributes
+	.4byte SeafloorCavern_Room5_Layout
 	.4byte SeafloorCavern_Room5_MapEvents
 	.4byte SeafloorCavern_Room5_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 152
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2f76c9b8f 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room6: @ 848425C
-	.4byte SeafloorCavern_Room6_MapAttributes
+	.4byte SeafloorCavern_Room6_Layout
 	.4byte SeafloorCavern_Room6_MapEvents
 	.4byte SeafloorCavern_Room6_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 153
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3640bb597 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room7: @ 8484278
-	.4byte SeafloorCavern_Room7_MapAttributes
+	.4byte SeafloorCavern_Room7_Layout
 	.4byte SeafloorCavern_Room7_MapEvents
 	.4byte SeafloorCavern_Room7_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 154
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d69b12f7e
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..66e6523f0 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room8: @ 8484294
-	.4byte SeafloorCavern_Room8_MapAttributes
+	.4byte SeafloorCavern_Room8_Layout
 	.4byte SeafloorCavern_Room8_MapEvents
 	.4byte SeafloorCavern_Room8_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 155
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..2fb2d069b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 859
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 828
+	object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 829
+	object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831
+	object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 831
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090
+	object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_0x40A2, 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..2f08ec83a 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -1,15 +1,15 @@
 SeafloorCavern_Room9: @ 84842B0
-	.4byte SeafloorCavern_Room9_MapAttributes
+	.4byte SeafloorCavern_Room9_Layout
 	.4byte SeafloorCavern_Room9_MapEvents
 	.4byte SeafloorCavern_Room9_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 156
-	.byte 68
+	.byte MAPSEC_SEAFLOOR_CAVERN
 	.byte 0
-	.byte 6
-	.byte 4
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 14
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ddd6c15ec
--- /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, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8
+	bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255
+	bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F
+	bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239269
+	bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239273
+	bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23927D
+	bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239287
+	bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8
+	bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, 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..541842c26 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -1,15 +1,15 @@
 SealedChamber_InnerRoom: @ 84846A0
-	.4byte SealedChamber_InnerRoom_MapAttributes
+	.4byte SealedChamber_InnerRoom_Layout
 	.4byte SealedChamber_InnerRoom_MapEvents
 	.4byte SealedChamber_InnerRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_MABOROSI
 	.2byte 304
-	.byte 78
+	.byte MAPSEC_SEALED_CHAMBER
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3cd1b9714
--- /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, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C
+	bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176
+	bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180
+	bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A
+	bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194
+	bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E
+	bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8
+	bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC
+	bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391B2
+	bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391C6
+	bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391D0
+	bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C
+	bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C
+	bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176
+	bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176
+	bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180
+	bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180
+	bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A
+	bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A
+	bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194
+	bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194
+	bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E
+	bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E
+	bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8
+	bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8
+	bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC
+	bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC
+	bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED
+	bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, 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..5fa6728d8 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -1,15 +1,15 @@
 SealedChamber_OuterRoom: @ 8484684
-	.4byte SealedChamber_OuterRoom_MapAttributes
+	.4byte SealedChamber_OuterRoom_Layout
 	.4byte SealedChamber_OuterRoom_MapEvents
 	.4byte SealedChamber_OuterRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_MABOROSI
 	.2byte 284
-	.byte 78
+	.byte MAPSEC_SEALED_CHAMBER
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..606999612
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..f75acd84a 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BlueCave1: @ 8484AC8
-	.4byte SecretBase_BlueCave1_MapAttributes
+	.4byte SecretBase_BlueCave1_Layout
 	.4byte SecretBase_BlueCave1_MapEvents
 	.4byte SecretBase_BlueCave1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 199
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..0991d03e2
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..6b80b45bb 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BlueCave2: @ 8484B70
-	.4byte SecretBase_BlueCave2_MapAttributes
+	.4byte SecretBase_BlueCave2_Layout
 	.4byte SecretBase_BlueCave2_MapEvents
 	.4byte SecretBase_BlueCave2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 205
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..e0bd13a3b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..19a4afdfd 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BlueCave3: @ 8484C18
-	.4byte SecretBase_BlueCave3_MapAttributes
+	.4byte SecretBase_BlueCave3_Layout
 	.4byte SecretBase_BlueCave3_MapEvents
 	.4byte SecretBase_BlueCave3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 211
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..15266e18b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..3a51deec4 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BlueCave4: @ 8484CC0
-	.4byte SecretBase_BlueCave4_MapAttributes
+	.4byte SecretBase_BlueCave4_Layout
 	.4byte SecretBase_BlueCave4_MapEvents
 	.4byte SecretBase_BlueCave4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 217
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..8c2771f4e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..7a79eab3e 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BrownCave1: @ 8484AAC
-	.4byte SecretBase_BrownCave1_MapAttributes
+	.4byte SecretBase_BrownCave1_Layout
 	.4byte SecretBase_BrownCave1_MapEvents
 	.4byte SecretBase_BrownCave1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 198
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..f5e168e36
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..5f0e61f8c 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BrownCave2: @ 8484B54
-	.4byte SecretBase_BrownCave2_MapAttributes
+	.4byte SecretBase_BrownCave2_Layout
 	.4byte SecretBase_BrownCave2_MapEvents
 	.4byte SecretBase_BrownCave2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 204
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..c41147bc6
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..bd88bf1d3 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BrownCave3: @ 8484BFC
-	.4byte SecretBase_BrownCave3_MapAttributes
+	.4byte SecretBase_BrownCave3_Layout
 	.4byte SecretBase_BrownCave3_MapEvents
 	.4byte SecretBase_BrownCave3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 210
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..40d00597e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..8183eee67 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -1,15 +1,15 @@
 SecretBase_BrownCave4: @ 8484CA4
-	.4byte SecretBase_BrownCave4_MapAttributes
+	.4byte SecretBase_BrownCave4_Layout
 	.4byte SecretBase_BrownCave4_MapEvents
 	.4byte SecretBase_BrownCave4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 216
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..1b5f202cf
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..774e8471e 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -1,15 +1,15 @@
 SecretBase_RedCave1: @ 8484A90
-	.4byte SecretBase_RedCave1_MapAttributes
+	.4byte SecretBase_RedCave1_Layout
 	.4byte SecretBase_RedCave1_MapEvents
 	.4byte SecretBase_RedCave1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 197
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..d84f297a2
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..2137748af 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -1,15 +1,15 @@
 SecretBase_RedCave2: @ 8484B38
-	.4byte SecretBase_RedCave2_MapAttributes
+	.4byte SecretBase_RedCave2_Layout
 	.4byte SecretBase_RedCave2_MapEvents
 	.4byte SecretBase_RedCave2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 203
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..f288371e8
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..04b0ae23a 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -1,15 +1,15 @@
 SecretBase_RedCave3: @ 8484BE0
-	.4byte SecretBase_RedCave3_MapAttributes
+	.4byte SecretBase_RedCave3_Layout
 	.4byte SecretBase_RedCave3_MapEvents
 	.4byte SecretBase_RedCave3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 209
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..9090f940e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..94c8605a0 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,15 +1,15 @@
 SecretBase_RedCave4: @ 8484C88
-	.4byte SecretBase_RedCave4_MapAttributes
+	.4byte SecretBase_RedCave4_Layout
 	.4byte SecretBase_RedCave4_MapEvents
 	.4byte SecretBase_RedCave4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 215
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..aa886a0aa
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..85e94f158 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Shrub1: @ 8484B1C
-	.4byte SecretBase_Shrub1_MapAttributes
+	.4byte SecretBase_Shrub1_Layout
 	.4byte SecretBase_Shrub1_MapEvents
 	.4byte SecretBase_Shrub1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 202
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..1acb5d0a1
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..7beeb3d8b 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Shrub2: @ 8484BC4
-	.4byte SecretBase_Shrub2_MapAttributes
+	.4byte SecretBase_Shrub2_Layout
 	.4byte SecretBase_Shrub2_MapEvents
 	.4byte SecretBase_Shrub2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 208
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..7902f3fc7
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..18b1f132a 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Shrub3: @ 8484C6C
-	.4byte SecretBase_Shrub3_MapAttributes
+	.4byte SecretBase_Shrub3_Layout
 	.4byte SecretBase_Shrub3_MapEvents
 	.4byte SecretBase_Shrub3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 214
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..c6d5f32f5
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..72c5724f6 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Shrub4: @ 8484D14
-	.4byte SecretBase_Shrub4_MapAttributes
+	.4byte SecretBase_Shrub4_Layout
 	.4byte SecretBase_Shrub4_MapEvents
 	.4byte SecretBase_Shrub4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 220
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..593fb5dbb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..a9a341696 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Tree1: @ 8484B00
-	.4byte SecretBase_Tree1_MapAttributes
+	.4byte SecretBase_Tree1_Layout
 	.4byte SecretBase_Tree1_MapEvents
 	.4byte SecretBase_Tree1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 201
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..189911755
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..86898ed15 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Tree2: @ 8484BA8
-	.4byte SecretBase_Tree2_MapAttributes
+	.4byte SecretBase_Tree2_Layout
 	.4byte SecretBase_Tree2_MapEvents
 	.4byte SecretBase_Tree2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 207
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..b2d950a40
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..6ef940796 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Tree3: @ 8484C50
-	.4byte SecretBase_Tree3_MapAttributes
+	.4byte SecretBase_Tree3_Layout
 	.4byte SecretBase_Tree3_MapEvents
 	.4byte SecretBase_Tree3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 213
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..a1d7f7b50
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..2a2523a07 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -1,15 +1,15 @@
 SecretBase_Tree4: @ 8484CF8
-	.4byte SecretBase_Tree4_MapAttributes
+	.4byte SecretBase_Tree4_Layout
 	.4byte SecretBase_Tree4_MapEvents
 	.4byte SecretBase_Tree4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 219
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..9b394350c
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..d15eacc36 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -1,15 +1,15 @@
 SecretBase_YellowCave1: @ 8484AE4
-	.4byte SecretBase_YellowCave1_MapAttributes
+	.4byte SecretBase_YellowCave1_Layout
 	.4byte SecretBase_YellowCave1_MapEvents
 	.4byte SecretBase_YellowCave1_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 200
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..a958fcb53
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..a1afc748a 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -1,15 +1,15 @@
 SecretBase_YellowCave2: @ 8484B8C
-	.4byte SecretBase_YellowCave2_MapAttributes
+	.4byte SecretBase_YellowCave2_Layout
 	.4byte SecretBase_YellowCave2_MapEvents
 	.4byte SecretBase_YellowCave2_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 206
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..2decabcee
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..798754531 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -1,15 +1,15 @@
 SecretBase_YellowCave3: @ 8484C34
-	.4byte SecretBase_YellowCave3_MapAttributes
+	.4byte SecretBase_YellowCave3_Layout
 	.4byte SecretBase_YellowCave3_MapEvents
 	.4byte SecretBase_YellowCave3_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 212
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..535ca8e4c
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+	object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+	object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+	object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+	object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+	object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+	object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+	object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+	object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+	object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+	object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+	object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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..89921f1d4 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -1,15 +1,15 @@
 SecretBase_YellowCave4: @ 8484CDC
-	.4byte SecretBase_YellowCave4_MapAttributes
+	.4byte SecretBase_YellowCave4_Layout
 	.4byte SecretBase_YellowCave4_MapEvents
 	.4byte SecretBase_YellowCave4_MapScripts
 	.4byte 0x0
 	.2byte MUS_MACHI_S3
 	.2byte 218
-	.byte 86
+	.byte MAPSEC_SECRET_BASE
 	.byte 0
-	.byte 0
-	.byte 9
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_SECRET_BASE
 	.2byte 0
 	.byte 12
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..507ad7054 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -1,15 +1,15 @@
 ShoalCave_HighTideEntranceRoom: @ 8484438
-	.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_HighTideEntranceRoom_Layout
 	.4byte ShoalCave_HighTideEntranceRoom_MapEvents
 	.4byte ShoalCave_HighTideEntranceRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 168
-	.byte 67
+	.byte MAPSEC_SHOAL_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1d334424b 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -1,15 +1,15 @@
 ShoalCave_HighTideInnerRoom: @ 8484454
-	.4byte ShoalCave_HighTideInnerRoom_MapAttributes
+	.4byte ShoalCave_HighTideInnerRoom_Layout
 	.4byte ShoalCave_HighTideInnerRoom_MapEvents
 	.4byte ShoalCave_HighTideInnerRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 169
-	.byte 67
+	.byte MAPSEC_SHOAL_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..614c009c1
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 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..98614de64 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -1,15 +1,15 @@
 ShoalCave_LowTideEntranceRoom: @ 84843C8
-	.4byte ShoalCave_LowTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_LowTideEntranceRoom_Layout
 	.4byte ShoalCave_LowTideEntranceRoom_MapEvents
 	.4byte ShoalCave_LowTideEntranceRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 164
-	.byte 67
+	.byte MAPSEC_SHOAL_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5f4fe1dac
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 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..05b77a442 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -1,15 +1,15 @@
 ShoalCave_LowTideIceRoom: @ 84847D4
-	.4byte ShoalCave_LowTideIceRoom_MapAttributes
+	.4byte ShoalCave_LowTideIceRoom_Layout
 	.4byte ShoalCave_LowTideIceRoom_MapEvents
 	.4byte ShoalCave_LowTideIceRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 328
-	.byte 67
+	.byte MAPSEC_SHOAL_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..543a7d02b
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C
+	bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8
+	bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA
+	bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FF6
+	bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028
+	bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, 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..b1ab8a459 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -1,15 +1,15 @@
 ShoalCave_LowTideInnerRoom: @ 84843E4
-	.4byte ShoalCave_LowTideInnerRoom_MapAttributes
+	.4byte ShoalCave_LowTideInnerRoom_Layout
 	.4byte ShoalCave_LowTideInnerRoom_MapEvents
 	.4byte ShoalCave_LowTideInnerRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 165
-	.byte 67
+	.byte MAPSEC_SHOAL_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..dabb85971
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..0c8380b79 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -1,15 +1,15 @@
 ShoalCave_LowTideLowerRoom: @ 848441C
-	.4byte ShoalCave_LowTideLowerRoom_MapAttributes
+	.4byte ShoalCave_LowTideLowerRoom_Layout
 	.4byte ShoalCave_LowTideLowerRoom_MapEvents
 	.4byte ShoalCave_LowTideLowerRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 167
-	.byte 67
+	.byte MAPSEC_SHOAL_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b6af468c5
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 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, BG_EVENT_PLAYER_FACING_ANY, 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..8a977c94e 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -1,15 +1,15 @@
 ShoalCave_LowTideStairsRoom: @ 8484400
-	.4byte ShoalCave_LowTideStairsRoom_MapAttributes
+	.4byte ShoalCave_LowTideStairsRoom_Layout
 	.4byte ShoalCave_LowTideStairsRoom_MapEvents
 	.4byte ShoalCave_LowTideStairsRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 166
-	.byte 67
+	.byte MAPSEC_SHOAL_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c0bcde1ba
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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, VAR_TEMP_0, 0, gUnknown_08277374
+	coord_event 10, 5, 3, VAR_TEMP_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..fe4b69f96 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -1,15 +1,15 @@
 SingleBattleColosseum: @ 8484D30
-	.4byte SingleBattleColosseum_MapAttributes
+	.4byte SingleBattleColosseum_Layout
 	.4byte SingleBattleColosseum_MapEvents
 	.4byte SingleBattleColosseum_MapScripts
 	.4byte 0x0
 	.2byte MUS_RAINBOW
 	.2byte 221
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..842ec79cd 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_1F: @ 8484764
-	.4byte SkyPillar_1F_MapAttributes
+	.4byte SkyPillar_1F_Layout
 	.4byte SkyPillar_1F_MapEvents
 	.4byte SkyPillar_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 322
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e018869b9 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_2F: @ 8484780
-	.4byte SkyPillar_2F_MapAttributes
+	.4byte SkyPillar_2F_Layout
 	.4byte SkyPillar_2F_MapEvents
 	.4byte SkyPillar_2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 323
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e3b2c3c40 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_3F: @ 848479C
-	.4byte SkyPillar_3F_MapAttributes
+	.4byte SkyPillar_3F_Layout
 	.4byte SkyPillar_3F_MapEvents
 	.4byte SkyPillar_3F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 324
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..23addaa76 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_4F: @ 84847B8
-	.4byte SkyPillar_4F_MapAttributes
+	.4byte SkyPillar_4F_Layout
 	.4byte SkyPillar_4F_MapEvents
 	.4byte SkyPillar_4F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 325
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..46830945d 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_5F: @ 84847F0
-	.4byte SkyPillar_5F_MapAttributes
+	.4byte SkyPillar_5F_Layout
 	.4byte SkyPillar_5F_MapEvents
 	.4byte SkyPillar_5F_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 330
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bafe1880a 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_Entrance: @ 848472C
-	.4byte SkyPillar_Entrance_MapAttributes
+	.4byte SkyPillar_Entrance_Layout
 	.4byte SkyPillar_Entrance_MapEvents
 	.4byte SkyPillar_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 320
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..386ea0b35
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..5e7ff153c 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_Outside: @ 8484748
-	.4byte SkyPillar_Outside_MapAttributes
+	.4byte SkyPillar_Outside_Layout
 	.4byte SkyPillar_Outside_MapEvents
 	.4byte SkyPillar_Outside_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 321
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
new file mode 100644
index 000000000..e9fbf4ad6
--- /dev/null
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -0,0 +1,174 @@
+SkyPillar_Outside_MapScripts:: @ 82392A8
+	map_script 3, SkyPillar_Outside_MapScript1_2392B8
+	map_script 1, SkyPillar_Outside_MapScript1_2392DD
+	map_script 2, SkyPillar_Outside_MapScript2_2392FA
+	.byte 0
+
+SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
+	compare VAR_0x405E, 3
+	call_if 1, SkyPillar_Outside_EventScript_2392CF
+	compare VAR_0x405E, 4
+	call_if 4, SkyPillar_Outside_EventScript_2392D3
+	end
+
+SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	return
+
+SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
+	checkflag FLAG_SYS_WEATHER_CTRL
+	call_if 1, SkyPillar_Outside_EventScript_27207A
+	return
+
+SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
+	checkflag FLAG_0x137
+	call_if 1, SkyPillar_Outside_EventScript_2392E7
+	end
+
+SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
+	setmetatile 14, 4, 682, 0
+	setmetatile 14, 5, 690, 0
+	return
+
+SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
+	map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304
+	.2byte 0
+
+SkyPillar_Outside_EventScript_239304:: @ 8239304
+	lockall
+	applymovement 1, SkyPillar_Outside_Movement_2393D3
+	waitmovement 0
+	applymovement 255, SkyPillar_Outside_Movement_2725A4
+	waitmovement 0
+	msgbox SkyPillar_Outside_Text_239416, 4
+	closemessage
+	delay 30
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	setvar VAR_0x8006, 8
+	setvar VAR_0x8007, 3
+	special sub_8139560
+	waitstate
+	delay 40
+	msgbox SkyPillar_Outside_Text_2394BC, 4
+	closemessage
+	applymovement 255, SkyPillar_Outside_Movement_2393EB
+	applymovement 1, SkyPillar_Outside_Movement_2393DE
+	waitmovement 0
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 3
+	setvar VAR_0x8006, 20
+	setvar VAR_0x8007, 5
+	special sub_8139560
+	waitstate
+	delay 20
+	applymovement 1, SkyPillar_Outside_Movement_2725A4
+	waitmovement 0
+	delay 10
+	applymovement 1, SkyPillar_Outside_Movement_2725A8
+	waitmovement 0
+	delay 20
+	applymovement 1, SkyPillar_Outside_Movement_2725AA
+	waitmovement 0
+	delay 30
+	msgbox SkyPillar_Outside_Text_23950C, 4
+	closemessage
+	setflag FLAG_SYS_WEATHER_CTRL
+	setweather 15
+	doweather
+	special WaitWeather
+	waitstate
+	delay 30
+	msgbox SkyPillar_Outside_Text_23953A, 4
+	closemessage
+	playse SE_KAIDAN
+	fadescreenswapbuffers 1
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_0x405E, 4
+	removeobject 1
+	clearflag FLAG_0x330
+	fadescreenswapbuffers 0
+	releaseall
+	end
+
+SkyPillar_Outside_Movement_2393D3: @ 82393D3
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SkyPillar_Outside_Movement_2393DE: @ 82393DE
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SkyPillar_Outside_Movement_2393EB: @ 82393EB
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SkyPillar_Outside_EventScript_2393F8:: @ 82393F8
+	end
+
+SkyPillar_Outside_EventScript_2393F9:: @ 82393F9
+	msgbox SkyPillar_Outside_Text_239402, 3
+	end
+
+SkyPillar_Outside_Text_239402: @ 8239402
+	.string "The door is closed.$"
+
+SkyPillar_Outside_Text_239416: @ 8239416
+	.string "WALLACE: Oh, my, I’m terribly sorry!\p"
+	.string "In my haste, I didn’t notice that\n"
+	.string "I’d left you behind!\p"
+	.string "I’ve opened the locked door of\n"
+	.string "the SKY PILLAR.\p"
+	.string "{PLAYER}{KUN}, let’s be on our way!$"
+
+SkyPillar_Outside_Text_2394BC: @ 82394BC
+	.string "WALLACE: It’s an earthquake!\p"
+	.string "There’s not a moment to waste!\n"
+	.string "We’ve got to hurry!$"
+
+SkyPillar_Outside_Text_23950C: @ 823950C
+	.string "WALLACE: Hmm…\n"
+	.string "The situation is getting worse…$"
+
+SkyPillar_Outside_Text_23953A: @ 823953A
+	.string "WALLACE: This isn’t good…\p"
+	.string "The weather distortion is spreading\n"
+	.string "even here…\p"
+	.string "{PLAYER}{KUN}.\p"
+	.string "RAYQUAZA should be farther up\n"
+	.string "from here.\p"
+	.string "I’m worried about SOOTOPOLIS.\n"
+	.string "I’ve got to go back.\p"
+	.string "Everything is in your hands now.\n"
+	.string "Don’t fail us!$"
diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc
new file mode 100644
index 000000000..9271dd4d3
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 773
+	object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_0x40D7, 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..d4afb6ad1 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -1,15 +1,15 @@
 SkyPillar_Top: @ 848480C
-	.4byte SkyPillar_Top_MapAttributes
+	.4byte SkyPillar_Top_Layout
 	.4byte SkyPillar_Top_MapEvents
 	.4byte SkyPillar_Top_MapScripts
 	.4byte 0x0
 	.2byte MUS_TOZAN
 	.2byte 331
-	.byte 85
+	.byte MAPSEC_SKY_PILLAR
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 12
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
new file mode 100644
index 000000000..334acc8ac
--- /dev/null
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -0,0 +1,189 @@
+SkyPillar_Top_MapScripts:: @ 82396B8
+	map_script 5, SkyPillar_Top_MapScript1_2396C8
+	map_script 3, SkyPillar_Top_MapScript1_2396E6
+	map_script 4, SkyPillar_Top_MapScript2_239713
+	.byte 0
+
+SkyPillar_Top_MapScript1_2396C8: @ 82396C8
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, SkyPillar_Top_EventScript_2396D2
+	end
+
+SkyPillar_Top_EventScript_2396D2:: @ 82396D2
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, SkyPillar_Top_EventScript_27374E
+	removeobject VAR_LAST_TALKED
+	return
+
+SkyPillar_Top_MapScript1_2396E6: @ 82396E6
+	compare VAR_0x40CA, 2
+	call_if 0, SkyPillar_Top_EventScript_2396FD
+	compare VAR_0x40CA, 2
+	call_if 4, SkyPillar_Top_EventScript_239705
+	end
+
+SkyPillar_Top_EventScript_2396FD:: @ 82396FD
+	setmaplayoutindex 438
+	setobjectmovementtype 1, 8
+	return
+
+SkyPillar_Top_EventScript_239705:: @ 8239705
+	checkflag FLAG_0x1C0
+	call_if 0, SkyPillar_Top_EventScript_23970F
+	return
+
+SkyPillar_Top_EventScript_23970F:: @ 823970F
+	clearflag FLAG_0x050
+	return
+
+SkyPillar_Top_MapScript2_239713: @ 8239713
+	map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D
+	.2byte 0
+
+SkyPillar_Top_EventScript_23971D:: @ 823971D
+	turnobject 1, 1
+	end
+
+SkyPillar_Top_EventScript_239722:: @ 8239722
+	lockall
+	waitse
+	playmoncry SPECIES_RAYQUAZA, 2
+	delay 40
+	waitmoncry
+	setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special BattleSetup_StartLegendaryBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq SkyPillar_Top_EventScript_239768
+	compare VAR_RESULT, 4
+	goto_eq SkyPillar_Top_EventScript_239771
+	compare VAR_RESULT, 5
+	goto_eq SkyPillar_Top_EventScript_239771
+	setflag FLAG_0x1C0
+	releaseall
+	end
+
+SkyPillar_Top_EventScript_239768:: @ 8239768
+	setflag FLAG_0x1C0
+	goto SkyPillar_Top_EventScript_23977C
+	end
+
+SkyPillar_Top_EventScript_239771:: @ 8239771
+	setvar VAR_0x8004, 406
+	goto SkyPillar_Top_EventScript_239785
+	end
+
+SkyPillar_Top_EventScript_23977C:: @ 823977C
+	fadescreenswapbuffers 1
+	removeobject VAR_LAST_TALKED
+	fadescreenswapbuffers 0
+	releaseall
+	end
+
+SkyPillar_Top_EventScript_239785:: @ 8239785
+	fadescreenswapbuffers 1
+	removeobject VAR_LAST_TALKED
+	fadescreenswapbuffers 0
+	bufferspeciesname 0, VAR_0x8004
+	msgbox gUnknown_08273204, 4
+	releaseall
+	end
+
+SkyPillar_Top_EventScript_23979A:: @ 823979A
+	lockall
+	fadeoutbgm 1
+	applymovement 255, SkyPillar_Top_Movement_2725B2
+	waitmovement 0
+	special SpawnScriptEventObject
+	applymovement 127, SkyPillar_Top_Movement_239858
+	waitmovement 0
+	special RemoveScriptEventObject
+	applymovement 1, SkyPillar_Top_Movement_23983A
+	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
+	applymovement 1, SkyPillar_Top_Movement_23984B
+	waitmovement 0
+	removeobject 1
+	msgbox SkyPillar_Top_Text_239860, 4
+	closemessage
+	delay 20
+	fadeinbgm 1
+	special SpawnScriptEventObject
+	applymovement 127, SkyPillar_Top_Movement_23985C
+	waitmovement 0
+	special RemoveScriptEventObject
+	setvar VAR_0x405E, 5
+	setvar VAR_0x40CA, 1
+	setvar VAR_0x40D7, 1
+	releaseall
+	end
+
+SkyPillar_Top_Movement_23983A: @ 823983A
+	delay_16
+	walk_in_place_fast_left
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_left
+	delay_16
+	walk_in_place_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+SkyPillar_Top_Movement_23984B: @ 823984B
+	delay_16
+	walk_in_place_down
+	delay_8
+	walk_in_place_right
+	delay_8
+	walk_fastest_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	step_end
+
+SkyPillar_Top_Movement_239858: @ 8239858
+	walk_slow_up
+	walk_slow_up
+	walk_slow_up
+	step_end
+
+SkyPillar_Top_Movement_23985C: @ 823985C
+	walk_slow_down
+	walk_slow_down
+	walk_slow_down
+	step_end
+
+SkyPillar_Top_Text_239860: @ 8239860
+	.string "The awakened RAYQUAZA flew off…$"
+
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..8b74573b7
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835
+	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840
+	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0
+	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0
+	object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0
+	object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882
+	object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882
+	object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0
+	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0
+	object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0
+	object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, 948
+	object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0
+	object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, 882
+	object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, 882
+	object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, 882
+	object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, 882
+	object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, 882
+	object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, 882
+	object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, 882
+	object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, 882
+	object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0
+	object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC
+
+SlateportCity_MapBGEvents: @ 852657C
+	bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2
+	bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73
+	bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73
+	bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A
+	bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF94
+	bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A
+	bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF8B
+	bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF79
+	bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF82
+	bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF70
+	bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF36
+	bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F
+	bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..335a1a094 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -1,15 +1,15 @@
 SlateportCity: @ 84824D4
-	.4byte SlateportCity_MapAttributes
+	.4byte SlateportCity_Layout
 	.4byte SlateportCity_MapEvents
 	.4byte SlateportCity_MapScripts
 	.4byte SlateportCity_MapConnections
 	.2byte MUS_FINECITY
 	.2byte 2
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6c28d5fc5
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 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..0b6c6bd39 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_BattleTentBattleRoom: @ 848314C
-	.4byte SlateportCity_BattleTentBattleRoom_MapAttributes
+	.4byte BattleTentBattleRoom_Layout
 	.4byte SlateportCity_BattleTentBattleRoom_MapEvents
 	.4byte SlateportCity_BattleTentBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 386
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4fe072b50
--- /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, MOVEMENT_TYPE_FACE_UP, 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..926a367ee 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/header.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_BattleTentCorridor: @ 8483130
-	.4byte SlateportCity_BattleTentCorridor_MapAttributes
+	.4byte BattleTentCorridor_Layout
 	.4byte SlateportCity_BattleTentCorridor_MapEvents
 	.4byte SlateportCity_BattleTentCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 385
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c5c60ba6d
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, 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..d4689afde 100644
--- a/data/maps/SlateportCity_BattleTentLobby/header.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_BattleTentLobby: @ 8483114
-	.4byte SlateportCity_BattleTentLobby_MapAttributes
+	.4byte BattleTentLobby_Layout
 	.4byte SlateportCity_BattleTentLobby_MapEvents
 	.4byte SlateportCity_BattleTentLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 384
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ba5f25d98
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841
+	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 860
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 845
+	object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 846
+	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 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, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB
+	coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7
+	coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3
+	coord_event 8, 14, 3, VAR_0x40A0, 1, 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..5a31901a3 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_Harbor: @ 84831D8
-	.4byte SlateportCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte SlateportCity_Harbor_MapEvents
 	.4byte SlateportCity_Harbor_MapScripts
 	.4byte 0x0
 	.2byte MUS_FINECITY
 	.2byte 88
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..713ff1dd5
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..06e2689cd 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_House1: @ 8483168
-	.4byte SlateportCity_House1_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte SlateportCity_House1_MapEvents
 	.4byte SlateportCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_FINECITY
 	.2byte 80
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..daa627c06
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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..5612c6df0 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_House2: @ 84831F4
-	.4byte SlateportCity_House2_MapAttributes
+	.4byte House2_Layout
 	.4byte SlateportCity_House2_MapEvents
 	.4byte SlateportCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_FINECITY
 	.2byte 60
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..da5f668e0
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..764b8e9b5 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_Mart: @ 8483248
-	.4byte SlateportCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte SlateportCity_Mart_MapEvents
 	.4byte SlateportCity_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..256b2ee1c
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883
+	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883
+	object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961
+	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961
+	object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965
+	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 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, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F
+	coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0
+
+SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8
+	bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83
+	bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C
+	bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
+	bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
+	bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95
+	bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E
+	bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7
+	bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0
+	bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9
+	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
+	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2
+	bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB
+	bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..40b265c1d 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FUNE_KAN
 	.2byte 86
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
new file mode 100644
index 000000000..4464ee582
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -0,0 +1,395 @@
+SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95
+	.byte 0
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F
+	lockall
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A4
+	waitmovement 0
+	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0
+	lockall
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A8
+	waitmovement 0
+	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1
+	showmoneybox 0, 0, 0
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5
+	compare VAR_RESULT, 1
+	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8
+	closemessage
+	hidemoneybox
+	nop
+	nop
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
+	waitmovement 0
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
+	checkmoney 0x32, 0
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18
+	playse SE_REGI
+	takemoney 0x32, 0
+	updatemoneybox 0, 0
+	nop
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 4
+	setvar VAR_0x40AA, 1
+	hidemoneybox
+	nop
+	nop
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18
+	checkflag FLAG_0x095
+	goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, 4
+	closemessage
+	hidemoneybox
+	nop
+	nop
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
+	waitmovement 0
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, 4
+	setvar VAR_0x40AA, 1
+	hidemoneybox
+	nop
+	nop
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B
+	walk_down
+	step_end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8
+	lock
+	faceplayer
+	delay 8
+	playse SE_PIN
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598
+	waitmovement 0
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4
+	giveitem_std ITEM_TM46
+	compare VAR_RESULT, 0
+	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5
+	setflag FLAG_0x10D
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4
+	closemessage
+	compare VAR_FACING, 2
+	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C
+	compare VAR_FACING, 1
+	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83
+	compare VAR_FACING, 3
+	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
+	compare VAR_FACING, 4
+	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFBF
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE
+	waitmovement 0
+	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7
+	waitmovement 0
+	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFC4
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7
+	waitmovement 0
+	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA
+	setflag FLAG_0x3C5
+	playse SE_KAIDAN
+	removeobject 13
+	release
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5
+	msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, 4
+	release
+	end
+
+SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF
+	delay_16
+	delay_8
+	delay_4
+	walk_in_place_fastest_down
+	step_end
+
+SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4
+	delay_16
+	walk_in_place_fastest_down
+	step_end
+
+SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7
+	face_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	step_end
+
+SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	step_end
+
+SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5
+	.string "Welcome to the OCEANIC MUSEUM.\p"
+	.string "The entrance fee is ¥50.\n"
+	.string "Would you like to enter?$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026
+	.string "Please enjoy yourself.$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D
+	.string "Oh? I’m sorry, but you don’t seem to\n"
+	.string "have enough money.$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075
+	.string "Oh? You’re with that group that\n"
+	.string "went in earlier?\p"
+	.string "You’re the only one who’s late.\n"
+	.string "You’d better go catch up to them!$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8
+	.string "We, TEAM AQUA, exist for the good\n"
+	.string "of all!$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112
+	.string "We were told to assemble here,\n"
+	.string "so we did, but…\p"
+	.string "Our BOSS, the linchpin, isn’t here.$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165
+	.string "If I ripped off the stuff here,\n"
+	.string "would it make me rich?$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C
+	.string "What I learn here, I can put to use on\n"
+	.string "nefarious deeds…$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4
+	.string "If our goons didn’t bungle things\n"
+	.string "in RUSTBORO, we wouldn’t be here!$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218
+	.string "I didn’t have ¥50, so it took a long\n"
+	.string "time getting by the receptionist.$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F
+	.string "I want to learn about the sea and\n"
+	.string "use that knowledge for battling.$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B2A2: @ 820B2A2
+	.string "I get all giddy and gooey when\n"
+	.string "I see the sea!\p"
+	.string "For me, CAPT. STERN is the number\n"
+	.string "one role model!$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302
+	.string "The sea is vast without end, and\n"
+	.string "infinitely deep…\p"
+	.string "There must be many POKéMON that\n"
+	.string "we don’t know about.$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369
+	.string "I want a sea POKéMON.\p"
+	.string "I think it would feel cool and nice\n"
+	.string "to hug.$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB
+	.string "Aiyeeeh!\n"
+	.string "What are you doing here?\p"
+	.string "Me? I’m the TEAM AQUA member\n"
+	.string "you thumped before, remember?\l"
+	.string "Back in RUSTURF TUNNEL?\p"
+	.string "Here, take this!\n"
+	.string "You have to forgive me!$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B449: @ 820B449
+	.string "That TM, it suits you more than it\n"
+	.string "does me.\p"
+	.string "Hope I never see you again!\n"
+	.string "Wahahaha!$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B49B: @ 820B49B
+	.string "Awww, come on!\n"
+	.string "You have to take this and let me go!$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B4CF: @ 820B4CF
+	.string "A blue fluid is spiraling inside\n"
+	.string "a glass vessel.\p"
+	.string "“This is an experiment to create a\n"
+	.string "WHIRLPOOL artificially using wind.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547
+	.string "A red ball is bobbing up and down\n"
+	.string "inside a glass vessel.\p"
+	.string "“This is an experiment simulating a\n"
+	.string "WATERFALL using the ball’s buoyancy.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA
+	.string "It’s a sample of soil from the ocean\n"
+	.string "floor.\p"
+	.string "“Over many years, the remains of\n"
+	.string "life-forms settle at the bottom of\l"
+	.string "the sea, making sedimentary layers.\p"
+	.string "“By analyzing these layers, the\n"
+	.string "ancient past is revealed.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699
+	.string "It’s a sample of beach sand.\p"
+	.string "“Stones from mountains are washed\n"
+	.string "down by rivers where they are\l"
+	.string "chipped and ground down.\p"
+	.string "“They are reduced to grains and end\n"
+	.string "up as sand on beaches.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B
+	.string "“OCEANIC MINIFACT 1\n"
+	.string "Why is seawater blue?\p"
+	.string "“Light is composed of many colors.\p"
+	.string "“When light passes through water,\n"
+	.string "most kinds of light lose color.\p"
+	.string "“However, blue light retains its\n"
+	.string "color, making the sea appear blue.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F
+	.string "“OCEANIC MINIFACT 2\n"
+	.string "Why is the sea salty?\p"
+	.string "“Seawater contains dissolved salt in\n"
+	.string "the form of sodium and chlorine ions.\p"
+	.string "“These ions leech out of rocks\n"
+	.string "and are carried out to sea by rain.\p"
+	.string "“The concentration of dissolved salt\n"
+	.string "makes the sea salty.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912
+	.string "“OCEANIC MINIFACT 3\n"
+	.string "Which is bigger? The sea or land?\p"
+	.string "“The sea covers about 70% of\n"
+	.string "the planet, and the rest is land.\p"
+	.string "“The sea is therefore more than twice\n"
+	.string "the size of land.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0
+	.string "It’s a fossil with wavy ridges on it.\p"
+	.string "“Soil on the ocean floor gets scoured\n"
+	.string "by the tide.\p"
+	.string "“The flowing seawater marks the soil\n"
+	.string "with small ridges and valleys.\p"
+	.string "“If this soil becomes fossilized, it is\n"
+	.string "called a ripple mark.”$"
+
+SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C
+	.string "A strange machine is rotating under\n"
+	.string "a glass dome.\p"
+	.string "Maybe it’s for measuring the depth\n"
+	.string "of something…$"
+
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
new file mode 100644
index 000000000..7b407d5d2
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887
+	object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 886
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 884
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 885
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A
+	bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13
+	bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
+	bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52
+	bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+	bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+	bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49
+	bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+	bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+	bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
+	bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B
+	bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
+	bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37
+	bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
+	bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E
+	bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
+	bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25
+	bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
+	bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C
+	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40
+	bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, 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..857443db1 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FUNE_KAN
 	.2byte 87
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
new file mode 100644
index 000000000..4172c47ef
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -0,0 +1,441 @@
+SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF
+	.byte 0
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
+	lock
+	faceplayer
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4
+	closemessage
+	playbgm MUS_AQA_0, 1
+	addobject 3
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4
+	waitmovement 0
+	addobject 4
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF3
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5
+	waitmovement 0
+	compare VAR_FACING, 1
+	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92
+	compare VAR_FACING, 4
+	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4
+	compare VAR_FACING, 4
+	call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4
+	closemessage
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
+	waitmovement 0
+	compare VAR_FACING, 1
+	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
+	compare VAR_FACING, 3
+	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
+	trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4
+	closemessage
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, 4
+	trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, 4
+	closemessage
+	delay 35
+	addobject 2
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, 4
+	closemessage
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4
+	closemessage
+	savebgm MUS_DUMMY
+	fadedefaultbgm
+	fadescreen 1
+	removeobject 2
+	removeobject 3
+	removeobject 4
+	fadescreen 0
+	delay 30
+	setflag FLAG_0x373
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4
+	setvar VAR_0x8004, 269
+	call SlateportCity_OceanicMuseum_2F_EventScript_2723E4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4
+	closemessage
+	fadescreen 1
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special HealPlayerParty
+	removeobject 1
+	setflag FLAG_0x384
+	compare VAR_0x40DA, 0
+	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C
+	setflag FLAG_0x095
+	clearflag FLAG_0x3B3
+	setflag FLAG_0x3B5
+	setvar VAR_0x40D2, 1
+	fadescreen 0
+	release
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C
+	setvar VAR_0x40DA, 1
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A4
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D
+	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCBE
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCC2
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2
+	walk_up
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6
+	walk_right
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2
+	walk_right
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3
+	walk_down
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_fast_down
+	walk_in_place_fastest_up
+	step_end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, 2
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, 2
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76
+	lock
+	faceplayer
+	msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, 4
+	closemessage
+	applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2
+	waitmovement 0
+	release
+	end
+
+SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D
+	.string "Yes? If you’re looking for STERN,\n"
+	.string "that would be me.\p"
+	.string "Ah! Those must be the parts I ordered\n"
+	.string "from MR. STONE of DEVON.\p"
+	.string "Thank you! That’s great!\n"
+	.string "We can prepare for our expedition now.$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40
+	.string "Hehehe, hold it!\n"
+	.string "We’ll take those parts!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69
+	.string "CAPT. STERN: Wh-what?\n"
+	.string "Who are you people?$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93
+	.string "We’re TEAM AQUA!\p"
+	.string "Our BOSS wants those parts!\n"
+	.string "Shut your yap and fork them over!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BEE2: @ 820BEE2
+	.string "Awaaaah!\n"
+	.string "A kid beat me!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BEFA: @ 820BEFA
+	.string "Oh, man, what a disaster…\n"
+	.string "The BOSS is going to be furious…$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BF35: @ 820BF35
+	.string "Humph, sniveling wimp!\n"
+	.string "Let me take care of this!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66
+	.string "What?!\n"
+	.string "I lost, too!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A
+	.string "Now what? If we don’t get the parts,\n"
+	.string "we’re in for it!\p"
+	.string "Arrgh, I didn’t count on being meddled\n"
+	.string "with by some meddling kid!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2
+	.string "I came to see what was taking so\n"
+	.string "long to snatch some parts, and you\l"
+	.string "simps are held up by a mere child?$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059
+	.string "We are TEAM AQUA,\n"
+	.string "and we love the sea!\p"
+	.string "And I am TEAM AQUA’s leader,\n"
+	.string "ARCHIE!\p"
+	.string "What makes you interfere with us?\p"
+	.string "…No! You can’t be!\n"
+	.string "You’re not one of TEAM MAGMA?\p"
+	.string "Wait, that can’t be right.\n"
+	.string "You’re not dressed for the part.\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "POKéMON, people… All life depends on\n"
+	.string "the sea.\p"
+	.string "So, TEAM AQUA is dedicated to\n"
+	.string "the expansion of the sea.\p"
+	.string "Don’t you agree? What we are doing\n"
+	.string "is a magnificent undertaking.\p"
+	.string "Ah, fine…\n"
+	.string "You’re still too young to understand\l"
+	.string "our noble objective.\p"
+	.string "But, I warn you, don’t even consider\n"
+	.string "interfering with our plans again.\p"
+	.string "The consequences will cost you\n"
+	.string "dearly!\p"
+	.string "And don’t you forget it!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE
+	.string "CAPT. STERN: You’re…\n"
+	.string "Ah, okay, you’re {PLAYER}{KUN}…\p"
+	.string "Anyway, that was a tense situation!\n"
+	.string "Thank you for saving us!\p"
+	.string "Oh, yes, I almost forgot that you\n"
+	.string "even brought the parts from DEVON!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C
+	.string "CAPT. STERN: Whoops!\n"
+	.string "There’s no time to lose!\p"
+	.string "We have to set out on our ocean-floor\n"
+	.string "expedition really soon.\p"
+	.string "Thanks again, but now I’ve got\n"
+	.string "to go!\p"
+	.string "Feel free to wander around and check\n"
+	.string "out our facilities, though.$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F
+	.string "I saw a model of a ship here.\p"
+	.string "It reminded me of the ABANDONED SHIP\n"
+	.string "near DEWFORD TOWN…$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495
+	.string "Don’t you dare run around inside\n"
+	.string "the MUSEUM!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2
+	.string "Wow, the submarine’s awesome!\n"
+	.string "I want to go for a ride!$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9
+	.string "“WATER QUALITY SAMPLE 1,” the\n"
+	.string "label says.\p"
+	.string "The sea is all connected, but the\n"
+	.string "water seems to differ by region.$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C566: @ 820C566
+	.string "“WATER QUALITY SAMPLE 2,” the\n"
+	.string "label says.\p"
+	.string "Does the saltiness of seawater differ\n"
+	.string "by region, too?$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6
+	.string "A rubber ball is expanding and\n"
+	.string "shrinking.\p"
+	.string "“In the sea, the weight of water itself\n"
+	.string "exerts pressure.\p"
+	.string "“In shallow water, the pressure is not\n"
+	.string "very heavy.\p"
+	.string "“However, in extremely deep water,\n"
+	.string "the pressure can reach even tens of\l"
+	.string "thousands of tons on a small area.”$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7
+	.string "“MODEL OF HOENN REGION”\p"
+	.string "It’s a miniature diorama of the\n"
+	.string "HOENN region.\p"
+	.string "Where is LITTLEROOT TOWN on this?$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F
+	.string "It’s a display on the flow of seawater.\p"
+	.string "“Near the bottom of the sea, water\n"
+	.string "flows due to differences in such\l"
+	.string "factors as temperature and salinity.”$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1
+	.string "It’s a display on the flow of seawater.\p"
+	.string "“Toward the surface, seawater flows\n"
+	.string "as currents driven by the winds.”$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F
+	.string "“THE FERRY S.S. TIDAL\p"
+	.string "“A scale replica of the ship under\n"
+	.string "construction at STERN’S SHIPYARD.”$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B
+	.string "“SUBMARINE EXPLORER 1\p"
+	.string "“A replica of the high-performance\n"
+	.string "ocean floor exploration submarine.”$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C8E8: @ 820C8E8
+	.string "“SUBMERSIBLE POD\p"
+	.string "“A replica of a compact, unmanned\n"
+	.string "pod for seafloor exploration.”$"
+
+SlateportCity_OceanicMuseum_2F_Text_20C93A: @ 820C93A
+	.string "“S.S. ANNE\p"
+	.string "“A replica of the luxury liner that\n"
+	.string "circles the globe.”$"
+
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..32328d255
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..0c4696d86 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e20e593cb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..8026aaf41 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d6a0ac4e1
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0
+	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0
+	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0
+	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0
+	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0
+	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 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..90b17f14a 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -1,15 +1,15 @@
 SlateportCity_PokemonFanClub: @ 8483184
-	.4byte SlateportCity_PokemonFanClub_MapAttributes
+	.4byte SlateportCity_PokemonFanClub_Layout
 	.4byte SlateportCity_PokemonFanClub_MapEvents
 	.4byte SlateportCity_PokemonFanClub_MapScripts
 	.4byte 0x0
 	.2byte MUS_FINECITY
 	.2byte 85
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..19886500f
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..48d184517 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FINECITY
 	.2byte 81
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f34a52726
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 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..b868e843a 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_FINECITY
 	.2byte 82
-	.byte 8
+	.byte MAPSEC_SLATEPORT_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7361ccc21
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839
+	object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, 973
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0
+	object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, 998
+	object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, 997
+	object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 996
+	object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, 854
+	object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, 854
+	object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, 854
+	object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, 854
+	object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, 827
+	object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, 826
+	object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B
+	bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A
+	bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73
+	bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73
+	bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A
+	bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, 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..e635b6f80 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity: @ 848257C
-	.4byte SootopolisCity_MapAttributes
+	.4byte SootopolisCity_Layout
 	.4byte SootopolisCity_MapEvents
 	.4byte SootopolisCity_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 8
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 2
-	.byte 2
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_CITY
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..36d8d7b27
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F
+	bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..8b5c93c0d 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GIM
 	.2byte 109
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..9f747bc4a
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0
+	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 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..84caedcf8 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_GIM
 	.2byte 110
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 1
+	.byte MAP_BATTLE_SCENE_GYM
 
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..38885d648
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 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..0b4eae619 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House1: @ 8483AB4
-	.4byte SootopolisCity_House1_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House1_MapEvents
 	.4byte SootopolisCity_House1_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 307
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..a8885190e
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 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..a0d8b4fb4 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House2: @ 8483AD0
-	.4byte SootopolisCity_House2_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House2_MapEvents
 	.4byte SootopolisCity_House2_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 308
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..9f5cc781e
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..015f6fe6c 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House3: @ 8483AEC
-	.4byte SootopolisCity_House3_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House3_MapEvents
 	.4byte SootopolisCity_House3_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 309
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..d9948d5be
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0
+	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 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..21c8c9235 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House4: @ 8483B08
-	.4byte SootopolisCity_House4_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House4_MapEvents
 	.4byte SootopolisCity_House4_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 307
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..321de8b64
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 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..60fa216ca 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House5: @ 8483B24
-	.4byte SootopolisCity_House5_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House5_MapEvents
 	.4byte SootopolisCity_House5_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 308
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4ca7e5745
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 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..112aa8a6d 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House6: @ 8483B40
-	.4byte SootopolisCity_House6_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House6_MapEvents
 	.4byte SootopolisCity_House6_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 309
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..76a198f6e
--- /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, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..a01616419 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House7: @ 8483B5C
-	.4byte SootopolisCity_House7_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House7_MapEvents
 	.4byte SootopolisCity_House7_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 307
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..07c18bae5
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D
+	bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, 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..b89221bac 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_LotadAndSeedotHouse: @ 8483B78
-	.4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes
+	.4byte SootopolisCity_LotadAndSeedotHouse_Layout
 	.4byte SootopolisCity_LotadAndSeedotHouse_MapEvents
 	.4byte SootopolisCity_LotadAndSeedotHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_RUNECITY
 	.2byte 297
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..32fc081d2
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 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..4bdd9ef8d 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -1,15 +1,15 @@
 SootopolisCity_Mart: @ 8483A98
-	.4byte SootopolisCity_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte SootopolisCity_Mart_MapEvents
 	.4byte SootopolisCity_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4eb796671
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 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..be2d37eb6 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_RUNECITY
 	.2byte 439
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..39b3366c5
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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..6635dc3d7 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_RUNECITY
 	.2byte 440
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..4ca22d1f8
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..c66b725fd 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f9e4626ea
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..3a2844f4e 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 14
+	.byte MAPSEC_SOOTOPOLIS_CITY
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..14dc7169b
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 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, BG_EVENT_PLAYER_FACING_ANY, 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..f6153e13f 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -1,15 +1,15 @@
 SouthernIsland_Exterior: @ 8485238
-	.4byte SouthernIsland_Exterior_MapAttributes
+	.4byte SouthernIsland_Exterior_Layout
 	.4byte SouthernIsland_Exterior_MapEvents
 	.4byte SouthernIsland_Exterior_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 290
-	.byte 73
+	.byte MAPSEC_SOUTHERN_ISLAND
 	.byte 0
-	.byte 0
-	.byte 3
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b65134679
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 910
+	object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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, BG_EVENT_PLAYER_FACING_NORTH, 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..e674840cf 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -1,15 +1,15 @@
 SouthernIsland_Interior: @ 8485254
-	.4byte SouthernIsland_Interior_MapAttributes
+	.4byte SouthernIsland_Interior_Layout
 	.4byte SouthernIsland_Interior_MapEvents
 	.4byte SouthernIsland_Interior_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN02
 	.2byte 291
-	.byte 73
+	.byte MAPSEC_SOUTHERN_ISLAND
 	.byte 0
-	.byte 11
-	.byte 3
+	.byte WEATHER_SHADE
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
new file mode 100644
index 000000000..432667cc9
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -0,0 +1,167 @@
+SouthernIsland_Interior_MapScripts:: @ 8242A45
+	map_script 5, SouthernIsland_Interior_MapScript1_242A50
+	map_script 3, SouthernIsland_Interior_MapScript1_242A6E
+	.byte 0
+
+SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, SouthernIsland_Interior_EventScript_242A5A
+	end
+
+SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, SouthernIsland_Interior_EventScript_27374E
+	removeobject 2
+	return
+
+SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E
+	compare VAR_0x40D5, 0
+	call_if 1, SouthernIsland_Interior_EventScript_242A8A
+	compare VAR_0x40D5, 0
+	call_if 5, SouthernIsland_Interior_EventScript_242A95
+	call SouthernIsland_Interior_EventScript_242AA0
+	end
+
+SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A
+	setvar VAR_OBJ_GFX_ID_1, 188
+	setvar VAR_TEMP_4, 408
+	return
+
+SouthernIsland_Interior_EventScript_242A95:: @ 8242A95
+	setvar VAR_OBJ_GFX_ID_1, 187
+	setvar VAR_TEMP_4, 407
+	return
+
+SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0
+	checkplayergender
+	compare VAR_RESULT, 0
+	goto_eq SouthernIsland_Interior_EventScript_242AB8
+	compare VAR_RESULT, 1
+	goto_eq SouthernIsland_Interior_EventScript_242ABE
+	end
+
+SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8
+	setvar VAR_OBJ_GFX_ID_0, 100
+	return
+
+SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE
+	setvar VAR_OBJ_GFX_ID_0, 105
+	return
+
+SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4
+	lockall
+	setvar VAR_0x8008, 12
+	goto SouthernIsland_Interior_EventScript_242AD0
+	end
+
+SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
+	checkflag FLAG_0x002
+	goto_eq SouthernIsland_Interior_EventScript_242B9A
+	checkflag FLAG_0x1C8
+	goto_eq SouthernIsland_Interior_EventScript_242B9A
+	checkflag FLAG_0x1C9
+	goto_eq SouthernIsland_Interior_EventScript_242B9A
+	checkflag FLAG_SYS_HAS_EON_TICKET
+	goto_if 0, SouthernIsland_Interior_EventScript_242B9A
+	setflag FLAG_0x0CE
+	setflag FLAG_0x002
+	special SpawnScriptEventObject
+	applymovement 127, SouthernIsland_Interior_Movement_242BCA
+	waitmovement 0
+	delay 50
+	waitse
+	playmoncry VAR_TEMP_4, 0
+	delay 30
+	waitmoncry
+	addobject 2
+	delay 30
+	applymovement 127, SouthernIsland_Interior_Movement_242BCE
+	applymovement 2, SouthernIsland_Interior_Movement_242BDA
+	waitmovement 0
+	delay 50
+	special RemoveScriptEventObject
+	setvar VAR_LAST_TALKED, 2
+	compare VAR_0x40D5, 0
+	call_if 1, SouthernIsland_Interior_EventScript_242BA4
+	compare VAR_0x40D5, 0
+	call_if 5, SouthernIsland_Interior_EventScript_242BB7
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special BattleSetup_StartLatiBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq SouthernIsland_Interior_EventScript_242B81
+	compare VAR_RESULT, 4
+	goto_eq SouthernIsland_Interior_EventScript_242B8F
+	compare VAR_RESULT, 5
+	goto_eq SouthernIsland_Interior_EventScript_242B8F
+	setflag FLAG_0x1C9
+	releaseall
+	end
+
+SouthernIsland_Interior_EventScript_242B81:: @ 8242B81
+	setflag FLAG_0x1C8
+	copyvar VAR_0x8004, VAR_TEMP_4
+	goto SouthernIsland_Interior_EventScript_273776
+	end
+
+SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F
+	copyvar VAR_0x8004, VAR_TEMP_4
+	goto SouthernIsland_Interior_EventScript_273776
+	end
+
+SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A
+	msgbox SouthernIsland_Interior_Text_2A6AA1, 4
+	releaseall
+	end
+
+SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4
+	setvar VAR_0x8004, 408
+	setvar VAR_0x8005, 50
+	setvar VAR_0x8006, 191
+	special CreateObedientEnemyMon
+	return
+
+SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7
+	setvar VAR_0x8004, 407
+	setvar VAR_0x8005, 50
+	setvar VAR_0x8006, 191
+	special CreateObedientEnemyMon
+	return
+
+SouthernIsland_Interior_Movement_242BCA: @ 8242BCA
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+SouthernIsland_Interior_Movement_242BCE: @ 8242BCE
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	step_end
+
+SouthernIsland_Interior_Movement_242BDA: @ 8242BDA
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	step_end
+
diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc
new file mode 100644
index 000000000..aa23659eb
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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, VAR_TEMP_1, 1, 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..b69a9b501 100644
--- a/data/maps/TerraCave_End/header.inc
+++ b/data/maps/TerraCave_End/header.inc
@@ -1,15 +1,15 @@
 TerraCave_End: @ 8484A3C
-	.4byte TerraCave_End_MapAttributes
+	.4byte TerraCave_End_Layout
 	.4byte TerraCave_End_MapEvents
 	.4byte TerraCave_End_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 409
-	.byte 205
+	.byte MAPSEC_TERRA_CAVE
 	.byte 0
-	.byte 6
-	.byte 4
+	.byte WEATHER_FOG_1
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 14
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
new file mode 100644
index 000000000..5152f85cf
--- /dev/null
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -0,0 +1,78 @@
+TerraCave_End_MapScripts:: @ 823B0B0
+	map_script 5, TerraCave_End_MapScript1_23B0BB
+	map_script 3, TerraCave_End_MapScript1_23B0D9
+	.byte 0
+
+TerraCave_End_MapScript1_23B0BB: @ 823B0BB
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
+	call_if 1, TerraCave_End_EventScript_23B0C5
+	end
+
+TerraCave_End_EventScript_23B0C5:: @ 823B0C5
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 7
+	goto_if 5, TerraCave_End_EventScript_27374E
+	removeobject 1
+	return
+
+TerraCave_End_MapScript1_23B0D9: @ 823B0D9
+	checkflag FLAG_0x1BF
+	call_if 0, TerraCave_End_EventScript_23B0E3
+	end
+
+TerraCave_End_EventScript_23B0E3:: @ 823B0E3
+	clearflag FLAG_0x30F
+	setvar VAR_TEMP_1, 1
+	return
+
+TerraCave_End_EventScript_23B0EC:: @ 823B0EC
+	lockall
+	applymovement 255, TerraCave_End_Movement_2725B2
+	waitmovement 0
+	applymovement 1, TerraCave_End_Movement_23B16E
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_GROUDON, 2
+	delay 40
+	waitmoncry
+	setvar VAR_LAST_TALKED, 1
+	setwildbattle SPECIES_GROUDON, 70, ITEM_NONE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special BattleSetup_StartLegendaryBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	setvar VAR_TEMP_1, 0
+	specialvar VAR_RESULT, sub_8138B80
+	compare VAR_RESULT, 1
+	goto_eq TerraCave_End_EventScript_23B155
+	compare VAR_RESULT, 4
+	goto_eq TerraCave_End_EventScript_23B163
+	compare VAR_RESULT, 5
+	goto_eq TerraCave_End_EventScript_23B163
+	setvar VAR_0x4039, 1
+	setflag FLAG_0x1BF
+	releaseall
+	end
+
+TerraCave_End_EventScript_23B155:: @ 823B155
+	setvar VAR_0x4039, 1
+	setflag FLAG_0x1BF
+	goto TerraCave_End_EventScript_27376D
+	end
+
+TerraCave_End_EventScript_23B163:: @ 823B163
+	setvar VAR_0x8004, 405
+	goto TerraCave_End_EventScript_273776
+	end
+
+TerraCave_End_Movement_23B16E: @ 823B16E
+	init_affine_anim
+	walk_down_start_affine
+	delay_16
+	delay_16
+	walk_down_affine
+	delay_16
+	delay_16
+	walk_down_affine
+	step_end
+
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..88ef9d3ef 100644
--- a/data/maps/TerraCave_Entrance/header.inc
+++ b/data/maps/TerraCave_Entrance/header.inc
@@ -1,15 +1,15 @@
 TerraCave_Entrance: @ 8484A20
-	.4byte TerraCave_Entrance_MapAttributes
+	.4byte TerraCave_Entrance_Layout
 	.4byte TerraCave_Entrance_MapEvents
 	.4byte TerraCave_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 408
-	.byte 205
+	.byte MAPSEC_TERRA_CAVE
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e1f2e2bea
--- /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, MOVEMENT_TYPE_FACE_LEFT, 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, VAR_TEMP_0, 0, gUnknown_082773F5
+	coord_event 7, 5, 3, VAR_TEMP_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..947cdbde2 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -1,15 +1,15 @@
 TradeCenter: @ 8484D4C
-	.4byte TradeCenter_MapAttributes
+	.4byte TradeCenter_Layout
 	.4byte TradeCenter_MapEvents
 	.4byte TradeCenter_MapScripts
 	.4byte 0x0
 	.2byte MUS_RAINBOW
 	.2byte 222
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..b21e67e69 100644
--- a/data/maps/TrainerHill_1F/header.inc
+++ b/data/maps/TrainerHill_1F/header.inc
@@ -1,15 +1,15 @@
 TrainerHill_1F: @ 84857E8
-	.4byte TrainerHill_1F_MapAttributes
+	.4byte TrainerHill_1F_Layout
 	.4byte TrainerHill_1F_MapEvents
 	.4byte TrainerHill_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 415
-	.byte 212
+	.byte MAPSEC_TRAINER_HILL
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e2a02834e 100644
--- a/data/maps/TrainerHill_2F/header.inc
+++ b/data/maps/TrainerHill_2F/header.inc
@@ -1,15 +1,15 @@
 TrainerHill_2F: @ 8485804
-	.4byte TrainerHill_2F_MapAttributes
+	.4byte TrainerHill_2F_Layout
 	.4byte TrainerHill_2F_MapEvents
 	.4byte TrainerHill_2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 416
-	.byte 212
+	.byte MAPSEC_TRAINER_HILL
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c7513cc96 100644
--- a/data/maps/TrainerHill_3F/header.inc
+++ b/data/maps/TrainerHill_3F/header.inc
@@ -1,15 +1,15 @@
 TrainerHill_3F: @ 8485820
-	.4byte TrainerHill_3F_MapAttributes
+	.4byte TrainerHill_3F_Layout
 	.4byte TrainerHill_3F_MapEvents
 	.4byte TrainerHill_3F_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 417
-	.byte 212
+	.byte MAPSEC_TRAINER_HILL
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f25ce4e97 100644
--- a/data/maps/TrainerHill_4F/header.inc
+++ b/data/maps/TrainerHill_4F/header.inc
@@ -1,15 +1,15 @@
 TrainerHill_4F: @ 848583C
-	.4byte TrainerHill_4F_MapAttributes
+	.4byte TrainerHill_4F_Layout
 	.4byte TrainerHill_4F_MapEvents
 	.4byte TrainerHill_4F_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 418
-	.byte 212
+	.byte MAPSEC_TRAINER_HILL
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0125c9936
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..0d4e95af3 100644
--- a/data/maps/TrainerHill_Elevator/header.inc
+++ b/data/maps/TrainerHill_Elevator/header.inc
@@ -1,15 +1,15 @@
 TrainerHill_Elevator: @ 8485ADC
-	.4byte TrainerHill_Elevator_MapAttributes
+	.4byte BattleElevator_Layout
 	.4byte TrainerHill_Elevator_MapEvents
 	.4byte TrainerHill_Elevator_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 266
-	.byte 212
+	.byte MAPSEC_TRAINER_HILL
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ae11a879e
--- /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, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0
+	object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 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, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229
+
+TrainerHill_Entrance_MapBGEvents: @ 853D914
+	bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, 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..8e8eb4b91 100644
--- a/data/maps/TrainerHill_Entrance/header.inc
+++ b/data/maps/TrainerHill_Entrance/header.inc
@@ -1,15 +1,15 @@
 TrainerHill_Entrance: @ 84857CC
-	.4byte TrainerHill_Entrance_MapAttributes
+	.4byte TrainerHill_Entrance_Layout
 	.4byte TrainerHill_Entrance_MapEvents
 	.4byte TrainerHill_Entrance_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 414
-	.byte 212
+	.byte MAPSEC_TRAINER_HILL
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
new file mode 100644
index 000000000..84543ff2b
--- /dev/null
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -0,0 +1,476 @@
+TrainerHill_Entrance_MapScripts:: @ 82680AC
+	map_script 5, TrainerHill_Entrance_MapScript1_2680D0
+	map_script 7, TrainerHill_Entrance_MapScript1_26811B
+	map_script 3, TrainerHill_Entrance_MapScript1_2680C6
+	map_script 1, TrainerHill_Entrance_MapScript1_268128
+	map_script 2, TrainerHill_Entrance_MapScript2_26813E
+	.byte 0
+
+TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6
+	setflag FLAG_LANDMARK_TRAINER_HILL
+	getplayerxy VAR_TEMP_D, VAR_RESULT
+	end
+
+TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
+	end
+
+TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
+	setvar VAR_0x8004, 4
+	special sp194_trainer_tower
+	setvar VAR_TEMP_0, 0
+	setvar VAR_0x8004, 9
+	special sp194_trainer_tower
+	compare VAR_RESULT, 0
+	goto_eq TrainerHill_Entrance_EventScript_2680FF
+	setobjectxy 255, 9, 6
+	applymovement 255, TrainerHill_Entrance_Movement_26837F
+	end
+
+TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
+	setvar VAR_0x8004, 16
+	special sp194_trainer_tower
+	compare VAR_RESULT, 1
+	goto_eq TrainerHill_Entrance_EventScript_26811A
+	applymovement 255, TrainerHill_Entrance_Movement_26837F
+	end
+
+TrainerHill_Entrance_EventScript_26811A:: @ 826811A
+	end
+
+TrainerHill_Entrance_MapScript1_26811B: @ 826811B
+	addobject 2
+	addobject 1
+	addobject 5
+	addobject 4
+	end
+
+TrainerHill_Entrance_MapScript1_268128: @ 8268128
+	compare VAR_TEMP_D, 17
+	call_if 1, TrainerHill_Entrance_EventScript_268134
+	end
+
+TrainerHill_Entrance_EventScript_268134:: @ 8268134
+	setmetatile 17, 10, 775, 0
+	return
+
+TrainerHill_Entrance_MapScript2_26813E: @ 826813E
+	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182
+	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160
+	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229
+	map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF
+	.2byte 0
+
+TrainerHill_Entrance_EventScript_268160:: @ 8268160
+	lockall
+	applymovement 255, TrainerHill_Entrance_Movement_268385
+	waitmovement 0
+	setmetatile 17, 10, 820, 1
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	waitse
+	setvar VAR_TEMP_D, 0
+	releaseall
+	end
+
+TrainerHill_Entrance_EventScript_268182:: @ 8268182
+	setvar VAR_TEMP_0, 1
+	setvar VAR_0x8004, 6
+	special sp194_trainer_tower
+	switch VAR_RESULT
+	case 0, TrainerHill_Entrance_EventScript_2681B5
+	case 1, TrainerHill_Entrance_EventScript_2681CA
+	case 2, TrainerHill_Entrance_EventScript_2681EE
+
+TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5
+	lockall
+	applymovement 255, TrainerHill_Entrance_Movement_26837F
+	msgbox TrainerHill_Entrance_Text_268689, 4
+	goto TrainerHill_Entrance_EventScript_2681DA
+
+TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA
+	lockall
+	applymovement 255, TrainerHill_Entrance_Movement_26837F
+	msgbox TrainerHill_Entrance_Text_268712, 4
+
+TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
+	closemessage
+	applymovement 255, TrainerHill_Entrance_Movement_268381
+	waitmovement 0
+	setvar VAR_0x40D6, 0
+	special HealPlayerParty
+	releaseall
+
+TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE
+	end
+
+TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
+	setvar VAR_0x800B, 2
+	call TrainerHill_Entrance_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
+	lock
+	faceplayer
+	setvar VAR_0x8004, 10
+	special sp194_trainer_tower
+	compare VAR_RESULT, 0
+	goto_eq TrainerHill_Entrance_EventScript_26821F
+	msgbox TrainerHill_Entrance_Text_2686F4, 4
+	goto TrainerHill_Entrance_EventScript_268227
+
+TrainerHill_Entrance_EventScript_26821F:: @ 826821F
+	msgbox TrainerHill_Entrance_Text_2687AC, 4
+
+TrainerHill_Entrance_EventScript_268227:: @ 8268227
+	release
+	end
+
+TrainerHill_Entrance_EventScript_268229:: @ 8268229
+	lockall
+	applymovement 255, TrainerHill_Entrance_Movement_26837F
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_if 0, TrainerHill_Entrance_EventScript_26836A
+	msgbox TrainerHill_Entrance_Text_2684C6, 4
+	setvar VAR_0x8004, 13
+	special sp194_trainer_tower
+	compare VAR_RESULT, 0
+	call_if 1, TrainerHill_Entrance_EventScript_26832E
+	setvar VAR_0x8004, 8
+	special sp194_trainer_tower
+	compare VAR_RESULT, 1
+	goto_eq TrainerHill_Entrance_EventScript_268275
+	msgbox TrainerHill_Entrance_Text_268564, 4
+	goto TrainerHill_Entrance_EventScript_26827D
+
+TrainerHill_Entrance_EventScript_268275:: @ 8268275
+	msgbox TrainerHill_Entrance_Text_26859E, 4
+
+TrainerHill_Entrance_EventScript_26827D:: @ 826827D
+	message TrainerHill_Entrance_Text_2685F8
+	waitmessage
+	multichoice 15, 6, 17, 0
+	switch VAR_RESULT
+	case 0, TrainerHill_Entrance_EventScript_2682C8
+	case 1, TrainerHill_Entrance_EventScript_268314
+	case 2, TrainerHill_Entrance_EventScript_2682BA
+	case 127, TrainerHill_Entrance_EventScript_268314
+	end
+
+TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA
+	msgbox TrainerHill_Entrance_Text_2687C3, 4
+	goto TrainerHill_Entrance_EventScript_26827D
+	end
+
+TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
+	multichoice 13, 2, 113, 0
+	switch VAR_RESULT
+	case 4, TrainerHill_Entrance_EventScript_268314
+	case 127, TrainerHill_Entrance_EventScript_268314
+	setvar VAR_0x8004, 17
+	copyvar VAR_0x8005, VAR_RESULT
+	special sp194_trainer_tower
+	setvar VAR_0x40D6, 1
+	setvar VAR_TEMP_5, 0
+	special HealPlayerParty
+	msgbox TrainerHill_Entrance_Text_26862A, 4
+	setvar VAR_0x8004, 0
+	special sp194_trainer_tower
+	releaseall
+	end
+
+TrainerHill_Entrance_EventScript_268314:: @ 8268314
+	setvar VAR_TEMP_5, 0
+	msgbox TrainerHill_Entrance_Text_26866F, 4
+	closemessage
+	applymovement 255, TrainerHill_Entrance_Movement_268381
+	waitmovement 0
+	releaseall
+	end
+
+TrainerHill_Entrance_EventScript_26832E:: @ 826832E
+	msgbox TrainerHill_Entrance_Text_26851C, 4
+	setvar VAR_0x8004, 14
+	special sp194_trainer_tower
+	setvar VAR_TEMP_5, 1
+	call TrainerHill_Entrance_EventScript_27134F
+	compare VAR_RESULT, 0
+	goto_eq TrainerHill_Entrance_EventScript_26835C
+	setvar VAR_0x8004, 14
+	special sp194_trainer_tower
+	return
+
+TrainerHill_Entrance_EventScript_26835C:: @ 826835C
+	setvar VAR_0x8004, 15
+	special sp194_trainer_tower
+	goto TrainerHill_Entrance_EventScript_268314
+	end
+
+TrainerHill_Entrance_EventScript_26836A:: @ 826836A
+	msgbox TrainerHill_Entrance_Text_268430, 4
+	closemessage
+	applymovement 255, TrainerHill_Entrance_Movement_268381
+	waitmovement 0
+	releaseall
+	end
+
+TrainerHill_Entrance_Movement_26837F: @ 826837F
+	face_right
+	step_end
+
+TrainerHill_Entrance_Movement_268381: @ 8268381
+	walk_down
+	step_end
+
+TrainerHill_Entrance_Movement_268383: @ 8268383
+	face_up
+	step_end
+
+TrainerHill_Entrance_Movement_268385: @ 8268385
+	walk_down
+	walk_down
+	step_end
+
+TrainerHill_Entrance_EventScript_268388:: @ 8268388
+	lockall
+	fadescreen 1
+	special ShowTrainerHillRecords
+	waitstate
+	releaseall
+	end
+
+TrainerHill_Entrance_EventScript_268391:: @ 8268391
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_if 0, TrainerHill_Entrance_EventScript_2683A3
+	msgbox TrainerHill_Entrance_Text_268D5A, 2
+	end
+
+TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3
+	msgbox TrainerHill_Entrance_Text_268DDA, 2
+	end
+
+TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_if 0, TrainerHill_Entrance_EventScript_2683BE
+	msgbox TrainerHill_Entrance_Text_268E6A, 2
+	end
+
+TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE
+	msgbox TrainerHill_Entrance_Text_268EDC, 2
+	end
+
+TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7
+	lock
+	faceplayer
+	message gUnknown_08272A21
+	waitmessage
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq TrainerHill_Entrance_EventScript_268402
+	pokemart TrainerHill_Entrance_Pokemart_2683E8
+	msgbox gUnknown_08272A3F, 4
+	release
+	end
+
+	.align 2
+TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
+	.2byte ITEM_SUPER_POTION
+	.2byte ITEM_ANTIDOTE
+	.2byte ITEM_PARALYZE_HEAL
+	.2byte ITEM_AWAKENING
+	.2byte ITEM_X_SPEED
+	.2byte ITEM_X_SPECIAL
+	.2byte ITEM_X_ATTACK
+	.2byte ITEM_X_DEFEND
+	.2byte ITEM_DIRE_HIT
+	.2byte ITEM_GUARD_SPEC
+	.2byte ITEM_X_ACCURACY
+	.2byte ITEM_NONE
+	release
+	end
+
+TrainerHill_Entrance_EventScript_268402:: @ 8268402
+	pokemart TrainerHill_Entrance_Pokemart_268414
+	msgbox gUnknown_08272A3F, 4
+	release
+	end
+
+	.align 2
+TrainerHill_Entrance_Pokemart_268414: @ 8268414
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_REVIVE
+	.2byte ITEM_X_SPEED
+	.2byte ITEM_X_SPECIAL
+	.2byte ITEM_X_ATTACK
+	.2byte ITEM_X_DEFEND
+	.2byte ITEM_DIRE_HIT
+	.2byte ITEM_GUARD_SPEC
+	.2byte ITEM_X_ACCURACY
+	.2byte ITEM_NONE
+	release
+	end
+
+TrainerHill_Entrance_Text_268430: @ 8268430
+	.string "This is the TRAINER HILL where\n"
+	.string "you may enjoy tag battles with many\l"
+	.string "TRAINERS.\p"
+	.string "Unfortunately, we’re still getting\n"
+	.string "things ready. Please come back later!$"
+
+TrainerHill_Entrance_Text_2684C6: @ 82684C6
+	.string "Welcome!\p"
+	.string "This is the TRAINER HILL where\n"
+	.string "you may enjoy tag battles with many\l"
+	.string "TRAINERS!$"
+
+TrainerHill_Entrance_Text_26851C: @ 826851C
+	.string "Is this your first visit here?\p"
+	.string "Before you enter, please save\n"
+	.string "your game.$"
+
+TrainerHill_Entrance_Text_268564: @ 8268564
+	.string "Let’s see…\n"
+	.string "The TRAINERS here now are…\p"
+	.string "Up to floor no. {STR_VAR_1}.$"
+
+TrainerHill_Entrance_Text_26859E: @ 826859E
+	.string "Let’s see…\n"
+	.string "The TRAINERS here now are…\p"
+	.string "There appear to be TRAINERS gathered\n"
+	.string "in every room.$"
+
+TrainerHill_Entrance_Text_2685F8: @ 82685F8
+	.string "Would you like to challenge the\n"
+	.string "waiting TRAINERS?$"
+
+TrainerHill_Entrance_Text_26862A: @ 826862A
+	.string "I will time your progress.\n"
+	.string "Best of luck!\p"
+	.string "On your marks…\p"
+	.string "Get set…\p"
+	.string "Go!$"
+
+TrainerHill_Entrance_Text_26866F: @ 826866F
+	.string "Please do visit us again!$"
+
+TrainerHill_Entrance_Text_268689: @ 8268689
+	.string "That was too bad.\p"
+	.string "I think you put in a tremendous\n"
+	.string "effort in your battling.\p"
+	.string "Please come back and try again!$"
+
+TrainerHill_Entrance_Text_2686F4: @ 82686F4
+	.string "I hope you give it your best.$"
+
+TrainerHill_Entrance_Text_268712: @ 8268712
+	.string "When the TRAINERS switch places,\n"
+	.string "the movement can be hectic.\p"
+	.string "To avoid the stampede, we moved\n"
+	.string "the reception counter here.\p"
+	.string "I’m sorry for the inconvenience.$"
+
+TrainerHill_Entrance_Text_2687AC: @ 82687AC
+	.string "Thank you for playing!$"
+
+TrainerHill_Entrance_Text_2687C3: @ 82687C3
+	.string "Here at the TRAINER HILL, we conduct\n"
+	.string "an event called the Time Attack.\p"
+	.string "It is a race that measures how long\n"
+	.string "you take to reach our owner on\l"
+	.string "the rooftop from this counter.\p"
+	.string "The fastest times are posted on\n"
+	.string "the Time Board--try competing with\l"
+	.string "your friends.\p"
+	.string "In TRAINER battles along the way,\n"
+	.string "neither Exp. Points nor money will\l"
+	.string "be awarded.$"
+
+TrainerHill_Entrance_Text_26890D: @ 826890D
+	.string "Oh, I’m sorry, but you appear to have\n"
+	.string "only one POKéMON with you.\p"
+	.string "You will need at least two POKéMON\n"
+	.string "to enter this event.$"
+
+TrainerHill_Roof_Text_268986: @ 8268986
+	.string "Hm! Hm!\p"
+	.string "You finally came!\n"
+	.string "Yes, you have arrived!\p"
+	.string "Wait! Don’t say it!\n"
+	.string "I know why you came all the way\l"
+	.string "here by yourself!\p"
+	.string "You wanted to see me, the owner\n"
+	.string "of the TRAINER HILL, because…\p"
+	.string "You want to form a tag team with me!\n"
+	.string "Wa-hoo!\p"
+	.string "…Uh?\n"
+	.string "That’s not it?\p"
+	.string "Anyway, I watched you on your way up.\n"
+	.string "Marvelous battling! Bravo, indeed!$"
+
+TrainerHill_Roof_Text_268AC5: @ 8268AC5
+	.string "For a marvelous someone like you,\n"
+	.string "I have the most marvelous gift!$"
+
+TrainerHill_Roof_Text_268B07: @ 8268B07
+	.string "Oh, no, full up with things!\n"
+	.string "You’ll be back later for this!$"
+
+TrainerHill_Roof_Text_268B43: @ 8268B43
+	.string "Oh, hold on here! Did you possibly get\n"
+	.string "here marvelously quickly?\p"
+	.string "How splendid! You needn’t have\n"
+	.string "hurried so to see me!\p"
+	.string "That is so delightful. I’ll have the Time\n"
+	.string "Board at the reception updated!$"
+
+TrainerHill_Roof_Text_268C03: @ 8268C03
+	.string "But, oh…\n"
+	.string "You weren’t very quick getting here.$"
+
+TrainerHill_Roof_Text_268C31: @ 8268C31
+	.string "Perhaps it would please me more if you\n"
+	.string "arrived zippier next time.\p"
+	.string "Then, I should be pleased to form\n"
+	.string "a tag team with you!\p"
+	.string "Until we meet again, amigo!$"
+
+TrainerHill_Roof_Text_268CC6: @ 8268CC6
+	.string "I had the TRAINER HILL built for but\n"
+	.string "one reason and one only!\p"
+	.string "To find the most suitable partner\n"
+	.string "with whom I may form a tag team!$"
+
+TrainerHill_Entrance_Text_268D47: @ 8268D47
+	.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
+
+TrainerHill_Entrance_Text_268D5A: @ 8268D5A
+	.string "Who knows what sort of TRAINERS\n"
+	.string "and POKéMON combos are ahead?\p"
+	.string "All I know is that I’ll knock aside\n"
+	.string "anyone that stands in my way!$"
+
+TrainerHill_Entrance_Text_268DDA: @ 8268DDA
+	.string "I heard tough TRAINERS come to this\n"
+	.string "TRAINER HILL from all over.\p"
+	.string "I can’t wait to test the waters!\p"
+	.string "I’ll knock aside anyone that stands\n"
+	.string "in my way!$"
+
+TrainerHill_Entrance_Text_268E6A: @ 8268E6A
+	.string "Do you see the Time Board over there?\p"
+	.string "My friends and I are trying to see who\n"
+	.string "can reach the top in the least time.$"
+
+TrainerHill_Entrance_Text_268EDC: @ 8268EDC
+	.string "Do you know when they’re opening\n"
+	.string "this place up?\p"
+	.string "I’m waiting here to be the first\n"
+	.string "challenger ever!$"
+
+TrainerHill_Elevator_Text_268F3E: @ 8268F3E
+	.string "Would you like to return to\n"
+	.string "the reception counter?$"
diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc
new file mode 100644
index 000000000..eeab57317
--- /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, MOVEMENT_TYPE_FACE_DOWN, 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..d4d431dc5 100644
--- a/data/maps/TrainerHill_Roof/header.inc
+++ b/data/maps/TrainerHill_Roof/header.inc
@@ -1,15 +1,15 @@
 TrainerHill_Roof: @ 8485858
-	.4byte TrainerHill_Roof_MapAttributes
+	.4byte TrainerHill_Roof_Layout
 	.4byte TrainerHill_Roof_MapEvents
 	.4byte TrainerHill_Roof_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 419
-	.byte 212
+	.byte MAPSEC_TRAINER_HILL
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 4
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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/Underwater1/events.inc b/data/maps/Underwater1/events.inc
new file mode 100644
index 000000000..102a5f6e7
--- /dev/null
+++ b/data/maps/Underwater1/events.inc
@@ -0,0 +1,12 @@
+Underwater1_MapBGEvents: @ 852CEB4
+	bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, 8
+	bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, 9
+	bg_hidden_item_event 66, 34, 3, ITEM_PEARL, 10
+	bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, 11
+	bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, 13
+	bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, 36
+	bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, 38
+
+Underwater1_MapEvents:: @ 852CF08
+	map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents
+
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index 2c7de8477..bf5589117 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -1,15 +1,15 @@
 Underwater1: @ 8482A30
-	.4byte Underwater1_MapAttributes
+	.4byte Underwater1_Layout
 	.4byte Underwater1_MapEvents
 	.4byte Underwater1_MapScripts
 	.4byte Underwater1_MapConnections
 	.2byte MUS_DEEPDEEP
 	.2byte 274
-	.byte 50
+	.byte MAPSEC_UNDERWATER_124
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..ca98f25ac
--- /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_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, 14
+	bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, 15
+	bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, 16
+	bg_hidden_item_event 10, 36, 3, ITEM_PEARL, 17
+	bg_hidden_item_event 11, 39, 3, ITEM_IRON, 19
+	bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, 18
+	bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, 20
+	bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, 12
+
+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..5bd5b037b 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -1,15 +1,15 @@
 Underwater2: @ 8482A4C
-	.4byte Underwater2_MapAttributes
+	.4byte Underwater2_Layout
 	.4byte Underwater2_MapEvents
 	.4byte Underwater2_MapScripts
 	.4byte Underwater2_MapConnections
 	.2byte MUS_DEEPDEEP
 	.2byte 51
-	.byte 51
+	.byte MAPSEC_UNDERWATER_125
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..0a5dc773d
--- /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_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, 21
+	bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, 22
+	bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, 23
+	bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, 24
+
+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..064a732a5 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -1,15 +1,15 @@
 Underwater3: @ 8482A68
-	.4byte Underwater3_MapAttributes
+	.4byte Underwater3_Layout
 	.4byte Underwater3_MapEvents
 	.4byte Underwater3_MapScripts
 	.4byte Underwater3_MapConnections
 	.2byte MUS_DEEPDEEP
 	.2byte 52
-	.byte 52
+	.byte MAPSEC_UNDERWATER_126
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7799e0ad6
--- /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_hidden_item_event 38, 19, 3, ITEM_PROTEIN, 25
+	bg_hidden_item_event 69, 18, 3, ITEM_PEARL, 26
+
+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..7752479de 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -1,15 +1,15 @@
 Underwater4: @ 8482A84
-	.4byte Underwater4_MapAttributes
+	.4byte Underwater4_Layout
 	.4byte Underwater4_MapEvents
 	.4byte Underwater4_MapScripts
 	.4byte Underwater4_MapConnections
 	.2byte MUS_DEEPDEEP
 	.2byte 53
-	.byte 53
+	.byte MAPSEC_UNDERWATER_127
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..dda2f54b1 100644
--- a/data/maps/Underwater5/header.inc
+++ b/data/maps/Underwater5/header.inc
@@ -1,15 +1,15 @@
 Underwater5: @ 8482AA0
-	.4byte Underwater5_MapAttributes
+	.4byte Underwater5_Layout
 	.4byte Underwater5_MapEvents
 	.4byte Underwater5_MapScripts
 	.4byte Underwater5_MapConnections
 	.2byte MUS_DEEPDEEP
 	.2byte 412
-	.byte 208
+	.byte MAPSEC_UNDERWATER_129
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..17769c331 100644
--- a/data/maps/Underwater6/header.inc
+++ b/data/maps/Underwater6/header.inc
@@ -1,15 +1,15 @@
 Underwater6: @ 8482ABC
-	.4byte Underwater6_MapAttributes
+	.4byte Underwater6_Layout
 	.4byte Underwater6_MapEvents
 	.4byte Underwater6_MapScripts
 	.4byte Underwater6_MapConnections
 	.2byte MUS_DEEPDEEP
 	.2byte 410
-	.byte 206
+	.byte MAPSEC_UNDERWATER_TERRA_CAVE
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f5bc3bfa3 100644
--- a/data/maps/Underwater7/header.inc
+++ b/data/maps/Underwater7/header.inc
@@ -1,15 +1,15 @@
 Underwater7: @ 8482AD8
-	.4byte Underwater7_MapAttributes
+	.4byte Underwater7_Layout
 	.4byte Underwater7_MapEvents
 	.4byte Underwater7_MapScripts
 	.4byte Underwater7_MapConnections
 	.2byte MUS_DEEPDEEP
 	.2byte 411
-	.byte 207
+	.byte MAPSEC_UNDERWATER_UNK1
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..7232ba916 100644
--- a/data/maps/Underwater_MarineCave/header.inc
+++ b/data/maps/Underwater_MarineCave/header.inc
@@ -1,15 +1,15 @@
 Underwater_MarineCave: @ 84849CC
-	.4byte Underwater_MarineCave_MapAttributes
+	.4byte Underwater_MarineCave_Layout
 	.4byte Underwater_MarineCave_MapEvents
 	.4byte Underwater_MarineCave_MapScripts
 	.4byte 0x0
 	.2byte MUS_DAN01
 	.2byte 406
-	.byte 204
+	.byte MAPSEC_UNDERWATER_MARINE_CAVE
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..71332ec78 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -1,15 +1,15 @@
 Underwater_Route134: @ 848464C
-	.4byte Underwater_Route134_MapAttributes
+	.4byte Underwater_Route134_Layout
 	.4byte Underwater_Route134_MapEvents
 	.4byte Underwater_Route134_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
 	.2byte 282
-	.byte 79
+	.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fbad57bc8
--- /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, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 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..bc2efc58e 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -1,15 +1,15 @@
 Underwater_SeafloorCavern: @ 8484198
-	.4byte Underwater_SeafloorCavern_MapAttributes
+	.4byte Underwater_SeafloorCavern_Layout
 	.4byte Underwater_SeafloorCavern_MapEvents
 	.4byte Underwater_SeafloorCavern_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
 	.2byte 146
-	.byte 69
+	.byte MAPSEC_UNDERWATER_128
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e0bb19642
--- /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, BG_EVENT_PLAYER_FACING_ANY, 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..0c6e94575 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -1,15 +1,15 @@
 Underwater_SealedChamber: @ 8484668
-	.4byte Underwater_SealedChamber_MapAttributes
+	.4byte Underwater_SealedChamber_Layout
 	.4byte Underwater_SealedChamber_MapEvents
 	.4byte Underwater_SealedChamber_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
 	.2byte 283
-	.byte 79
+	.byte MAPSEC_UNDERWATER_SEALED_CHAMBER
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c4f55b1ef 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -1,15 +1,15 @@
 Underwater_SootopolisCity: @ 8483F4C
-	.4byte Underwater_SootopolisCity_MapAttributes
+	.4byte Underwater_SootopolisCity_Layout
 	.4byte Underwater_SootopolisCity_MapEvents
 	.4byte Underwater_SootopolisCity_MapScripts
 	.4byte 0x0
 	.2byte MUS_DEEPDEEP
 	.2byte 130
-	.byte 54
+	.byte MAPSEC_UNDERWATER_SOOTOPOLIS
 	.byte 0
-	.byte 14
-	.byte 5
+	.byte WEATHER_BUBBLES
+	.byte MAP_TYPE_UNDERWATER
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3396b5b8b
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0
+	object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706
+	object_event 3, 247, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710
+	object_event 4, 246, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709
+	object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707
+	object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704
+	object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 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..29608287d 100644
--- a/data/maps/UnionRoom/header.inc
+++ b/data/maps/UnionRoom/header.inc
@@ -1,15 +1,15 @@
 UnionRoom: @ 8485120
-	.4byte UnionRoom_MapAttributes
+	.4byte UnionRoom_Layout
 	.4byte UnionRoom_MapEvents
 	.4byte UnionRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_RAINBOW
 	.2byte 393
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 8
+	.byte MAP_BATTLE_SCENE_FRONTIER
 
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..3241622ac 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_NIBI
 	.2byte 226
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c1188df54 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_NIBI
 	.2byte 227
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..68eb31bc6 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_NIBI
 	.2byte 228
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c8d16cd09 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_NIBI
 	.2byte 229
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..45f9543df 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_NIBI
 	.2byte 230
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc
new file mode 100644
index 000000000..975f08470
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/events.inc
@@ -0,0 +1,3 @@
+UnknownMap_25_34_MapEvents:: @ 853A064
+	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
index d37b7ceaa..0b612b27c 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_NIBI
 	.2byte 231
-	.byte 87
+	.byte MAPSEC_DYNAMIC
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..f87467d19
--- /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, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 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, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A
+	bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9
+	bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73
+	bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5E2
+	bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A
+	bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73
+	bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB
+	bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, 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..e07566710 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown: @ 8482640
-	.4byte VerdanturfTown_MapAttributes
+	.4byte VerdanturfTown_Layout
 	.4byte VerdanturfTown_MapEvents
 	.4byte VerdanturfTown_MapScripts
 	.4byte VerdanturfTown_MapConnections
 	.2byte MUS_GOMACHI0
 	.2byte 15
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..616c0db5e
--- /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, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 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..30daf14ca 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown_BattleTentBattleRoom: @ 8482E90
-	.4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes
+	.4byte VerdanturfTown_BattleTentBattleRoom_Layout
 	.4byte VerdanturfTown_BattleTentBattleRoom_MapEvents
 	.4byte VerdanturfTown_BattleTentBattleRoom_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 387
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..c66173836
--- /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, MOVEMENT_TYPE_FACE_UP, 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..e75e2f003 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown_BattleTentCorridor: @ 8482E74
-	.4byte VerdanturfTown_BattleTentCorridor_MapAttributes
+	.4byte BattleTentCorridor_Layout
 	.4byte VerdanturfTown_BattleTentCorridor_MapEvents
 	.4byte VerdanturfTown_BattleTentCorridor_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 385
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..1c4bafba9
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0
+	object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 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, BG_EVENT_PLAYER_FACING_ANY, 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..5852d60f4 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown_BattleTentLobby: @ 8482E58
-	.4byte VerdanturfTown_BattleTentLobby_MapAttributes
+	.4byte BattleTentLobby_Layout
 	.4byte VerdanturfTown_BattleTentLobby_MapEvents
 	.4byte VerdanturfTown_BattleTentLobby_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 384
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..fa3e09561
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0
+	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..dfb4b0d05 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown_FriendshipRatersHouse: @ 8482F1C
-	.4byte VerdanturfTown_FriendshipRatersHouse_MapAttributes
+	.4byte House2_Layout
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOMACHI0
 	.2byte 60
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5de382052
--- /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, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 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..7f223d09a 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown_House: @ 8482F38
-	.4byte VerdanturfTown_House_MapAttributes
+	.4byte House1_Layout
 	.4byte VerdanturfTown_House_MapEvents
 	.4byte VerdanturfTown_House_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOMACHI0
 	.2byte 59
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..5bdbce786
--- /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, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 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..4846b25e3 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown_Mart: @ 8482EAC
-	.4byte VerdanturfTown_Mart_MapAttributes
+	.4byte Mart_Layout
 	.4byte VerdanturfTown_Mart_MapEvents
 	.4byte VerdanturfTown_Mart_MapScripts
 	.4byte 0x0
 	.2byte MUS_FRIENDLY
 	.2byte 63
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3faee7bda
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 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..9ae2edb7f 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..6aa0d681a
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 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..a2a5a929e 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -1,15 +1,15 @@
 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
 	.2byte MUS_POKECEN
 	.2byte 62
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..e55967bd7
--- /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, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 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..1887b7880 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -1,15 +1,15 @@
 VerdanturfTown_WandasHouse: @ 8482F00
-	.4byte VerdanturfTown_WandasHouse_MapAttributes
+	.4byte VerdanturfTown_WandasHouse_Layout
 	.4byte VerdanturfTown_WandasHouse_MapEvents
 	.4byte VerdanturfTown_WandasHouse_MapScripts
 	.4byte 0x0
 	.2byte MUS_GOMACHI0
 	.2byte 76
-	.byte 5
+	.byte MAPSEC_VERDANTURF_TOWN
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..3df6ff6b0
--- /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, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0
+	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, 1084
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, 1085
+	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, 751
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 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, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF
+	coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8
+
+VictoryRoad_1F_MapBGEvents: @ 8535F24
+	bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, 81
+
+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..56b800a29 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -1,15 +1,15 @@
 VictoryRoad_1F: @ 8484374
-	.4byte VictoryRoad_1F_MapAttributes
+	.4byte VictoryRoad_1F_Layout
 	.4byte VictoryRoad_1F_MapEvents
 	.4byte VictoryRoad_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 163
-	.byte 70
+	.byte MAPSEC_VICTORY_ROAD
 	.byte 0
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
new file mode 100644
index 000000000..2ed1c6baf
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -0,0 +1,220 @@
+VictoryRoad_1F_MapScripts:: @ 8235D7A
+	map_script 3, VictoryRoad_1F_MapScript1_235D80
+	.byte 0
+
+VictoryRoad_1F_MapScript1_235D80: @ 8235D80
+	compare VAR_0x40C3, 1
+	call_if 1, VictoryRoad_1F_EventScript_235D97
+	compare VAR_0x40C3, 2
+	call_if 1, VictoryRoad_1F_EventScript_235DA3
+	end
+
+VictoryRoad_1F_EventScript_235D97:: @ 8235D97
+	setobjectxyperm 4, 2, 24
+	setobjectmovementtype 4, 8
+	return
+
+VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3
+	setobjectxyperm 4, 3, 24
+	setobjectmovementtype 4, 8
+	return
+
+VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF
+	lockall
+	setvar VAR_0x8008, 1
+	addobject 4
+	applymovement 4, VictoryRoad_1F_Movement_235E15
+	waitmovement 0
+	goto VictoryRoad_1F_EventScript_235DE1
+	end
+
+VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8
+	lockall
+	setvar VAR_0x8008, 2
+	addobject 4
+	applymovement 4, VictoryRoad_1F_Movement_235E21
+	waitmovement 0
+	goto VictoryRoad_1F_EventScript_235DE1
+	end
+
+VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
+	applymovement 255, VictoryRoad_1F_Movement_2725AA
+	waitmovement 0
+	msgbox VictoryRoad_1F_Text_235EE6, 4
+	trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC
+	msgbox VictoryRoad_1F_Text_236020, 4
+	clearflag FLAG_0x35A
+	moveobjectoffscreen 4
+	setflag FLAG_0x07E
+	copyvar VAR_0x40C3, VAR_0x8008
+	releaseall
+	end
+
+VictoryRoad_1F_Movement_235E15: @ 8235E15
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+VictoryRoad_1F_Movement_235E21: @ 8235E21
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	step_end
+
+VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C
+	msgbox VictoryRoad_1F_Text_236020, 2
+	end
+
+VictoryRoad_1F_EventScript_235E35:: @ 8235E35
+	trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq VictoryRoad_1F_EventScript_235E5C
+	msgbox VictoryRoad_1F_Text_2360FE, 6
+	end
+
+VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C
+	trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
+	msgbox VictoryRoad_1F_Text_2360FE, 6
+	end
+
+VictoryRoad_1F_EventScript_235E73:: @ 8235E73
+	trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB
+	msgbox VictoryRoad_1F_Text_2361E5, 6
+	end
+
+VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A
+	trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290
+	msgbox VictoryRoad_1F_Text_2362A4, 6
+	end
+
+VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1
+	trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336
+	msgbox VictoryRoad_1F_Text_236356, 6
+	end
+
+VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8
+	trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4
+	msgbox VictoryRoad_1F_Text_2363D5, 6
+	end
+
+VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF
+	trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7
+	msgbox VictoryRoad_1F_Text_2364BB, 6
+	end
+
+VictoryRoad_1F_Text_235EE6: @ 8235EE6
+	.string "WALLY: Hi! {PLAYER}!\p"
+	.string "I bet you’re surprised to see me here!\p"
+	.string "I made it all the way here, and it’s\n"
+	.string "all thanks to you!\p"
+	.string "{PLAYER}, losing to you that time\n"
+	.string "made me stronger!\p"
+	.string "But I’m not going to lose anymore!\p"
+	.string "I’m going to win! For the POKéMON who\n"
+	.string "gave me courage and strength!\p"
+	.string "Okay… Here I come!$"
+
+VictoryRoad_1F_Text_235FFC: @ 8235FFC
+	.string "Wow!\n"
+	.string "{PLAYER}, you are strong, after all!$"
+
+VictoryRoad_1F_Text_236020: @ 8236020
+	.string "WALLY: I couldn’t beat you today,\n"
+	.string "{PLAYER}, but one of these days, I’ll\l"
+	.string "catch up to you!$"
+
+VictoryRoad_1F_Text_236073: @ 8236073
+	.string "WALLY: Hi! {PLAYER}!\p"
+	.string "I’ve gotten stronger since that last\n"
+	.string "time! I wanted to show you, {PLAYER}!\p"
+	.string "Okay… Here I come!$"
+
+VictoryRoad_1F_Text_2360DA: @ 82360DA
+	.string "Wow!\n"
+	.string "{PLAYER}, you are strong, after all!$"
+
+VictoryRoad_1F_Text_2360FE: @ 82360FE
+	.string "WALLY: I couldn’t beat you this time,\n"
+	.string "too… But one of these days, {PLAYER},\l"
+	.string "I’m going to catch up to you…\p"
+	.string "And challenge the POKéMON LEAGUE!$"
+
+VictoryRoad_1F_Text_236184: @ 8236184
+	.string "I’ve made it this far a couple times,\n"
+	.string "but the last stretch is so long…$"
+
+VictoryRoad_1F_Text_2361CB: @ 82361CB
+	.string "My dream ends here again…$"
+
+VictoryRoad_1F_Text_2361E5: @ 82361E5
+	.string "You’ve made it this far. Keep the\n"
+	.string "momentum going and become the\l"
+	.string "CHAMPION! If anyone can, it’s you!$"
+
+VictoryRoad_1F_Text_236248: @ 8236248
+	.string "I didn’t come all this way to lose now.\n"
+	.string "That possibility doesn’t exist!$"
+
+VictoryRoad_1F_Text_236290: @ 8236290
+	.string "Impossible…\n"
+	.string "I lost?$"
+
+VictoryRoad_1F_Text_2362A4: @ 82362A4
+	.string "I lost here…\p"
+	.string "That means I lack the qualifications\n"
+	.string "to become the CHAMPION…$"
+
+VictoryRoad_1F_Text_2362EE: @ 82362EE
+	.string "This seemingly infinite and harsh road\n"
+	.string "lives up to its name of VICTORY.$"
+
+VictoryRoad_1F_Text_236336: @ 8236336
+	.string "Your battle style is fantastic…$"
+
+VictoryRoad_1F_Text_236356: @ 8236356
+	.string "You seem to have the potential for\n"
+	.string "becoming the CHAMPION.$"
+
+VictoryRoad_1F_Text_236390: @ 8236390
+	.string "What is the VICTORY ROAD?\n"
+	.string "I’ll tell you if you win!$"
+
+VictoryRoad_1F_Text_2363C4: @ 82363C4
+	.string "Okay!\n"
+	.string "Well done!$"
+
+VictoryRoad_1F_Text_2363D5: @ 82363D5
+	.string "Getting through here safely--that’s\n"
+	.string "the final test for any TRAINER aiming\l"
+	.string "to become the POKéMON CHAMPION.\p"
+	.string "That’s why it’s called the VICTORY\n"
+	.string "ROAD.$"
+
+VictoryRoad_1F_Text_236468: @ 8236468
+	.string "I have nothing to say to anyone\n"
+	.string "that’s come this far. Come on!$"
+
+VictoryRoad_1F_Text_2364A7: @ 82364A7
+	.string "This is a disgrace…$"
+
+VictoryRoad_1F_Text_2364BB: @ 82364BB
+	.string "Humph, go right on ahead.\n"
+	.string "See if I care.$"
+
diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc
new file mode 100644
index 000000000..f96b0d4bc
--- /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, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28
+	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31
+	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0
+	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087
+	object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0
+	object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 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..6650653ef 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -1,15 +1,15 @@
 VictoryRoad_B1F: @ 8484390
-	.4byte VictoryRoad_B1F_MapAttributes
+	.4byte VictoryRoad_B1F_Layout
 	.4byte VictoryRoad_B1F_MapEvents
 	.4byte VictoryRoad_B1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 285
-	.byte 70
+	.byte MAPSEC_VICTORY_ROAD
 	.byte 1
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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..bcd5747f7
--- /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, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088
+	object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 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_hidden_item_event 28, 5, 3, ITEM_ELIXIR, 82
+	bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, 83
+
+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..c89256b33 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -1,15 +1,15 @@
 VictoryRoad_B2F: @ 84843AC
-	.4byte VictoryRoad_B2F_MapAttributes
+	.4byte VictoryRoad_B2F_Layout
 	.4byte VictoryRoad_B2F_MapEvents
 	.4byte VictoryRoad_B2F_MapScripts
 	.4byte 0x0
 	.2byte MUS_C_ROAD
 	.2byte 286
-	.byte 70
+	.byte MAPSEC_VICTORY_ROAD
 	.byte 1
-	.byte 0
-	.byte 4
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_UNDERGROUND
 	.2byte 0
 	.byte 15
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
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 b2bc10ebb..000000000
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-AbandonedShip_CaptainsOffice_MapObjects: @ 8536A5C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 a2b3b906f..000000000
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-AbandonedShip_Corridors_1F_MapObjects: @ 85366C0
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 637e658ce..000000000
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-AbandonedShip_Corridors_B1F_MapObjects: @ 8536808
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 21a4370ce..000000000
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-AbandonedShip_HiddenFloorRooms_MapObjects: @ 8536B40
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 d22e24bde..000000000
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-AbandonedShip_Room_B1F_MapObjects: @ 853697C
-	object_event 1, MAP_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_MapObjects, 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 ac5f57a53..000000000
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AbandonedShip_Rooms2_1F_MapObjects: @ 85369B8
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 08846936a..000000000
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-AbandonedShip_Rooms2_B1F_MapObjects: @ 85368F4
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 7e358ef75..000000000
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-AbandonedShip_Rooms_1F_MapObjects: @ 8536764
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0
-	object_event 2, MAP_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, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 4627c4ab7..000000000
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-AbandonedShip_Rooms_B1F_MapObjects: @ 8536898
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 667ab3876..000000000
--- a/data/maps/events/AncientTomb.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-AncientTomb_MapObjects: @ 8536CDC
-	object_event 1, MAP_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_MapObjects, 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 4c418b286..000000000
--- a/data/maps/events/AquaHideout_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-AquaHideout_1F_MapObjects: @ 8535304
-	object_event 1, MAP_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, MAP_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, MAP_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_MapObjects, 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 b62157d6f..000000000
--- a/data/maps/events/AquaHideout_B1F.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-AquaHideout_B1F_MapObjects: @ 8535378
-	object_event 1, MAP_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, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0
-	object_event 4, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 24f97a1ea..000000000
--- a/data/maps/events/AquaHideout_B2F.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-AquaHideout_B2F_MapObjects: @ 853552C
-	object_event 1, MAP_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, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0
-	object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0
-	object_event 5, MAP_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, MAP_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_MapObjects, 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 148408aa9..000000000
--- a/data/maps/events/ArtisanCave_1F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-ArtisanCave_1F_MapObjects: @ 8537774
-	object_event 1, MAP_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_MapObjects, 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 38a978c9b..000000000
--- a/data/maps/events/ArtisanCave_B1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-ArtisanCave_B1F_MapObjects: @ 8537708
-	object_event 1, MAP_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_MapObjects, 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 fee53156b..000000000
--- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattleArenaBattleRoom_MapObjects: @ 853C8EC
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
deleted file mode 100644
index d35c35ad0..000000000
--- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleArenaCorridor_MapObjects: @ 853C8C0
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc
deleted file mode 100644
index ec84dfb77..000000000
--- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-BattleFrontier_BattleArenaLobby_MapObjects: @ 853C814
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 3f0429bf2..000000000
--- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-BattleFrontier_BattleDomeBattleRoom_MapObjects: @ 853C1C4
-	object_event 1, MAP_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
deleted file mode 100644
index 61b6e019d..000000000
--- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattleDomeCorridor_MapObjects: @ 853C14C
-	object_event 1, MAP_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_MapObjects, 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 09ebc903c..000000000
--- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattleDomeLobby_MapObjects: @ 853C068
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 6d8a8abe8..000000000
--- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattleDomePreBattleRoom_MapObjects: @ 853C188
-	object_event 1, MAP_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_MapObjects, 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 65ce8b684..000000000
--- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_BattleFactoryBattleRoom_MapObjects: @ 853CADC
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
deleted file mode 100644
index e9f54cb50..000000000
--- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-BattleFrontier_BattleFactoryLobby_MapObjects: @ 853C9D8
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 de03d5945..000000000
--- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleFactoryPreBattleRoom_MapObjects: @ 853CAB0
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
deleted file mode 100644
index 1314bbb40..000000000
--- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattlePalaceBattleRoom_MapObjects: @ 853C4FC
-	object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 dc86a54b8..000000000
--- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePalaceCorridor_MapObjects: @ 853C420
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 890d545ae..000000000
--- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattlePalaceLobby_MapObjects: @ 853C340
-	object_event 1, MAP_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, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 2e6b8ecc7..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattlePikeCorridor_MapObjects: @ 853CC54
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc
deleted file mode 100644
index 4580d0358..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePikeLobby_MapObjects: @ 853CBB0
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 c7c3a36d0..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 078882617..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom2_MapObjects: @ 853CE08
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc
deleted file mode 100644
index 20e6cb085..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
-	coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
-	coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
-	coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
-	coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
-	coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
-	coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
-	coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
-
-BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4
-	map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
deleted file mode 100644
index 7894ab85a..000000000
--- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 5e5a23fa4..000000000
--- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-BattleFrontier_BattlePointExchangeServiceCorner_MapObjects: @ 853D018
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 aba4f907d..000000000
--- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-BattleFrontier_BattlePyramidEmptySquare_MapObjects: @ 853C62C
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 16, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
deleted file mode 100644
index eb56352ed..000000000
--- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-BattleFrontier_BattlePyramidLobby_MapObjects: @ 853C598
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 79e4770ea..000000000
--- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 c9b46f8ca..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom_MapObjects: @ 853B7D0
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 afab09840..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_BattleTowerBattleRoom2_MapObjects: @ 853BFC4
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
deleted file mode 100644
index 75d51fb28..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleTowerCorridor_MapObjects: @ 853B7A4
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
deleted file mode 100644
index 083b877ab..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-BattleFrontier_BattleTowerCorridor2_MapObjects: @ 853BF50
-	object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc
deleted file mode 100644
index 4f2a32d89..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleFrontier_BattleTowerElevator_MapObjects: @ 853B778
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc
deleted file mode 100644
index 35f6e6bca..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-BattleFrontier_BattleTowerLobby_MapObjects: @ 853B638
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0
-	object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 0292088de..000000000
--- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_BattleTowerMultiBattleRoom_MapObjects: @ 853BE64
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc
deleted file mode 100644
index 748d86b6c..000000000
--- a/data/maps/events/BattleFrontier_Lounge1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge1_MapObjects: @ 853CFB4
-	object_event 1, MAP_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, MAP_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 c31e86ab6..000000000
--- a/data/maps/events/BattleFrontier_Lounge2.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_Lounge2_MapObjects: @ 853D11C
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0
-	object_event 4, MAP_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, MAP_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_MapObjects, 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 0655cea90..000000000
--- a/data/maps/events/BattleFrontier_Lounge3.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Lounge3_MapObjects: @ 853D1B8
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 ae4e7c4b7..000000000
--- a/data/maps/events/BattleFrontier_Lounge4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge4_MapObjects: @ 853D24C
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 cc8759d1d..000000000
--- a/data/maps/events/BattleFrontier_Lounge5.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Lounge5_MapObjects: @ 853D2EC
-	object_event 1, MAP_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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 b2aa2b93f..000000000
--- a/data/maps/events/BattleFrontier_Lounge6.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-BattleFrontier_Lounge6_MapObjects: @ 853D370
-	object_event 1, MAP_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_MapObjects, 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 43cb50ddf..000000000
--- a/data/maps/events/BattleFrontier_Lounge7.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattleFrontier_Lounge7_MapObjects: @ 853D3A4
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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_MapObjects, 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 0420a702f..000000000
--- a/data/maps/events/BattleFrontier_Lounge8.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-BattleFrontier_Lounge8_MapObjects: @ 853D4BC
-	object_event 1, MAP_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, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 ff96fc94f..000000000
--- a/data/maps/events/BattleFrontier_Lounge9.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_Lounge9_MapObjects: @ 853D520
-	object_event 1, MAP_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_MapObjects, 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 5ce69f2ee..000000000
--- a/data/maps/events/BattleFrontier_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-BattleFrontier_Mart_MapObjects: @ 853D68C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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_MapObjects, 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 a99a7fcf0..000000000
--- a/data/maps/events/BattleFrontier_OutsideEast.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-BattleFrontier_OutsideEast_MapObjects: @ 853BB10
-	object_event 1, MAP_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, MAP_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0
-	object_event 7, MAP_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, MAP_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, MAP_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0
-	object_event 10, MAP_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, MAP_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, MAP_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0
-	object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0
-	object_event 24, MAP_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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0
-	object_event 26, MAP_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_MapObjects, 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 e6f2eef7d..000000000
--- a/data/maps/events/BattleFrontier_OutsideWest.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-BattleFrontier_OutsideWest_MapObjects: @ 853B350
-	object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0
-	object_event 4, MAP_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, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0
-	object_event 22, MAP_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, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0
-	object_event 24, MAP_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_MapObjects, 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 0a8974135..000000000
--- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_PokemonCenter_1F_MapObjects: @ 853D55C
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 44d40453f..000000000
--- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_PokemonCenter_2F_MapObjects: @ 853D600
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 853f83ab7..000000000
--- a/data/maps/events/BattleFrontier_RankingHall.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-BattleFrontier_RankingHall_MapObjects: @ 853CEB8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 641723257..000000000
--- a/data/maps/events/BattleFrontier_ReceptionGate.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BattleFrontier_ReceptionGate_MapObjects: @ 853D420
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 fd9f2f522..000000000
--- a/data/maps/events/BattleFrontier_ScottsHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_ScottsHouse_MapObjects: @ 853D2B0
-	object_event 1, MAP_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_MapObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc
deleted file mode 100644
index f3c260243..000000000
--- a/data/maps/events/BattlePyramidSquare01.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare01_MapObjects: @ 853A460
-	object_event 1, MAP_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, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc
deleted file mode 100644
index 790fb67a0..000000000
--- a/data/maps/events/BattlePyramidSquare02.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare02_MapObjects: @ 853A51C
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc
deleted file mode 100644
index a8c8c59a7..000000000
--- a/data/maps/events/BattlePyramidSquare03.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare03_MapObjects: @ 853A5D8
-	object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_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, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc
deleted file mode 100644
index ca836e2b5..000000000
--- a/data/maps/events/BattlePyramidSquare04.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare04_MapObjects: @ 853A694
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc
deleted file mode 100644
index 0486f6283..000000000
--- a/data/maps/events/BattlePyramidSquare05.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare05_MapObjects: @ 853A750
-	object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc
deleted file mode 100644
index 65d2f2576..000000000
--- a/data/maps/events/BattlePyramidSquare06.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare06_MapObjects: @ 853A80C
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc
deleted file mode 100644
index 9a71e2a0b..000000000
--- a/data/maps/events/BattlePyramidSquare07.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare07_MapObjects: @ 853A8C8
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc
deleted file mode 100644
index 52a8d4911..000000000
--- a/data/maps/events/BattlePyramidSquare08.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare08_MapObjects: @ 853A984
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc
deleted file mode 100644
index bc90aa649..000000000
--- a/data/maps/events/BattlePyramidSquare09.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare09_MapObjects: @ 853AA40
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc
deleted file mode 100644
index 013cd7be6..000000000
--- a/data/maps/events/BattlePyramidSquare10.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare10_MapObjects: @ 853AAFC
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc
deleted file mode 100644
index 96dc118e5..000000000
--- a/data/maps/events/BattlePyramidSquare11.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare11_MapObjects: @ 853ABB8
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc
deleted file mode 100644
index 10b301d6c..000000000
--- a/data/maps/events/BattlePyramidSquare12.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare12_MapObjects: @ 853AC74
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc
deleted file mode 100644
index 0a83a5441..000000000
--- a/data/maps/events/BattlePyramidSquare13.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare13_MapObjects: @ 853AD30
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc
deleted file mode 100644
index 599219cf1..000000000
--- a/data/maps/events/BattlePyramidSquare14.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare14_MapObjects: @ 853ADEC
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc
deleted file mode 100644
index ef92bec9a..000000000
--- a/data/maps/events/BattlePyramidSquare15.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare15_MapObjects: @ 853AEA8
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc
deleted file mode 100644
index 1d7e44f70..000000000
--- a/data/maps/events/BattlePyramidSquare16.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-BattlePyramidSquare16_MapObjects: @ 853AF64
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc
deleted file mode 100644
index 457d86314..000000000
--- a/data/maps/events/BirthIsland_Exterior.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BirthIsland_Exterior_MapObjects: @ 853D7DC
-	object_event 1, MAP_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 e035d2f44..000000000
--- a/data/maps/events/BirthIsland_Harbor.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BirthIsland_Harbor_MapObjects: @ 853D828
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 9c6cc18c6..000000000
--- a/data/maps/events/CaveOfOrigin_B1F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-CaveOfOrigin_B1F_MapObjects: @ 8535DD0
-	object_event 1, MAP_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_MapObjects, 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 4a78cae40..000000000
--- a/data/maps/events/DesertRuins.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DesertRuins_MapObjects: @ 8534354
-	object_event 1, MAP_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_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
-
diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc
deleted file mode 100644
index cb5c06874..000000000
--- a/data/maps/events/DesertUnderpass.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-DesertUnderpass_MapObjects: @ 85376D4
-	object_event 1, MAP_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_MapObjects, DesertUnderpass_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc
deleted file mode 100644
index 3a4e95de9..000000000
--- a/data/maps/events/DewfordTown.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DewfordTown_MapObjects: @ 8527964
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 e9a6b6477..000000000
--- a/data/maps/events/DewfordTown_Gym.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DewfordTown_Gym_MapObjects: @ 852DB34
-	object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 f5af1fc3c..000000000
--- a/data/maps/events/DewfordTown_Hall.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DewfordTown_Hall_MapObjects: @ 852DC48
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0
-	object_event 4, MAP_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, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 1990975c5..000000000
--- a/data/maps/events/DewfordTown_House1.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DewfordTown_House1_MapObjects: @ 852D9C8
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 b487372f6..000000000
--- a/data/maps/events/DewfordTown_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DewfordTown_House2_MapObjects: @ 852DD5C
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 c393ed795..000000000
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DewfordTown_PokemonCenter_1F_MapObjects: @ 852DA34
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 437441e08..000000000
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DewfordTown_PokemonCenter_2F_MapObjects: @ 852DAA8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 e5fbb81c1..000000000
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-EverGrandeCity_ChampionsRoom_MapObjects: @ 8533700
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 2db37957d..000000000
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_DrakesRoom_MapObjects: @ 85336C4
-	object_event 1, MAP_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_MapObjects, 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 7d97a2bc6..000000000
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_GlaciasRoom_MapObjects: @ 8533688
-	object_event 1, MAP_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_MapObjects, 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 18ed3ebdb..000000000
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_HallOfFame_MapObjects: @ 85338FC
-	object_event 1, MAP_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_MapObjects, 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 471bae1fc..000000000
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_PhoebesRoom_MapObjects: @ 853364C
-	object_event 1, MAP_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_MapObjects, 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 28491f59b..000000000
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonCenter_1F_MapObjects: @ 8533930
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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_MapObjects, 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 d34c8082f..000000000
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonCenter_2F_MapObjects: @ 85339BC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 ee368c6e1..000000000
--- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-EverGrandeCity_PokemonLeague_1F_MapObjects: @ 8533860
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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_MapObjects, 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 499aad196..000000000
--- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonLeague_2F_MapObjects: @ 8533A48
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 9ff3d40cb..000000000
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-EverGrandeCity_SidneysRoom_MapObjects: @ 8533610
-	object_event 1, MAP_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_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc
deleted file mode 100644
index 28dab394b..000000000
--- a/data/maps/events/FallarborTown.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-FallarborTown_MapObjects: @ 8527BE0
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 bed082ccb..000000000
--- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-FallarborTown_BattleTentBattleRoom_MapObjects: @ 852E444
-	object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc
deleted file mode 100644
index 023ef7f0b..000000000
--- a/data/maps/events/FallarborTown_BattleTentCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-FallarborTown_BattleTentCorridor_MapObjects: @ 852E418
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc
deleted file mode 100644
index 6c0d25020..000000000
--- a/data/maps/events/FallarborTown_BattleTentLobby.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-FallarborTown_BattleTentLobby_MapObjects: @ 852E370
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0
-	object_event 3, MAP_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, MAP_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 971236802..000000000
--- a/data/maps/events/FallarborTown_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FallarborTown_House1_MapObjects: @ 852E5B8
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 058c4c5af..000000000
--- a/data/maps/events/FallarborTown_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FallarborTown_House2_MapObjects: @ 852E60C
-	object_event 1, MAP_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_MapObjects, 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 a59da4c66..000000000
--- a/data/maps/events/FallarborTown_Mart.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_Mart_MapObjects: @ 852E2D4
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 19421411e..000000000
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_PokemonCenter_1F_MapObjects: @ 852E4A0
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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_MapObjects, 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 408ecf9db..000000000
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_PokemonCenter_2F_MapObjects: @ 852E52C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 cd321124f..000000000
--- a/data/maps/events/FarawayIsland_Entrance.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-FarawayIsland_Entrance_MapObjects: @ 853D710
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 6f13ca36e..000000000
--- a/data/maps/events/FarawayIsland_Interior.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FarawayIsland_Interior_MapObjects: @ 853D7A0
-	object_event 1, MAP_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_MapObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
deleted file mode 100644
index cd360a75f..000000000
--- a/data/maps/events/FieryPath.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-FieryPath_MapObjects: @ 8534C80
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0
-	object_event 8, MAP_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_MapObjects, FieryPath_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc
deleted file mode 100644
index 03ff20df1..000000000
--- a/data/maps/events/FortreeCity.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-FortreeCity_MapObjects: @ 8526B9C
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 7c25059bf..000000000
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FortreeCity_DecorationShop_MapObjects: @ 85310B0
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 6e3904b88..000000000
--- a/data/maps/events/FortreeCity_Gym.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-FortreeCity_Gym_MapObjects: @ 8530C98
-	object_event 1, MAP_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 d1eecfdef..000000000
--- a/data/maps/events/FortreeCity_House1.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House1_MapObjects: @ 8530C2C
-	object_event 1, MAP_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, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 c54b42a6d..000000000
--- a/data/maps/events/FortreeCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House2_MapObjects: @ 8530F30
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 7be159493..000000000
--- a/data/maps/events/FortreeCity_House3.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House3_MapObjects: @ 8530F84
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 d24c12520..000000000
--- a/data/maps/events/FortreeCity_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House4_MapObjects: @ 8530FD8
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 3520e7249..000000000
--- a/data/maps/events/FortreeCity_House5.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_House5_MapObjects: @ 8531044
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 acb1e9471..000000000
--- a/data/maps/events/FortreeCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FortreeCity_Mart_MapObjects: @ 8530EAC
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 922e825c7..000000000
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FortreeCity_PokemonCenter_1F_MapObjects: @ 8530D94
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 e5a3f1ac4..000000000
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FortreeCity_PokemonCenter_2F_MapObjects: @ 8530E20
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 1bad3837f..000000000
--- a/data/maps/events/GraniteCave_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-GraniteCave_1F_MapObjects: @ 85343BC
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 f5981fcbe..000000000
--- a/data/maps/events/GraniteCave_B1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-GraniteCave_B1F_MapObjects: @ 8534420
-	object_event 1, MAP_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_MapObjects, 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 ebc9467f4..000000000
--- a/data/maps/events/GraniteCave_B2F.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-GraniteCave_B2F_MapObjects: @ 8534484
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 eca46cd79..000000000
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-GraniteCave_StevensRoom_MapObjects: @ 85345B0
-	object_event 1, MAP_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_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
deleted file mode 100644
index 3e888ec44..000000000
--- a/data/maps/events/InsideOfTruck.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-InsideOfTruck_MapObjects: @ 853A078
-	object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 094852c5a..000000000
--- a/data/maps/events/IslandCave.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-IslandCave_MapObjects: @ 8536C74
-	object_event 1, MAP_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_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
-
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc
deleted file mode 100644
index cc862fed1..000000000
--- a/data/maps/events/JaggedPass.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-JaggedPass_MapObjects: @ 8534AE4
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0
-	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 0e16fc60c..000000000
--- a/data/maps/events/LavaridgeTown.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LavaridgeTown_MapObjects: @ 8527A54
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0
-	object_event 5, MAP_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, MAP_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, MAP_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0
-	object_event 8, MAP_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 a67522cb8..000000000
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-LavaridgeTown_Gym_1F_MapObjects: @ 852DE1C
-	object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 0c0c4adaa..000000000
--- a/data/maps/events/LavaridgeTown_Gym_B1F.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LavaridgeTown_Gym_B1F_MapObjects: @ 852DFA8
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 76b5ac368..000000000
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_HerbShop_MapObjects: @ 852DDB0
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 82ae945b4..000000000
--- a/data/maps/events/LavaridgeTown_House.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_House_MapObjects: @ 852E0DC
-	object_event 1, MAP_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, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 db9c02f5e..000000000
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LavaridgeTown_Mart_MapObjects: @ 852E148
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 11ed52f9a..000000000
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LavaridgeTown_PokemonCenter_1F_MapObjects: @ 852E1B4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 dc0acec14..000000000
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LavaridgeTown_PokemonCenter_2F_MapObjects: @ 852E248
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 63aed18f8..000000000
--- a/data/maps/events/LilycoveCity.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-LilycoveCity_MapObjects: @ 8526CE8
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0
-	object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0
-	object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0
-	object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0
-	object_event 15, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0
-	object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0
-	object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0
-	object_event 22, MAP_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_MapObjects, 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 15501ebfd..000000000
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-LilycoveCity_ContestHall_MapObjects: @ 8531850
-	object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0
-	object_event 7, MAP_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, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0
-	object_event 10, MAP_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, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0
-	object_event 16, MAP_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, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0
-	object_event 28, MAP_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, MAP_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0
-	object_event 31, MAP_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, MAP_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_MapObjects, 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 a654fe5f7..000000000
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-LilycoveCity_ContestLobby_MapObjects: @ 8531534
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0
-	object_event 10, MAP_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, MAP_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0
-	object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0
-	object_event 14, MAP_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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0
-	object_event 16, MAP_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, MAP_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0
-	object_event 19, MAP_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0
-	object_event 20, MAP_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, MAP_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0
-	object_event 22, MAP_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0
-	object_event 23, MAP_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, MAP_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, MAP_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, EventScript_PblockLink
-	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, EventScript_Pblock1_Ask
-	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_MapObjects, 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 e765a7390..000000000
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F_MapObjects: @ 8531134
-	object_event 1, MAP_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_MapObjects, 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 dfc0d3bd0..000000000
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F_MapObjects: @ 8531188
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 6c572ce4d..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_DepartmentStoreElevator_MapObjects: @ 85324B0
-	object_event 1, MAP_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_MapObjects, 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 eb0ee1a96..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-LilycoveCity_DepartmentStoreRooftop_MapObjects: @ 853241C
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 10fb7f16e..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-LilycoveCity_DepartmentStore_1F_MapObjects: @ 853208C
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0
-	object_event 3, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 95c4daee0..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_2F_MapObjects: @ 853215C
-	object_event 1, MAP_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0
-	object_event 2, MAP_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, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0
-	object_event 4, MAP_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, MAP_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_MapObjects, 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 d51060bba..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_3F_MapObjects: @ 8532200
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 4b2f0f00c..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_DepartmentStore_4F_MapObjects: @ 85322A4
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0
-	object_event 2, MAP_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, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0
-	object_event 4, MAP_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, MAP_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_MapObjects, 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 f459b4764..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-LilycoveCity_DepartmentStore_5F_MapObjects: @ 8532348
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 f2088e9d2..000000000
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_Harbor_MapObjects: @ 8531E1C
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 1edca4904..000000000
--- a/data/maps/events/LilycoveCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LilycoveCity_House1_MapObjects: @ 8531EF4
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 2321844fa..000000000
--- a/data/maps/events/LilycoveCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_House2_MapObjects: @ 8531F48
-	object_event 1, MAP_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_MapObjects, 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 05b36263a..000000000
--- a/data/maps/events/LilycoveCity_House3.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_House3_MapObjects: @ 8531F84
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 9212c1e0e..000000000
--- a/data/maps/events/LilycoveCity_House4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LilycoveCity_House4_MapObjects: @ 8532038
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 36b9b5ac2..000000000
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F_MapObjects: @ 853124C
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0
-	object_event 3, MAP_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, MAP_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0
-	object_event 5, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0
-	object_event 9, MAP_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, MAP_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_MapObjects, 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 829db7b36..000000000
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F_MapObjects: @ 8531428
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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_MapObjects, 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 1b5f4bda5..000000000
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_MoveDeletersHouse_MapObjects: @ 8531EB8
-	object_event 1, MAP_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_MapObjects, 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 ba8988b96..000000000
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LilycoveCity_PokemonCenter_1F_MapObjects: @ 8531BCC
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0
-	object_event 2, MAP_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, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 024b56427..000000000
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_PokemonCenter_2F_MapObjects: @ 8531C70
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 886927d3e..000000000
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub_MapObjects: @ 8531D20
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0
-	object_event 4, MAP_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, MAP_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, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0
-	object_event 8, MAP_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, MAP_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_MapObjects, 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 248ca948d..000000000
--- a/data/maps/events/LinkContestRoom1.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-LinkContestRoom1_MapObjects: @ 8539EFC
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_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, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0
-	object_event 14, MAP_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_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 763391b09..000000000
--- a/data/maps/events/LittlerootTown.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-LittlerootTown_MapObjects: @ 85276A8
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0
-	object_event 5, MAP_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0
-	object_event 6, MAP_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0
-	object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 6f6fc9df4..000000000
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-LittlerootTown_BrendansHouse_1F_MapObjects: @ 852D08C
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0
-	object_event 6, MAP_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, MAP_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_MapObjects, 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 af470cca5..000000000
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-LittlerootTown_BrendansHouse_2F_MapObjects: @ 852D1A0
-	object_event 1, MAP_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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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, MAP_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
-	object_event 15, MAP_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, MAP_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_MapObjects, 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 68bf13bcd..000000000
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-LittlerootTown_MaysHouse_1F_MapObjects: @ 852D36C
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0
-	object_event 6, MAP_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, MAP_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_MapObjects, 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 4d26b70d7..000000000
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-LittlerootTown_MaysHouse_2F_MapObjects: @ 852D480
-	object_event 1, MAP_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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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, MAP_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0
-	object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0
-	object_event 16, MAP_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_MapObjects, 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 cd004bcb7..000000000
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_MapObjects: @ 852D64C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 33a8a4aa0..000000000
--- a/data/maps/events/MagmaHideout_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MagmaHideout_1F_MapObjects: @ 85371CC
-	object_event 1, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0
-	object_event 3, MAP_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, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 4ac6e0fde..000000000
--- a/data/maps/events/MagmaHideout_2F_1R.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MagmaHideout_2F_1R_MapObjects: @ 8537290
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 845da88b2..000000000
--- a/data/maps/events/MagmaHideout_2F_2R.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_2F_2R_MapObjects: @ 853731C
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 07a53f4fb..000000000
--- a/data/maps/events/MagmaHideout_3F_1R.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MagmaHideout_3F_1R_MapObjects: @ 85373D0
-	object_event 1, MAP_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, MAP_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, MAP_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_MapObjects, 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 faeacbd12..000000000
--- a/data/maps/events/MagmaHideout_3F_2R.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MagmaHideout_3F_2R_MapObjects: @ 8537444
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 386696d9c..000000000
--- a/data/maps/events/MagmaHideout_3F_3R.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MagmaHideout_3F_3R_MapObjects: @ 8537574
-	object_event 1, MAP_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_MapObjects, 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 545eeea92..000000000
--- a/data/maps/events/MagmaHideout_4F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MagmaHideout_4F_MapObjects: @ 8537490
-	object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0
-	object_event 7, MAP_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 ad11733e1..000000000
--- a/data/maps/events/MarineCave_End.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MarineCave_End_MapObjects: @ 85377E8
-	object_event 1, MAP_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_MapObjects, 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 c6da0eb61..000000000
--- a/data/maps/events/MauvilleCity.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-MauvilleCity_MapObjects: @ 852662C
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0
-	object_event 8, MAP_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0
-	object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0
-	object_event 11, MAP_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_MapObjects, 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 e8e3ef7be..000000000
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_BikeShop_MapObjects: @ 852FE80
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 1a84504f5..000000000
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-MauvilleCity_GameCorner_MapObjects: @ 852FF28
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0
-	object_event 7, MAP_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, MAP_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0
-	object_event 12, MAP_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_MapObjects, 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 44ae41601..000000000
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-MauvilleCity_Gym_MapObjects: @ 852FD5C
-	object_event 1, MAP_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 9b30d3119..000000000
--- a/data/maps/events/MauvilleCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MauvilleCity_House1_MapObjects: @ 852FEEC
-	object_event 1, MAP_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_MapObjects, 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 5328de49f..000000000
--- a/data/maps/events/MauvilleCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MauvilleCity_House2_MapObjects: @ 853018C
-	object_event 1, MAP_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_MapObjects, 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 257d047cd..000000000
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MauvilleCity_Mart_MapObjects: @ 8530310
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 725e52ef3..000000000
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_1F_MapObjects: @ 85301C8
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0
-	object_event 3, MAP_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, MAP_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, MAP_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_MapObjects, 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 9e5cb6e81..000000000
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_2F_MapObjects: @ 853026C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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, MAP_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_MapObjects, 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 29ecbf043..000000000
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-MeteorFalls_1F_1R_MapObjects: @ 8533F74
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0
-	object_event 10, MAP_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_MapObjects, 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 180b4f722..000000000
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MeteorFalls_1F_2R_MapObjects: @ 85340C4
-	object_event 1, MAP_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, MAP_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, MAP_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_MapObjects, 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 e208273cf..000000000
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MeteorFalls_B1F_2R_MapObjects: @ 8534190
-	object_event 1, MAP_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_MapObjects, 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 e9f3d0db6..000000000
--- a/data/maps/events/MeteorFalls_StevensCave.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MeteorFalls_StevensCave_MapObjects: @ 85378B0
-	object_event 1, MAP_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_MapObjects, 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 956965d5f..000000000
--- a/data/maps/events/MirageTower_3F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_3F_MapObjects: @ 853761C
-	object_event 1, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 1042dc803..000000000
--- a/data/maps/events/MirageTower_4F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MirageTower_4F_MapObjects: @ 8537670
-	object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0
-	object_event 2, MAP_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0
-	object_event 3, MAP_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_MapObjects, MirageTower_4F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc
deleted file mode 100644
index d048ecb5d..000000000
--- a/data/maps/events/MossdeepCity.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-MossdeepCity_MapObjects: @ 8527018
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0
-	object_event 15, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0
-	object_event 17, MAP_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_MapObjects, 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 c4477a44b..000000000
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MossdeepCity_GameCorner_1F_MapObjects: @ 8532F40
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 ed9b4f660..000000000
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MossdeepCity_GameCorner_B1F_MapObjects: @ 8532FC0
-	object_event 1, MAP_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_MapObjects, 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 57a717638..000000000
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-MossdeepCity_Gym_MapObjects: @ 85324EC
-	object_event 1, MAP_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 36, MAP_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_MapObjects, 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 c83a09c5c..000000000
--- a/data/maps/events/MossdeepCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MossdeepCity_House1_MapObjects: @ 8532978
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 08ab80348..000000000
--- a/data/maps/events/MossdeepCity_House2.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_House2_MapObjects: @ 85329CC
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 21c008770..000000000
--- a/data/maps/events/MossdeepCity_House3.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MossdeepCity_House3_MapObjects: @ 8532BD4
-	object_event 1, MAP_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_MapObjects, 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 76245850f..000000000
--- a/data/maps/events/MossdeepCity_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_House4_MapObjects: @ 8532CAC
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 4a49376ba..000000000
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_Mart_MapObjects: @ 8532B50
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 30e5d395c..000000000
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_PokemonCenter_1F_MapObjects: @ 8532A38
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 7eda9d522..000000000
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_PokemonCenter_2F_MapObjects: @ 8532AAC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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, MAP_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_MapObjects, 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 4e2062365..000000000
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-MossdeepCity_SpaceCenter_1F_MapObjects: @ 8532D18
-	object_event 1, MAP_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, MAP_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, MAP_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0
-	object_event 4, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 3de11be87..000000000
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MossdeepCity_SpaceCenter_2F_MapObjects: @ 8532E4C
-	object_event 1, MAP_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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0
-	object_event 3, MAP_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, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0
-	object_event 5, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 523088c40..000000000
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-MossdeepCity_StevensHouse_MapObjects: @ 8532C10
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 5f026066a..000000000
--- a/data/maps/events/MtChimney.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-MtChimney_MapObjects: @ 85347C8
-	object_event 1, MAP_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0
-	object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0
-	object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0
-	object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0
-	object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0
-	object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 22, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0
-	object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0
-	object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0
-	object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0
-	object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0
-	object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0
-	object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0
-	object_event 29, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0
-	object_event 30, MAP_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_MapObjects, 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 deb754157..000000000
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MtChimney_CableCarStation_MapObjects: @ 8533CA8
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 5270f92fd..000000000
--- a/data/maps/events/MtPyre_1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-MtPyre_1F_MapObjects: @ 8534D64
-	object_event 1, MAP_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, MAP_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 86659ac47..000000000
--- a/data/maps/events/MtPyre_2F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-MtPyre_2F_MapObjects: @ 8534DF0
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 96dcae630..000000000
--- a/data/maps/events/MtPyre_3F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MtPyre_3F_MapObjects: @ 8534EEC
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 2792fa422..000000000
--- a/data/maps/events/MtPyre_4F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_4F_MapObjects: @ 8534F90
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 f92f77965..000000000
--- a/data/maps/events/MtPyre_5F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MtPyre_5F_MapObjects: @ 8535004
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 be6459981..000000000
--- a/data/maps/events/MtPyre_6F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MtPyre_6F_MapObjects: @ 8535070
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 5a6101968..000000000
--- a/data/maps/events/MtPyre_Exterior.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-MtPyre_Exterior_MapObjects: @ 85350DC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 261721fb9..000000000
--- a/data/maps/events/MtPyre_Summit.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-MtPyre_Summit_MapObjects: @ 85351A0
-	object_event 1, MAP_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, MAP_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0
-	object_event 3, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 6de1313e9..000000000
--- a/data/maps/events/NavelRock_Bottom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-NavelRock_Bottom_MapObjects: @ 853DD50
-	object_event 1, MAP_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_MapObjects, 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 eab9c8fc6..000000000
--- a/data/maps/events/NavelRock_Harbor.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-NavelRock_Harbor_MapObjects: @ 853DA24
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 695011311..000000000
--- a/data/maps/events/NavelRock_Top.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-NavelRock_Top_MapObjects: @ 853DB74
-	object_event 1, MAP_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_MapObjects, 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 a2d81c9c1..000000000
--- a/data/maps/events/NewMauville_Inside.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-NewMauville_Inside_MapObjects: @ 85364A8
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 2f2929eb5..000000000
--- a/data/maps/events/OldaleTown.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-OldaleTown_MapObjects: @ 8527854
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 1a8edcbc6..000000000
--- a/data/maps/events/OldaleTown_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-OldaleTown_House1_MapObjects: @ 852D7B4
-	object_event 1, MAP_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_MapObjects, 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 c86bc109c..000000000
--- a/data/maps/events/OldaleTown_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-OldaleTown_House2_MapObjects: @ 852D7F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 6a58118c8..000000000
--- a/data/maps/events/OldaleTown_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-OldaleTown_Mart_MapObjects: @ 852D95C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 a6e424f27..000000000
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-OldaleTown_PokemonCenter_1F_MapObjects: @ 852D844
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 d520c6bcf..000000000
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-OldaleTown_PokemonCenter_2F_MapObjects: @ 852D8D0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 1667ccc87..000000000
--- a/data/maps/events/PacifidlogTown.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-PacifidlogTown_MapObjects: @ 8527DE8
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 5f2c3b905..000000000
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House1_MapObjects: @ 852EBA0
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 743395c72..000000000
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-PacifidlogTown_House2_MapObjects: @ 852EBF4
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 85d7c4f53..000000000
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House3_MapObjects: @ 852EC60
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 b552a566c..000000000
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-PacifidlogTown_House4_MapObjects: @ 852ECB4
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 e078fc612..000000000
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House5_MapObjects: @ 852ED20
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 3a28af372..000000000
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PacifidlogTown_PokemonCenter_1F_MapObjects: @ 852EA70
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 2ae1cc480..000000000
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PacifidlogTown_PokemonCenter_2F_MapObjects: @ 852EB14
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 ad696f7ff..000000000
--- a/data/maps/events/PetalburgCity.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-PetalburgCity_MapObjects: @ 8525FD0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0
-	object_event 2, MAP_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 2ee8771a0..000000000
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-PetalburgCity_Gym_MapObjects: @ 852EDC8
-	object_event 1, MAP_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0
-	object_event 10, MAP_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0
-	object_event 11, MAP_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_MapObjects, 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 59ffd7eca..000000000
--- a/data/maps/events/PetalburgCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_House1_MapObjects: @ 852F0BC
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 14ca86ab8..000000000
--- a/data/maps/events/PetalburgCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_House2_MapObjects: @ 852F110
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 e5f1a1d3d..000000000
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-PetalburgCity_Mart_MapObjects: @ 852F294
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 3395f43b4..000000000
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-PetalburgCity_PokemonCenter_1F_MapObjects: @ 852F164
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 5506670c5..000000000
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PetalburgCity_PokemonCenter_2F_MapObjects: @ 852F208
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 df04a0695..000000000
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PetalburgCity_WallysHouse_MapObjects: @ 852ED74
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
deleted file mode 100644
index 5d6c10149..000000000
--- a/data/maps/events/PetalburgWoods.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-PetalburgWoods_MapObjects: @ 85345E4
-	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0
-	object_event 13, MAP_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_MapObjects, 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 672abbbd4..000000000
--- a/data/maps/events/RecordCorner.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RecordCorner_MapObjects: @ 8539DFC
-	object_event 1, MAP_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_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
deleted file mode 100644
index aa8389e29..000000000
--- a/data/maps/events/Route101.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-Route101_MapObjects: @ 8527E98
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0
-	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0
-	object_event 4, MAP_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0
-	object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0
-	object_event 6, MAP_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_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
-
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
deleted file mode 100644
index e128d9652..000000000
--- a/data/maps/events/Route102.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Route102_MapObjects: @ 8527FD8
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 0x0, 0x0, Route102_MapBGEvents
-
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
deleted file mode 100644
index 0b1bae04a..000000000
--- a/data/maps/events/Route103.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-Route103_MapObjects: @ 85280DC
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0
-	object_event 16, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0
-	object_event 20, MAP_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_MapObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
-
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
deleted file mode 100644
index 2913f96c4..000000000
--- a/data/maps/events/Route104.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-Route104_MapObjects: @ 85282E4
-	object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0
-	object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0
-	object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0
-	object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0
-	object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0
-	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0
-	object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0
-	object_event 32, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0
-	object_event 34, MAP_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_MapObjects, 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 c643b364b..000000000
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route104_MrBrineysHouse_MapObjects: @ 8533AD4
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 08f2390c0..000000000
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route104_PrettyPetalFlowerShop_MapObjects: @ 8533B28
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc
deleted file mode 100644
index c27cff262..000000000
--- a/data/maps/events/Route105.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route105_MapObjects: @ 85286F0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0
-	object_event 8, MAP_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_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
-
diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc
deleted file mode 100644
index ee4beeddd..000000000
--- a/data/maps/events/Route106.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-Route106_MapObjects: @ 85287E4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
-
diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc
deleted file mode 100644
index 8498a0f42..000000000
--- a/data/maps/events/Route107.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route107_MapObjects: @ 85288A8
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc
deleted file mode 100644
index 340a3bd3f..000000000
--- a/data/maps/events/Route108.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Route108_MapObjects: @ 8528964
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
-
diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc
deleted file mode 100644
index aab8c40c0..000000000
--- a/data/maps/events/Route109.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-Route109_MapObjects: @ 8528A34
-	object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0
-	object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0
-	object_event 24, MAP_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_MapObjects, 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 1e2332451..000000000
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route109_SeashoreHouse_MapObjects: @ 853DDE8
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
deleted file mode 100644
index 2b8e1571d..000000000
--- a/data/maps/events/Route110.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-Route110_MapObjects: @ 8528CF0
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0
-	object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0
-	object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0
-	object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0
-	object_event 25, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0
-	object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0
-	object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0
-	object_event 29, MAP_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0
-	object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0
-	object_event 36, MAP_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_MapObjects, 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 37d3065c5..000000000
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_SeasideCyclingRoadEntrance1_MapObjects: @ 853E9A0
-	object_event 1, MAP_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_MapObjects, 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 38e02b9ce..000000000
--- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_SeasideCyclingRoadEntrance2_MapObjects: @ 853EA0C
-	object_event 1, MAP_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_MapObjects, 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 34ebbc229..000000000
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_TrickHouseEnd_MapObjects: @ 853DEFC
-	object_event 1, MAP_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_MapObjects, 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 a87df306b..000000000
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route110_TrickHouseEntrance_MapObjects: @ 853DE6C
-	object_event 1, MAP_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_MapObjects, 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 002ad0532..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-Route110_TrickHousePuzzle1_MapObjects: @ 853DF88
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0
-	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0
-	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0
-	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0
-	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0
-	object_event 15, MAP_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_MapObjects, 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 92f2bad01..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route110_TrickHousePuzzle2_MapObjects: @ 853E128
-	object_event 1, MAP_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, MAP_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, MAP_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 c3070fafe..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-Route110_TrickHousePuzzle3_MapObjects: @ 853E218
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 79731353c..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-Route110_TrickHousePuzzle4_MapObjects: @ 853E338
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0
-	object_event 14, MAP_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_MapObjects, 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 801448b12..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-Route110_TrickHousePuzzle5_MapObjects: @ 853E4C0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 d08169a76..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route110_TrickHousePuzzle6_MapObjects: @ 853E6D0
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 8da2bab85..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-Route110_TrickHousePuzzle7_MapObjects: @ 853E768
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0
-	object_event 5, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 5d942affa..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route110_TrickHousePuzzle8_MapObjects: @ 853E908
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 9c79e2c52..000000000
--- a/data/maps/events/Route111.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-Route111_MapObjects: @ 85291F0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0
-	object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0
-	object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0
-	object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0
-	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0
-	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0
-	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0
-	object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0
-	object_event 34, MAP_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0
-	object_event 37, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0
-	object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0
-	object_event 39, MAP_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0
-	object_event 40, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0
-	object_event 41, MAP_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0
-	object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0
-	object_event 43, MAP_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0
-	object_event 44, MAP_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0
-	object_event 45, MAP_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0
-	object_event 46, MAP_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_MapObjects, 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 05510b62d..000000000
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route111_OldLadysRestStop_MapObjects: @ 8533C18
-	object_event 1, MAP_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_MapObjects, 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 402b6e180..000000000
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route111_WinstrateFamilysHouse_MapObjects: @ 8533B94
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
deleted file mode 100644
index 56bd16935..000000000
--- a/data/maps/events/Route112.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-Route112_MapObjects: @ 8529974
-	object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0
-	object_event 14, MAP_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_MapObjects, 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 e1f001aad..000000000
--- a/data/maps/events/Route112_CableCarStation.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route112_CableCarStation_MapObjects: @ 8533C54
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
deleted file mode 100644
index f1d07a671..000000000
--- a/data/maps/events/Route113.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-Route113_MapObjects: @ 8529B2C
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0
-	object_event 13, MAP_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0
-	object_event 16, MAP_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_MapObjects, 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 0191f8578..000000000
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route113_GlassWorkshop_MapObjects: @ 853EA78
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
deleted file mode 100644
index 800af012c..000000000
--- a/data/maps/events/Route114.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-Route114_MapObjects: @ 8529E68
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0
-	object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0
-	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0
-	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0
-	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0
-	object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0
-	object_event 27, MAP_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_MapObjects, 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 e20e9c54c..000000000
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route114_FossilManiacsHouse_MapObjects: @ 8533CFC
-	object_event 1, MAP_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_MapObjects, 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 3fb19d06e..000000000
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_FossilManiacsTunnel_MapObjects: @ 8533D70
-	object_event 1, MAP_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_MapObjects, 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 c6e493c73..000000000
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route114_LanettesHouse_MapObjects: @ 8533DD4
-	object_event 1, MAP_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_MapObjects, 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 e59081620..000000000
--- a/data/maps/events/Route115.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-Route115_MapObjects: @ 852A1BC
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0
-	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0
-	object_event 23, MAP_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_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
-
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
deleted file mode 100644
index a28f44e92..000000000
--- a/data/maps/events/Route116.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-Route116_MapObjects: @ 852A4B8
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0
-	object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0
-	object_event 13, MAP_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0
-	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0
-	object_event 16, MAP_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0
-	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0
-	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0
-	object_event 26, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0
-	object_event 27, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0
-	object_event 28, MAP_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_MapObjects, 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 bc159312e..000000000
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route116_TunnelersRestHouse_MapObjects: @ 8533E34
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
deleted file mode 100644
index 5b0e89239..000000000
--- a/data/maps/events/Route117.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-Route117_MapObjects: @ 852A828
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0
-	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0
-	object_event 24, MAP_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_MapObjects, 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 e9625991f..000000000
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route117_PokemonDayCare_MapObjects: @ 8533EA0
-	object_event 1, MAP_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_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
deleted file mode 100644
index 40e1e4b70..000000000
--- a/data/maps/events/Route118.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-Route118_MapObjects: @ 852AAB4
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0
-	object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0
-	object_event 21, MAP_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_MapObjects, 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 e78006b3c..000000000
--- a/data/maps/events/Route119.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-Route119_MapObjects: @ 852AD6C
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0
-	object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0
-	object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0
-	object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0
-	object_event 25, MAP_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0
-	object_event 26, MAP_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0
-	object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0
-	object_event 38, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0
-	object_event 39, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0
-	object_event 40, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0
-	object_event 41, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0
-	object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0
-	object_event 43, MAP_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_MapObjects, 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 7033c505a..000000000
--- a/data/maps/events/Route119_House.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route119_House_MapObjects: @ 853ECD0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 01a53d75a..000000000
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-Route119_WeatherInstitute_1F_MapObjects: @ 853EB20
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 3a68ca865..000000000
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route119_WeatherInstitute_2F_MapObjects: @ 853EBF4
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
-	object_event 5, MAP_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, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0
-	object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 6206e713f..000000000
--- a/data/maps/events/Route120.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-Route120_MapObjects: @ 852B3F8
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0
-	object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0
-	object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0
-	object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0
-	object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0
-	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0
-	object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0
-	object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0
-	object_event 31, MAP_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0
-	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0
-	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0
-	object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0
-	object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0
-	object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0
-	object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0
-	object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0
-	object_event 42, MAP_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0
-	object_event 43, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0
-	object_event 44, MAP_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_MapObjects, 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 b58fe4858..000000000
--- a/data/maps/events/Route121.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-Route121_MapObjects: @ 852BA14
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0
-	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0
-	object_event 23, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0
-	object_event 29, MAP_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_MapObjects, 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 258571e17..000000000
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route121_SafariZoneEntrance_MapObjects: @ 8533EDC
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 cb60786c0..000000000
--- a/data/maps/events/Route123.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-Route123_MapObjects: @ 852BDBC
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0
-	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0
-	object_event 22, MAP_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0
-	object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0
-	object_event 37, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0
-	object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0
-	object_event 39, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0
-	object_event 40, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0
-	object_event 41, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0
-	object_event 42, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0
-	object_event 43, MAP_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_MapObjects, 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 cbe15cac1..000000000
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route123_BerryMastersHouse_MapObjects: @ 853EACC
-	object_event 1, MAP_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, MAP_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_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc
deleted file mode 100644
index 6f40347e9..000000000
--- a/data/maps/events/Route124.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route124_MapObjects: @ 852C3C4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0
-	object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0
-	object_event 12, MAP_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_MapObjects, 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 43c364e8d..000000000
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route124_DivingTreasureHuntersHouse_MapObjects: @ 853ED9C
-	object_event 1, MAP_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_MapObjects, 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 1211044f2..000000000
--- a/data/maps/events/Route125.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route125_MapObjects: @ 852C50C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0
-	object_event 10, MAP_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_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
-
diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc
deleted file mode 100644
index e8bfd1a5f..000000000
--- a/data/maps/events/Route126.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-Route126_MapObjects: @ 852C648
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0
-	object_event 6, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
deleted file mode 100644
index 7a486263e..000000000
--- a/data/maps/events/Route127.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route127_MapObjects: @ 852C734
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0
-	object_event 11, MAP_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_MapObjects, 0x0, 0x0, Route127_MapBGEvents
-
diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc
deleted file mode 100644
index b48c8c4a2..000000000
--- a/data/maps/events/Route128.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route128_MapObjects: @ 852C88C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0
-	object_event 10, MAP_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_MapObjects, 0x0, 0x0, Route128_MapBGEvents
-
diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc
deleted file mode 100644
index 38ac3513c..000000000
--- a/data/maps/events/Route129.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route129_MapObjects: @ 852C9B4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
deleted file mode 100644
index d5bd41cbd..000000000
--- a/data/maps/events/Route130.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route130_MapObjects: @ 852CA40
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0
-	object_event 4, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc
deleted file mode 100644
index 0f37a4c70..000000000
--- a/data/maps/events/Route131.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route131_MapObjects: @ 852CAB4
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0
-	object_event 8, MAP_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_MapObjects, Route131_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc
deleted file mode 100644
index 3e1287b7d..000000000
--- a/data/maps/events/Route132.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route132_MapObjects: @ 852CB90
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0
-	object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0
-	object_event 10, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc
deleted file mode 100644
index c6cb4ac3b..000000000
--- a/data/maps/events/Route133.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route133_MapObjects: @ 852CC94
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0
-	object_event 10, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc
deleted file mode 100644
index 6905f533f..000000000
--- a/data/maps/events/Route134.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route134_MapObjects: @ 852CD98
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0
-	object_event 11, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
deleted file mode 100644
index 26a0c1a11..000000000
--- a/data/maps/events/RustboroCity.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-RustboroCity_MapObjects: @ 85267E0
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0
-	object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0
-	object_event 15, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0
-	object_event 16, MAP_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_MapObjects, 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 1e779cb1e..000000000
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_CuttersHouse_MapObjects: @ 8530A1C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 5a92ba2fc..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-RustboroCity_DevonCorp_1F_MapObjects: @ 853037C
-	object_event 1, MAP_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, MAP_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, MAP_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_MapObjects, 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 a84456e44..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_2F_MapObjects: @ 8530408
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 ec2d22707..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RustboroCity_DevonCorp_3F_MapObjects: @ 85304BC
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 93185e0fd..000000000
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_Flat1_1F_MapObjects: @ 8530890
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 0fa012eda..000000000
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-RustboroCity_Flat1_2F_MapObjects: @ 85308EC
-	object_event 1, MAP_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, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 937d1afb9..000000000
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_Flat2_1F_MapObjects: @ 8530AC4
-	object_event 1, MAP_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 2ea886e54..000000000
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_Flat2_2F_MapObjects: @ 8530B20
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 44c5bc37a..000000000
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_Flat2_3F_MapObjects: @ 8530B74
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 dc395c064..000000000
--- a/data/maps/events/RustboroCity_Gym.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RustboroCity_Gym_MapObjects: @ 8530538
-	object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 eee616f8a..000000000
--- a/data/maps/events/RustboroCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_House1_MapObjects: @ 85309C8
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 b4a00970f..000000000
--- a/data/maps/events/RustboroCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_House2_MapObjects: @ 8530A70
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 09cf245e0..000000000
--- a/data/maps/events/RustboroCity_House3.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_House3_MapObjects: @ 8530BC0
-	object_event 1, MAP_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, MAP_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, MAP_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_MapObjects, 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 28b614d47..000000000
--- a/data/maps/events/RustboroCity_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-RustboroCity_Mart_MapObjects: @ 853080C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 9c44870ad..000000000
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_PokemonCenter_1F_MapObjects: @ 85306F4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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_MapObjects, 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 71defda3d..000000000
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_PokemonCenter_2F_MapObjects: @ 8530780
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 3facee89a..000000000
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-RustboroCity_PokemonSchool_MapObjects: @ 85305EC
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0
-	object_event 5, MAP_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, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 94846323a..000000000
--- a/data/maps/events/RusturfTunnel.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-RusturfTunnel_MapObjects: @ 85341C4
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0
-	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0
-	object_event 9, MAP_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0
-	object_event 10, MAP_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_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
-
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc
deleted file mode 100644
index 5d6d73288..000000000
--- a/data/maps/events/SSTidalCorridor.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-SSTidalCorridor_MapObjects: @ 853A158
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0
-	object_event 5, MAP_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_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
-
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc
deleted file mode 100644
index 0ce76cf29..000000000
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SSTidalLowerDeck_MapObjects: @ 853A2BC
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
-
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc
deleted file mode 100644
index 81648162b..000000000
--- a/data/maps/events/SSTidalRooms.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-SSTidalRooms_MapObjects: @ 853A314
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 e8ace6482..000000000
--- a/data/maps/events/SafariZone_North.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_North_MapObjects: @ 853B160
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0
-	object_event 9, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
deleted file mode 100644
index 84505d6e6..000000000
--- a/data/maps/events/SafariZone_Northeast.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SafariZone_Northeast_MapObjects: @ 853B968
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 64152d008..000000000
--- a/data/maps/events/SafariZone_Northwest.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SafariZone_Northwest_MapObjects: @ 853B11C
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc
deleted file mode 100644
index 863c3113a..000000000
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SafariZone_RestHouse_MapObjects: @ 853B8FC
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 4a0ead84c..000000000
--- a/data/maps/events/SafariZone_South.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_South_MapObjects: @ 853B2A4
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 3970e6eb0..000000000
--- a/data/maps/events/SafariZone_Southeast.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SafariZone_Southeast_MapObjects: @ 853BA6C
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0
-	object_event 3, MAP_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, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 9edb33ddb..000000000
--- a/data/maps/events/SafariZone_Southwest.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SafariZone_Southwest_MapObjects: @ 853B24C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 f5c878466..000000000
--- a/data/maps/events/ScorchedSlab.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-ScorchedSlab_MapObjects: @ 8536F88
-	object_event 1, MAP_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_MapObjects, 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 3a41757e2..000000000
--- a/data/maps/events/SeafloorCavern_Entrance.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SeafloorCavern_Entrance_MapObjects: @ 85356BC
-	object_event 1, MAP_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_MapObjects, 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 4a219357c..000000000
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room1_MapObjects: @ 85356F8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0
-	object_event 4, MAP_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, MAP_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_MapObjects, 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 cf0c2dfad..000000000
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room2_MapObjects: @ 853579C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 964b45a6d..000000000
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room3_MapObjects: @ 8535890
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0
-	object_event 8, MAP_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, MAP_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_MapObjects, 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 79d57dd72..000000000
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SeafloorCavern_Room4_MapObjects: @ 8535994
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 b88a862ab..000000000
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SeafloorCavern_Room5_MapObjects: @ 85359F8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 7fd65fc08..000000000
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SeafloorCavern_Room8_MapObjects: @ 8535B04
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0
-	object_event 12, MAP_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_MapObjects, 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 bcd27d030..000000000
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SeafloorCavern_Room9_MapObjects: @ 8535C48
-	object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0
-	object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 eb92a3851..000000000
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave1_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 e2db7471f..000000000
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave2_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 cc5606ac4..000000000
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave3_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 0efdf765d..000000000
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BlueCave4_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 7755a5a09..000000000
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave1_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 37a1387bf..000000000
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave2_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 14c9905a2..000000000
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave3_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 543cb0072..000000000
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_BrownCave4_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 ebc15ecd7..000000000
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave1_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 ef7958e9a..000000000
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave2_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 65dc43026..000000000
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave3_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 274a459cd..000000000
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_RedCave4_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 e20d76bc2..000000000
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub1_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 23d023b31..000000000
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub2_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 5fe624dc3..000000000
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub3_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 ad432f6ff..000000000
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Shrub4_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 149d5dea3..000000000
--- a/data/maps/events/SecretBase_Tree1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree1_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 16037e22f..000000000
--- a/data/maps/events/SecretBase_Tree2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree2_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 6fbd60683..000000000
--- a/data/maps/events/SecretBase_Tree3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree3_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 4032d668a..000000000
--- a/data/maps/events/SecretBase_Tree4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_Tree4_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 7d604b093..000000000
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave1_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 592595aa8..000000000
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave2_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 bd1f69b1a..000000000
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave3_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 fe52f12bb..000000000
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave4_MapObjects: @ 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, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0
-	object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0
-	object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0
-	object_event 7, MAP_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_MapObjects, 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 b19a293ef..000000000
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-ShoalCave_LowTideEntranceRoom_MapObjects: @ 853627C
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 a02a20864..000000000
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-ShoalCave_LowTideIceRoom_MapObjects: @ 8537100
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 8fe34709b..000000000
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-ShoalCave_LowTideInnerRoom_MapObjects: @ 85362E0
-	object_event 1, MAP_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_MapObjects, 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 384b6570f..000000000
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-ShoalCave_LowTideLowerRoom_MapObjects: @ 85363DC
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 6592f68d7..000000000
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-ShoalCave_LowTideStairsRoom_MapObjects: @ 8536394
-	object_event 1, MAP_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_MapObjects, 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 ad8a393d6..000000000
--- a/data/maps/events/SingleBattleColosseum.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SingleBattleColosseum_MapObjects: @ 8539D44
-	object_event 1, MAP_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_MapObjects, 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 70a9c5c21..000000000
--- a/data/maps/events/SkyPillar_Outside.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SkyPillar_Outside_MapObjects: @ 853701C
-	object_event 1, MAP_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_MapObjects, 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 8abe8401f..000000000
--- a/data/maps/events/SkyPillar_Top.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SkyPillar_Top_MapObjects: @ 8537170
-	object_event 1, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 a187aaf1f..000000000
--- a/data/maps/events/SlateportCity.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-SlateportCity_MapObjects: @ 85261CC
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0
-	object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0
-	object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0
-	object_event 12, MAP_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0
-	object_event 19, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0
-	object_event 20, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0
-	object_event 25, MAP_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0
-	object_event 27, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0
-	object_event 28, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0
-	object_event 29, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0
-	object_event 30, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0
-	object_event 31, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0
-	object_event 32, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0
-	object_event 33, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0
-	object_event 34, MAP_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0
-	object_event 35, MAP_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_MapObjects, 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 8c13a223a..000000000
--- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SlateportCity_BattleTentBattleRoom_MapObjects: @ 852F4DC
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc
deleted file mode 100644
index acd0f732c..000000000
--- a/data/maps/events/SlateportCity_BattleTentCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SlateportCity_BattleTentCorridor_MapObjects: @ 852F4B0
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc
deleted file mode 100644
index 7b0f10331..000000000
--- a/data/maps/events/SlateportCity_BattleTentLobby.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SlateportCity_BattleTentLobby_MapObjects: @ 852F408
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 307cfd1c2..000000000
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SlateportCity_Harbor_MapObjects: @ 852FA68
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0
-	object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0
-	object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0
-	object_event 8, MAP_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_MapObjects, 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 d5151a0a1..000000000
--- a/data/maps/events/SlateportCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SlateportCity_House1_MapObjects: @ 852F538
-	object_event 1, MAP_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_MapObjects, 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 f77f34456..000000000
--- a/data/maps/events/SlateportCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SlateportCity_House2_MapObjects: @ 852FB9C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 bab6768de..000000000
--- a/data/maps/events/SlateportCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SlateportCity_Mart_MapObjects: @ 852FCF0
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 1ae29ed6f..000000000
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-SlateportCity_OceanicMuseum_1F_MapObjects: @ 852F670
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
-	object_event 2, MAP_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, MAP_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, MAP_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, MAP_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, MAP_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, MAP_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0
-	object_event 8, MAP_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, MAP_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, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0
-	object_event 11, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 5c3f7108d..000000000
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-SlateportCity_OceanicMuseum_2F_MapObjects: @ 852F8A8
-	object_event 1, MAP_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, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0
-	object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0
-	object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0
-	object_event 5, MAP_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, MAP_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, MAP_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_MapObjects, 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 52f406b71..000000000
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SlateportCity_PokemonCenter_1F_MapObjects: @ 852FBF0
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 cd9f74d39..000000000
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SlateportCity_PokemonCenter_2F_MapObjects: @ 852FC64
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 ba18519ef..000000000
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SlateportCity_PokemonFanClub_MapObjects: @ 852F574
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0
-	object_event 2, MAP_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, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 07e93e516..000000000
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SlateportCity_SternsShipyard_1F_MapObjects: @ 852F318
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 d43e45568..000000000
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SlateportCity_SternsShipyard_2F_MapObjects: @ 852F3A4
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_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, MAP_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_MapObjects, 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 6f3bb0111..000000000
--- a/data/maps/events/SootopolisCity.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-SootopolisCity_MapObjects: @ 8527314
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0
-	object_event 7, MAP_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0
-	object_event 10, MAP_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0
-	object_event 11, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0
-	object_event 12, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0
-	object_event 13, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0
-	object_event 14, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0
-	object_event 15, MAP_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0
-	object_event 17, MAP_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0
-	object_event 18, MAP_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_MapObjects, 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 b348cebcf..000000000
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SootopolisCity_Gym_1F_MapObjects: @ 8532FF4
-	object_event 1, MAP_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 9e0dcbadd..000000000
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SootopolisCity_Gym_B1F_MapObjects: @ 8533068
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0
-	object_event 3, MAP_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, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0
-	object_event 6, MAP_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, MAP_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0
-	object_event 9, MAP_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, MAP_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_MapObjects, 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 b7eb626e0..000000000
--- a/data/maps/events/SootopolisCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House1_MapObjects: @ 85332F8
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 98b1b6712..000000000
--- a/data/maps/events/SootopolisCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House2_MapObjects: @ 853334C
-	object_event 1, MAP_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_MapObjects, 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 eaf48fd6e..000000000
--- a/data/maps/events/SootopolisCity_House3.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House3_MapObjects: @ 8533388
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 eb41cbafb..000000000
--- a/data/maps/events/SootopolisCity_House4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SootopolisCity_House4_MapObjects: @ 85333DC
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 5bffec912..000000000
--- a/data/maps/events/SootopolisCity_House5.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House5_MapObjects: @ 8533448
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 5f0f5d430..000000000
--- a/data/maps/events/SootopolisCity_House6.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House6_MapObjects: @ 853349C
-	object_event 1, MAP_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_MapObjects, 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 3a18508a2..000000000
--- a/data/maps/events/SootopolisCity_House7.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House7_MapObjects: @ 85334D8
-	object_event 1, MAP_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, MAP_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_MapObjects, 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 0dcb79d1b..000000000
--- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_LotadAndSeedotHouse_MapObjects: @ 853352C
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 de29f556b..000000000
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SootopolisCity_Mart_MapObjects: @ 853328C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 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 69865a2aa..000000000
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_MysteryEventsHouse_1F_MapObjects: @ 8533598
-	object_event 1, MAP_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_MapObjects, 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 2a02e72f2..000000000
--- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SootopolisCity_MysteryEventsHouse_B1F_MapObjects: @ 85335DC
-	object_event 1, MAP_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_MapObjects, 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 669ce88ae..000000000
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_PokemonCenter_1F_MapObjects: @ 8533174
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 d063a7666..000000000
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_PokemonCenter_2F_MapObjects: @ 8533200
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 7c6bc4128..000000000
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SouthernIsland_Exterior_MapObjects: @ 853B83C
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 a304f1832..000000000
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SouthernIsland_Interior_MapObjects: @ 853B89C
-	object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 0e3c0f0bb..000000000
--- a/data/maps/events/TerraCave_End.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-TerraCave_End_MapObjects: @ 8537850
-	object_event 1, MAP_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_MapObjects, 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 dea4f52c3..000000000
--- a/data/maps/events/TradeCenter.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-TradeCenter_MapObjects: @ 8539DA0
-	object_event 1, MAP_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_MapObjects, 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 873495876..000000000
--- a/data/maps/events/TrainerHill_Elevator.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-TrainerHill_Elevator_MapObjects: @ 853DD84
-	object_event 1, MAP_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_MapObjects, 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 a5574755b..000000000
--- a/data/maps/events/TrainerHill_Entrance.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-TrainerHill_Entrance_MapObjects: @ 853D874
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 4f48ef724..000000000
--- a/data/maps/events/TrainerHill_Roof.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-TrainerHill_Roof_MapObjects: @ 853D9C4
-	object_event 1, MAP_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_MapObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/Underwater1.inc b/data/maps/events/Underwater1.inc
deleted file mode 100644
index 08cf19a4c..000000000
--- a/data/maps/events/Underwater1.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Underwater1_MapBGEvents: @ 852CEB4
-	bg_event 42, 51, 0, 7, 0, ITEM_CARBOS, 8, 0
-	bg_event 14, 40, 0, 7, 0, ITEM_GREEN_SHARD, 9, 0
-	bg_event 66, 34, 3, 7, 0, ITEM_PEARL, 10, 0
-	bg_event 64, 54, 3, 7, 0, ITEM_BIG_PEARL, 11, 0
-	bg_event 70, 64, 3, 7, 0, ITEM_HEART_SCALE, 13, 0
-	bg_event 42, 5, 3, 7, 0, ITEM_CALCIUM, 36, 0
-	bg_event 45, 36, 3, 7, 0, ITEM_HEART_SCALE, 38, 0
-
-Underwater1_MapEvents:: @ 852CF08
-	map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents
-
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 b284db78f..000000000
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Underwater_SeafloorCavern_MapObjects: @ 8535640
-	object_event 1, MAP_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, MAP_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, MAP_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, MAP_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_MapObjects, 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 be9b40243..000000000
--- a/data/maps/events/UnionRoom.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-UnionRoom_MapObjects: @ 853B020
-	object_event 1, MAP_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0
-	object_event 2, MAP_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, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0
-	object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0
-	object_event 7, MAP_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0
-	object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0
-	object_event 9, MAP_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_MapObjects, UnionRoom_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc
deleted file mode 100644
index 0fcbef3a3..000000000
--- a/data/maps/events/UnknownMap_25_34.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-UnknownMap_25_34_MapEvents:: @ 853A064
-	map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc
deleted file mode 100644
index 7738701b2..000000000
--- a/data/maps/events/VerdanturfTown.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-VerdanturfTown_MapObjects: @ 8527CDC
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 0db3fc920..000000000
--- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-VerdanturfTown_BattleTentBattleRoom_MapObjects: @ 852E734
-	object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
deleted file mode 100644
index 7ec4cee10..000000000
--- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-VerdanturfTown_BattleTentCorridor_MapObjects: @ 852E708
-	object_event 1, MAP_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_MapObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc
deleted file mode 100644
index d6b5818da..000000000
--- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-VerdanturfTown_BattleTentLobby_MapObjects: @ 852E648
-	object_event 1, MAP_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, MAP_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0
-	object_event 6, MAP_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_MapObjects, 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 2441d8d41..000000000
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-VerdanturfTown_FriendshipRatersHouse_MapObjects: @ 852E9C8
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 803f9f666..000000000
--- a/data/maps/events/VerdanturfTown_House.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-VerdanturfTown_House_MapObjects: @ 852EA1C
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0
-	object_event 2, MAP_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_MapObjects, 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 6d6ca6a5d..000000000
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-VerdanturfTown_Mart_MapObjects: @ 852E790
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 9534ca9c7..000000000
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_PokemonCenter_1F_MapObjects: @ 852E814
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0
-	object_event 3, MAP_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, MAP_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_MapObjects, 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 2649066d8..000000000
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_PokemonCenter_2F_MapObjects: @ 852E8A0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0
-	object_event 4, MAP_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_MapObjects, 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 2089da649..000000000
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_WandasHouse_MapObjects: @ 852E92C
-	object_event 1, MAP_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0
-	object_event 5, MAP_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_MapObjects, 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 db3554ed4..000000000
--- a/data/maps/events/VictoryRoad_1F.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-VictoryRoad_1F_MapObjects: @ 8535E04
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0
-	object_event 7, MAP_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0
-	object_event 9, MAP_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_MapObjects, 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 6c57f0662..000000000
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-VictoryRoad_B1F_MapObjects: @ 8535F44
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0
-	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0
-	object_event 20, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0
-	object_event 21, MAP_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_MapObjects, 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 09fdb466f..000000000
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-VictoryRoad_B2F_MapObjects: @ 8536188
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0
-	object_event 7, MAP_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_MapObjects, 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/party_menu.s b/data/party_menu.s
index ebd596870..eedcd4377 100644
--- a/data/party_menu.s
+++ b/data/party_menu.s
@@ -431,7 +431,7 @@ gUnknown_08615D7E:: @ 8615D7E
 
 	.align 2
 gUnknown_08615D9C:: @ 8615D9C
-	.4byte sub_80D3718, 0x00000007
+	.4byte SetUpFieldMove_Cut, 0x00000007
 	.4byte SetUpFieldMove_Flash, 0x0000000d
 	.4byte SetUpFieldMove_RockSmash, 0x0000000d
 	.4byte SetUpFieldMove_Strength, 0x0000000d
diff --git a/data/rom_8011DC0.s b/data/rom_8011DC0.s
index bcc7dcd1b..2d7e09958 100644
--- a/data/rom_8011DC0.s
+++ b/data/rom_8011DC0.s
@@ -1315,7 +1315,7 @@ gUnknown_082F0184:: @ 82F0184
 	.align 2
 gUnknown_082F0204:: @ 82F0204 struct ListMenuTemplate
 	.4byte gUnknown_082F0184
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte sub_8013DF4
 	.byte 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x40, 0x01
@@ -1351,7 +1351,7 @@ gUnknown_082F0264:: @ 82F0264
 	.align 2
 gUnknown_082F027C:: @ 82F027C
 	.4byte gUnknown_082F0264
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte NULL
 	.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x00, 0x01
@@ -1384,7 +1384,7 @@ gUnknown_082F029C:: @ 82F029C
 	.align 2
 gUnknown_082F032C:: @ 82F032C
 	.4byte gUnknown_082F029C
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte NULL
 	.byte 0x12, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x00, 0x01
@@ -1413,7 +1413,7 @@ gUnknown_082F0354:: @ 82F0354
 	.align 2
 gUnknown_082F03A4:: @ 82F03A4
 	.4byte gUnknown_082F0354
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte sub_8017BE8
 	.byte 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0xe1, 0xdf, 0x00, 0x01
@@ -1442,7 +1442,7 @@ gUnknown_082F03C4:: @ 82F03C4
 
 	.align 2
 	.4byte gUnknown_082F03C4
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte nullsub_14
 	.byte 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x40, 0x01
@@ -1637,7 +1637,7 @@ gUnknown_082F0620:: @ 82F0620
 	.align 2
 gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate
 	.4byte NULL
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte NULL
 	.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x00, 0x01
@@ -1669,7 +1669,7 @@ gUnknown_082F06A0:: @ 82F06A0
 	.align 2
 gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate
 	.4byte gUnknown_082F0650
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte NULL
 	.byte 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x00, 0x01
@@ -1677,7 +1677,7 @@ gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate
 	.align 2
 gUnknown_082F06C8:: @ 82F06C8
 	.4byte gUnknown_082F0670
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte NULL
 	.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x00, 0x01
@@ -1685,7 +1685,7 @@ gUnknown_082F06C8:: @ 82F06C8
 	.align 2
 gUnknown_082F06E0:: @ 82F06E0
 	.4byte gUnknown_082F0688
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte NULL
 	.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x00, 0x01
@@ -1693,7 +1693,7 @@ gUnknown_082F06E0:: @ 82F06E0
 	.align 2
 gUnknown_082F06F8:: @ 82F06F8
 	.4byte gUnknown_082F06A0
-	.4byte sub_81AF078
+	.4byte ListMenuDefaultCursorMoveFunc
 	.4byte NULL
 	.byte 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00
 	.byte 0x21, 0x31, 0x00, 0x01
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 2828036e0..1fda1133f 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,5 +1,5 @@
 BerryTreeScript:: @ 82742F9
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	switch VAR_0x8004
 	case 255, Route102_EventScript_27434F
 	case 0, Route102_EventScript_274359
@@ -54,7 +54,7 @@ Route102_EventScript_2743AF:: @ 82743AF
 
 Route102_EventScript_2743B1:: @ 82743B1
 	lockall
-	special FieldObjectInteractionGetBerryCountString
+	special EventObjectInteractionGetBerryCountString
 	message Route102_Text_274560
 	waitmessage
 	waitbuttonpress
@@ -62,7 +62,7 @@ Route102_EventScript_2743B1:: @ 82743B1
 
 Route102_EventScript_2743C1:: @ 82743C1
 	lockall
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_274579
 	waitmessage
 	waitbuttonpress
@@ -70,7 +70,7 @@ Route102_EventScript_2743C1:: @ 82743C1
 
 Route102_EventScript_2743D1:: @ 82743D1
 	lockall
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_27458A
 	waitmessage
 	waitbuttonpress
@@ -79,7 +79,7 @@ Route102_EventScript_2743D1:: @ 82743D1
 Route102_EventScript_2743E1:: @ 82743E1
 	call Route102_EventScript_2743F6
 	lockall
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_2745AB
 	waitmessage
 	waitbuttonpress
@@ -105,7 +105,7 @@ Route102_EventScript_274421:: @ 8274421
 	buffernumberstring 1, VAR_0x8006
 	lock
 	faceplayer
-	special FieldObjectInteractionGetBerryCountString
+	special EventObjectInteractionGetBerryCountString
 	msgbox Route102_Text_2745EE, 5
 	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_274448
@@ -113,11 +113,11 @@ Route102_EventScript_274421:: @ 8274421
 	goto_eq Route102_EventScript_274479
 
 Route102_EventScript_274448:: @ 8274448
-	special FieldObjectInteractionPickBerryTree
+	special EventObjectInteractionPickBerryTree
 	compare VAR_0x8004, 0
 	goto_eq Route102_EventScript_274470
 	special sub_80EED34
-	special FieldObjectInteractionRemoveBerryTree
+	special EventObjectInteractionRemoveBerryTree
 	message Route102_Text_27461B
 	playfanfare MUS_ME_KINOMI
 	waitmessage
@@ -145,7 +145,7 @@ Route102_EventScript_274479:: @ 8274479
 
 Route102_EventScript_274482:: @ 8274482
 	lockall
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	call Route102_EventScript_2744DD
 	releaseall
 	end
@@ -154,7 +154,7 @@ Route102_EventScript_27448D:: @ 827448D
 	checkitem ITEM_WAILMER_PAIL, 1
 	compare VAR_RESULT, 0
 	goto_eq Route102_EventScript_2744BE
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	msgbox Route102_Text_2746E4, 5
 	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_2744C4
@@ -166,14 +166,14 @@ Route102_EventScript_2744BE:: @ 82744BE
 	end
 
 Route102_EventScript_2744C0:: @ 82744C0
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	lockall
 
 Route102_EventScript_2744C4:: @ 82744C4
-	special FieldObjectInteractionGetBerryName
+	special EventObjectInteractionGetBerryName
 	message Route102_Text_274710
 	waitmessage
-	special FieldObjectInteractionWaterBerryTree
+	special EventObjectInteractionWaterBerryTree
 	special sub_80FAFF8
 	waitstate
 	message Route102_Text_274723
@@ -183,10 +183,10 @@ Route102_EventScript_2744C4:: @ 82744C4
 	end
 
 Route102_EventScript_2744DD:: @ 82744DD
-	special FieldObjectInteractionPlantBerryTree
+	special EventObjectInteractionPlantBerryTree
 	incrementgamestat 3
 	special sub_80EED10
-	special FieldObjectInteractionGetBerryCountString
+	special EventObjectInteractionGetBerryCountString
 	message Route102_Text_274535
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 9a34d2e61..adf02ddd0 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -342,8 +342,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
 	end
 
 OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10
-	step_up
-	step_up
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13
@@ -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
@@ -736,52 +736,52 @@ OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F
 	end
 
 OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349
-	step_00
+	face_down
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B
-	step_03
+	face_right
 	step_end
 
 MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D
 OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D
-	step_02
+	face_left
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F
-	step_down
-	step_down
+	walk_down
+	walk_down
 	step_end
 
 Movement_277352: @ 8277352
-	step_right
-	step_up
-	step_up
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356
-	step_left
-	step_up
-	step_up
+	walk_left
+	walk_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A
-	step_up
+	walk_up
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C
-	step_02
+	face_left
 	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E
-	step_03
+	face_right
 	step_end
 
 MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360
-	step_left
-	step_up
-	step_up
-	step_up
+	walk_left
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 gUnknown_08277365:: @ 8277365
@@ -999,7 +999,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B
 	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
 	copyvar VAR_0x8007, VAR_LAST_TALKED
-	specialvar VAR_RESULT, sub_80093CC
+	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668
 	message OldaleTown_PokemonCenter_2F_Text_27940D
@@ -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
@@ -1108,7 +1108,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4
 	specialvar VAR_RESULT, sub_813990C
 	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
-	specialvar VAR_RESULT, sub_80093CC
+	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13
 	message OldaleTown_PokemonCenter_2F_Text_279013
@@ -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
@@ -1396,7 +1396,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A
 	lockall
 	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F
-	specialvar VAR_RESULT, sub_80093CC
+	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	compare VAR_RESULT, 0
 	goto_eq EventScript_277BB4
 	fadescreen 1
@@ -1495,7 +1495,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91
 	faceplayer
 	message MossdeepCity_GameCorner_1F_Text_278CEB
 	waitmessage
-	specialvar VAR_RESULT, sub_80093CC
+	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	compare VAR_RESULT, 0
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48
 	delay 60
@@ -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/contest_hall.inc b/data/scripts/contest_hall.inc
index 08af093ef..d89c78f18 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1248,186 +1248,186 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF
 	return
 
 LinkContestRoom1_Movement_27AD09: @ 827AD09
-	step_down
+	walk_down
 	step_end
 
 LinkContestRoom1_Movement_27AD0B: @ 827AD0B
-	step_40
-	step_up
-	step_41
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD0F: @ 827AD0F
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 LinkContestRoom1_Movement_27AD11: @ 827AD11
-	step_58
+	emote_heart
 	step_end
 
 LinkContestRoom1_Movement_27AD13: @ 827AD13
-	step_25
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD15: @ 827AD15
-	step_left
-	step_left
-	step_25
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD19: @ 827AD19
-	step_right
-	step_right
-	step_25
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD1D: @ 827AD1D
-	step_up
-	step_25
+	walk_up
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD20: @ 827AD20
-	step_14
-	step_14
+	delay_16
+	delay_16
 	step_end
 
 LinkContestRoom1_Movement_27AD23: @ 827AD23
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 LinkContestRoom1_Movement_27AD25: @ 827AD25
-	step_27
+	walk_in_place_fastest_left
 	step_end
 
 LinkContestRoom1_Movement_27AD27: @ 827AD27
-	step_25
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD29: @ 827AD29
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 LinkContestRoom1_Movement_27AD2D: @ 827AD2D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
 	step_end
 
 LinkContestRoom1_Movement_27AD33: @ 827AD33
-	step_02
-	step_14
-	step_4e
+	face_left
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD37: @ 827AD37
-	step_01
-	step_14
-	step_4e
+	face_up
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD3B: @ 827AD3B
-	step_03
-	step_14
-	step_4e
+	face_right
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD3F: @ 827AD3F
-	step_00
-	step_14
-	step_4e
+	face_down
+	delay_16
+	face_original_direction
 	step_end
 
 LinkContestRoom1_Movement_27AD43: @ 827AD43
-	step_01
+	face_up
 	step_end
 
 LinkContestRoom1_Movement_27AD45: @ 827AD45
-	step_01
-	step_14
-	step_28
+	face_up
+	delay_16
+	walk_in_place_fastest_right
 	step_end
 
 LinkContestRoom1_Movement_27AD49: @ 827AD49
-	step_27
-	step_14
-	step_14
-	step_25
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD4E: @ 827AD4E
-	step_14
-	step_14
-	step_25
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 LinkContestRoom1_Movement_27AD52: @ 827AD52
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD58: @ 827AD58
-	step_17
-	step_17
-	step_17
-	step_15
-	step_26
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD5E: @ 827AD5E
-	step_up
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD62: @ 827AD62
-	step_17
-	step_15
-	step_26
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD66: @ 827AD66
-	step_up
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD6A: @ 827AD6A
-	step_18
-	step_15
-	step_26
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD6E: @ 827AD6E
-	step_up
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD74: @ 827AD74
-	step_18
-	step_18
-	step_18
-	step_15
-	step_26
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
 	step_end
 
 LinkContestRoom1_Movement_27AD7A: @ 827AD7A
-	step_right
-	step_right
-	step_up
+	walk_right
+	walk_right
+	walk_up
 	step_end
 
 LinkContestRoom1_Movement_27AD7E: @ 827AD7E
-	step_up
+	walk_up
 	step_end
 
 LinkContestRoom1_EventScript_27AD80:: @ 827AD80
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 07ed1b82d..d9b8a89ac 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -240,25 +240,25 @@ Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D
 	end
 
 Route117_PokemonDayCare_Movement_291F47: @ 8291F47
-	step_14
-	step_14
-	step_02
-	step_14
-	step_14
-	step_03
-	step_14
-	step_14
-	step_01
-	slow_step_up
-	step_54
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_00
-	step_55
-	slow_step_down
+	delay_16
+	delay_16
+	face_left
+	delay_16
+	delay_16
+	face_right
+	delay_16
+	delay_16
+	face_up
+	walk_slow_up
+	set_invisible
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_down
+	set_visible
+	walk_slow_down
 	step_end
 
 Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 44631cc20..df25056ea 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -43,7 +43,7 @@ Route103_EventScript_290710:: @ 8290710
 	end
 
 Route103_Movement_29071F: @ 829071F
-	step_5b
+	cut_tree
 	step_end
 
 Route103_EventScript_290721:: @ 8290721
@@ -128,7 +128,7 @@ Route111_EventScript_290829:: @ 8290829
 	end
 
 Route111_Movement_29082B: @ 829082B
-	step_5a
+	rock_smash_break
 	step_end
 
 Route111_EventScript_29082D:: @ 829082D
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 269ef2530..5a03a0e98 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -213,7 +213,7 @@ Route120_EventScript_28CF36:: @ 828CF36
 
 Route111_EventScript_28CF56:: @ 828CF56
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, 2
 	call_if 1, Route111_EventScript_28CF94
 	compare VAR_FACING, 1
@@ -247,7 +247,7 @@ Route111_EventScript_28CFC3:: @ 828CFC3
 Route118_EventScript_28CFC3:: @ 828CFC3
 Route120_EventScript_28CFC3:: @ 828CFC3
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, 2
 	call_if 1, Route111_EventScript_28CF94
 	compare VAR_FACING, 1
@@ -270,15 +270,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3
 	end
 
 Route111_Movement_28D04D: @ 828D04D
-	step_1d
+	walk_in_place_down
 	step_end
 
 Route111_Movement_28D04F: @ 828D04F
-	step_1e
+	walk_in_place_up
 	step_end
 
 Route111_Movement_28D051: @ 828D051
-	step_1f
+	walk_in_place_left
 	step_end
 
 Route111_EventScript_28D053:: @ 828D053
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/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
deleted file mode 100644
index ccf8997d7..000000000
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ /dev/null
@@ -1,160 +0,0 @@
-AquaHideout_B2F_MapScripts:: @ 8233DCF
-	map_script 3, AquaHideout_B2F_MapScript1_233DD5
-	.byte 0
-
-AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
-	checkflag FLAG_0x070
-	call_if 1, AquaHideout_B2F_EventScript_233DDF
-	end
-
-AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF
-	setvar VAR_TEMP_1, 1
-	return
-
-AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
-	lockall
-	setvar VAR_0x8008, 1
-	playse SE_PIN
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598
-	waitmovement 0
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
-	waitmovement 0
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-AquaHideout_B2F_EventScript_233E09:: @ 8233E09
-	trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
-	msgbox AquaHideout_B2F_Text_233FF2, 4
-	release
-	end
-
-AquaHideout_B2F_EventScript_233E25:: @ 8233E25
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 4
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
-	waitmovement 0
-	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
-	waitmovement 0
-	msgbox AquaHideout_B2F_Text_233FA6, 4
-	closemessage
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
-	applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
-	waitmovement 0
-	removeobject VAR_0x8009
-	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
-	waitmovement 0
-	msgbox AquaHideout_B2F_Text_233FF2, 4
-	setflag FLAG_0x070
-	setflag FLAG_0x354
-	release
-	end
-
-AquaHideout_B2F_Movement_233E80: @ 8233E80
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-AquaHideout_B2F_Movement_233E85: @ 8233E85
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A
-	trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
-	msgbox AquaHideout_B2F_Text_234112, 6
-	end
-
-AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5
-	msgbox AquaHideout_B2F_Text_234112, 4
-	release
-	end
-
-AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF
-	trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
-	msgbox AquaHideout_B2F_Text_2341FE, 6
-	end
-
-AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6
-	trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
-	msgbox AquaHideout_B2F_Text_2342FF, 6
-	end
-
-AquaHideout_B2F_Text_233EDD: @ 8233EDD
-	.string "Hehehe…\p"
-	.string "Got here already, did you?\n"
-	.string "We underestimated you!\p"
-	.string "But this is it!\p"
-	.string "I’m a cut above the GRUNTS you’ve seen\n"
-	.string "so far.\p"
-	.string "I’m not stalling for time.\n"
-	.string "I’m going to pulverize you!$"
-
-AquaHideout_B2F_Text_233F8D: @ 8233F8D
-	.string "Hehehe…\n"
-	.string "So, I lost, too…$"
-
-AquaHideout_B2F_Text_233FA6: @ 8233FA6
-	.string "Hehehe!\p"
-	.string "While I was toying with you, our BOSS\n"
-	.string "got through his preparations!$"
-
-AquaHideout_B2F_Text_233FF2: @ 8233FF2
-	.string "Hehehe!\p"
-	.string "Our BOSS has already gone on his way to\n"
-	.string "some cave under the sea!\p"
-	.string "If you’re going to give chase, you’d\n"
-	.string "better search the big, wide sea beyond\l"
-	.string "LILYCOVE.\p"
-	.string "But will you find it then?\n"
-	.string "Hehehe!$"
-
-AquaHideout_B2F_Text_2340B4: @ 82340B4
-	.string "Wahahah, I grew weary of waiting!\n"
-	.string "You owe me a battle, too!$"
-
-AquaHideout_B2F_Text_2340F0: @ 82340F0
-	.string "Tired of waiting…\n"
-	.string "Lost and dazed…$"
-
-AquaHideout_B2F_Text_234112: @ 8234112
-	.string "BOSS…\n"
-	.string "Is this good enough?$"
-
-AquaHideout_B2F_Text_23412D: @ 823412D
-	.string "Warp panels, the HIDEOUT’s pride\n"
-	.string "and joy!\p"
-	.string "You’re clueless about where you are,\n"
-	.string "aren’t you?\p"
-	.string "Fluster and tire out the enemy, then\n"
-	.string "lower the boom! That’s our plan!$"
-
-AquaHideout_B2F_Text_2341CE: @ 82341CE
-	.string "What’s wrong with you?\n"
-	.string "You’re not tired at all!$"
-
-AquaHideout_B2F_Text_2341FE: @ 82341FE
-	.string "That reminds me… I can’t remember\n"
-	.string "where I put the MASTER BALL.\p"
-	.string "If I fail to guard it, our BOSS will\n"
-	.string "chew me out…$"
-
-AquaHideout_B2F_Text_23426F: @ 823426F
-	.string "When I joined TEAM AQUA, the first\n"
-	.string "thing I had to learn was how these\l"
-	.string "warp panels connected.$"
-
-AquaHideout_B2F_Text_2342CC: @ 82342CC
-	.string "I was too occupied thinking about\n"
-	.string "the warp panels…$"
-
-AquaHideout_B2F_Text_2342FF: @ 82342FF
-	.string "I’ll have to learn about how I can\n"
-	.string "battle more effectively…$"
-
diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
deleted file mode 100644
index 2f952936f..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
-	step_right
-	step_right
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4
-	step_right
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5
-	step_right
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7
-	step_left
-	step_left
-	step_28
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB
-	step_26
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED
-	step_28
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF
-	step_left
-	step_left
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1
-	step_left
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2
-	step_left
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02
-	step_51
-	step_46
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05
-	step_51
-	step_47
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08
-	step_25
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A
-	step_28
-	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
-	step_down
-	step_27
-	step_14
-	step_14
-	step_14
-	step_14
-	step_up
-	step_up
-	step_27
-	step_end
-
-BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A
-	step_down
-	step_27
-	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 cecd5b44c..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
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C
-	step_right
-	step_54
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444
-	step_27
-	step_end
-
-BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446
-	step_up
-	step_25
-	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 68ac57fcd..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
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C
-	step_up
-	step_up
-	step_54
-	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
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	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 52981a07d..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
-	step_54
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775
-	step_55
-	step_14
-	step_up
-	step_up
-	step_up
-	step_right
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B
-	step_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D
-	step_up
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F
-	step_55
-	step_14
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787
-	step_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789
-	step_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B
-	step_01
-	step_54
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E
-	step_55
-	step_up
-	step_up
-	step_up
-	step_02
-	step_13
-	step_12
-	step_00
-	step_13
-	step_12
-	step_03
-	step_13
-	step_12
-	step_01
-	step_13
-	step_12
-	step_02
-	step_14
-	step_16
-	step_16
-	step_02
-	step_13
-	step_12
-	step_00
-	step_13
-	step_12
-	step_03
-	step_13
-	step_12
-	step_01
-	step_13
-	step_12
-	step_02
-	fast_step_left
-	step_41
-	step_01
-	step_40
-	fast_step_left
-	fast_step_left
-	step_41
-	step_03
-	step_40
-	fast_step_left
-	step_41
-	step_00
-	step_11
-	step_02
-	step_13
-	step_12
-	step_01
-	step_13
-	step_12
-	step_03
-	step_13
-	step_12
-	step_00
-	step_13
-	step_12
-	step_02
-	step_12
-	step_01
-	step_12
-	step_03
-	step_12
-	step_00
-	step_12
-	step_02
-	step_11
-	step_01
-	step_11
-	step_03
-	step_11
-	step_00
-	step_11
-	step_02
-	step_40
-	step_right
-	slow_step_right
-	step_right
-	slow_step_right
-	step_41
-	step_01
-	step_14
-	step_47
-	step_47
-	step_14
-	step_right
-	step_right
-	step_right
-	step_47
-	step_14
-	step_right
-	step_down
-	step_down
-	step_02
-	step_11
-	step_01
-	step_11
-	step_03
-	step_11
-	step_00
-	step_11
-	step_02
-	step_12
-	step_left
-	step_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9
-	step_14
-	step_14
-	step_left
-	step_left
-	step_28
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_right
-	step_right
-	step_25
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829
-	step_left
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B
-	step_left
-	step_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
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_51
-	step_46
-	step_12
-	step_46
-	step_50
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E
-	step_down
-	step_down
-	step_right
-	step_right
-	step_25
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969
-	step_27
-	step_end
-
-BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B
-	step_left
-	step_left
-	step_left
-	step_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 ad6204fd5..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
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_54
-	step_end
diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
deleted file mode 100644
index 35bf3f5a6..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E
-	step_up
-	step_up
-	step_54
-	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 f3693e179..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
-	step_right
-	step_02
-	step_end
-
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657
-	step_up
-	step_end
-
-BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659
-	step_up
-	step_54
-	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 bd76e111d..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_03
-	step_end
-
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182
-	step_right
-	step_end
-
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
-
-BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B
-	step_up
-	step_up
-	step_up
-	step_02
-	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 640e96b4d..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
-	step_up
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC
-	step_up
-	step_up
-	step_up
-	step_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 93a5f2caf..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_00
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3
-	step_left
-	step_left
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9
-	step_right
-	step_right
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF
-	step_left
-	step_left
-	step_left
-	step_end
-
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3
-	step_right
-	step_right
-	step_right
-	step_00
-	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 5aff5ad81..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
-	step_54
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92
-	step_55
-	step_up
-	step_up
-	step_up
-	step_up
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97
-	step_03
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99
-	step_01
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B
-	step_55
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC
-	step_00
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE
-	step_55
-	slow_step_down
-	slow_step_down
-	step_02
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3
-	step_55
-	slow_step_down
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_02
-	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
-	step_14
-	step_14
-	step_55
-	step_down
-	step_right
-	step_down
-	step_27
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7
-	step_55
-	step_15
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_27
-	step_14
-	step_end
-
-BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_55
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_02
-	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 91fb31ad3..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2
-	step_up
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9
-	step_up
-
-BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA
-	step_up
-	step_54
-	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 067e18fa2..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
-	step_up
-	step_end
-
-BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C
-	step_up
-	step_up
-	step_54
-	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 5293b6cfa..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
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812
-	step_up
-	step_up
-	step_left
-	step_00
-	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 0cee28347..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
-	step_up
-
-BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7
-	step_up
-	step_up
-	step_54
-	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 3461f8275..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 SpawnScriptFieldObject
-	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
-	step_down
-	step_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798
-	step_up
-	step_up
-	step_up
-	step_54
-	step_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E
-	step_up
-	step_54
-	step_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2
-	step_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4
-	step_down
-	step_02
-	step_14
-	step_14
-	step_00
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA
-	step_15
-	step_18
-	step_18
-	step_15
-	step_17
-	step_00
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1
-	step_01
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3
-	step_left
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4
-	step_03
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6
-	step_down
-	step_down
-	step_right
-	step_00
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB
-	step_02
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD
-	step_03
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF
-	step_01
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1
-	step_right
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3
-	step_left
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5
-	step_down
-	step_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8
-	step_03
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA
-	step_02
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_54
-	step_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_54
-	step_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF
-	step_down
-	step_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2
-	step_up
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7
-	step_55
-	step_down
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
-	step_left
-	step_03
-	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
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3
-	step_down
-	step_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 14f543284..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
-	step_down
-	step_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 6952412f2..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
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_00
-	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 2862722ce..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_00
-	step_end
-
-BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5
-	step_right
-	step_02
-	step_end
-
-BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8
-	step_up
-	step_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 d071639f8..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 SpawnScriptFieldObject
-	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 SpawnScriptFieldObject
-	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
-	step_right
-	step_27
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400
-	step_left
-	step_26
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A
-	step_15
-	step_end
-
-BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C
-	slow_step_up
-	slow_step_up
-	step_14
-	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 63306af2a..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
-	step_up
-	step_up
-	step_up
-	step_03
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E
-	step_00
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180
-	step_03
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192
-	step_down
-	step_left
-	step_left
-	step_left
-	step_03
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A
-	step_55
-	step_14
-	step_up
-	step_left
-	step_left
-	step_13
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1
-	step_right
-	step_right
-	step_down
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6
-	step_14
-	step_14
-	step_14
-	step_14
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB
-	step_03
-	step_14
-	step_14
-	step_14
-	step_14
-	step_20
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_02
-	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 f22b0de26..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_03
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E
-	step_left
-	step_up
-	step_up
-	step_up
-	step_03
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524
-	step_02
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526
-	step_28
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E
-	step_right
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534
-	step_up
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E
-	step_right
-	step_right
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541
-	step_left
-	step_left
-	step_28
-	step_end
-
-BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545
-	step_1f
-	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 a1dfa2abc..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
-	step_right
-
-BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37
-	step_right
-	step_right
-
-BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39
-	step_right
-
-BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A
-	step_right
-	step_right
-	step_right
-	step_up
-	step_54
-	step_end
-
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc
deleted file mode 100644
index af2c67eac..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
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_28
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_27
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE
-	step_14
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6
-	step_down
-	step_end
-
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc
deleted file mode 100644
index 095e75394..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
-	step_up
-	step_right
-	step_00
-	step_end
-
-BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A
-	step_up
-	step_up
-	step_00
-	step_end
-
-BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E
-	step_down
-	step_down
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92
-	step_right
-	step_down
-	step_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 9f2099b32..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
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_54
-	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 e6c99541d..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
-	step_down
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77
-	step_left
-	step_25
-	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
-	step_up
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E
-	step_right
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22
-	step_left
-	step_up
-	step_54
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26
-	step_up
-	step_54
-	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
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	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_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc
deleted file mode 100644
index bf0d3ff16..000000000
--- a/data/scripts/maps/BattleFrontier_OutsideEast.inc
+++ /dev/null
@@ -1,444 +0,0 @@
-BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
-	map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F
-	map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D
-	.byte 0
-
-BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, BattleFrontier_OutsideEast_EventScript_242C19
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
-	removeobject VAR_LAST_TALKED
-	return
-
-BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
-	setvar VAR_0x40BC, 0
-	setflag FLAG_0x396
-	checkflag FLAG_0x1C6
-	call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
-	clearflag FLAG_0x34A
-	return
-
-BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43
-	msgbox BattleFrontier_OutsideEast_Text_242E11, 3
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C
-	msgbox BattleFrontier_OutsideEast_Text_242E58, 3
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55
-	msgbox BattleFrontier_OutsideEast_Text_242E96, 3
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E
-	msgbox BattleFrontier_OutsideEast_Text_242ECF, 3
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67
-	msgbox BattleFrontier_OutsideEast_Text_242F8C, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70
-	msgbox BattleFrontier_OutsideEast_Text_242FDC, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79
-	msgbox BattleFrontier_OutsideEast_Text_24308C, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82
-	msgbox BattleFrontier_OutsideEast_Text_243106, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B
-	msgbox BattleFrontier_OutsideEast_Text_2431A5, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94
-	lock
-	msgbox BattleFrontier_OutsideEast_Text_2432DD, 4
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox BattleFrontier_OutsideEast_Text_24334B, 4
-	waitmoncry
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2
-	msgbox BattleFrontier_OutsideEast_Text_243363, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB
-	msgbox BattleFrontier_OutsideEast_Text_243425, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4
-	msgbox BattleFrontier_OutsideEast_Text_2434A0, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD
-	msgbox BattleFrontier_OutsideEast_Text_243504, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6
-	lock
-	msgbox BattleFrontier_OutsideEast_Text_243529, 4
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1
-	msgbox BattleFrontier_OutsideEast_Text_243230, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA
-	lock
-	faceplayer
-	waitse
-	playse 269
-	applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
-	waitmovement 0
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
-	lock
-	faceplayer
-	special sub_80FAFF8
-	waitstate
-	waitse
-	playse 269
-	applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
-	waitmovement 0
-	msgbox gUnknown_082731BD, 4
-	closemessage
-	waitse
-	playmoncry SPECIES_SUDOWOODO, 2
-	delay 40
-	waitmoncry
-	setvar VAR_LAST_TALKED, 14
-	setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	dowildbattle
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq BattleFrontier_OutsideEast_EventScript_242D60
-	compare VAR_RESULT, 4
-	goto_eq BattleFrontier_OutsideEast_EventScript_242D60
-	compare VAR_RESULT, 5
-	goto_eq BattleFrontier_OutsideEast_EventScript_242D60
-	setflag FLAG_0x1C6
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60
-	setflag FLAG_0x1C6
-	goto IslandCave_EventScript_27376D
-	end
-
-BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69
-	step_03
-	step_13
-	step_00
-	step_13
-	step_02
-	step_13
-	step_00
-	step_13
-	step_03
-	step_13
-	step_00
-	step_13
-	step_02
-	step_13
-	step_00
-	step_end
-
-BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79
-	msgbox BattleFrontier_OutsideEast_Text_243598, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82
-	msgbox BattleFrontier_OutsideEast_Text_243668, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B
-	msgbox BattleFrontier_OutsideEast_Text_2436F2, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94
-	msgbox BattleFrontier_OutsideEast_Text_243809, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D
-	msgbox BattleFrontier_OutsideEast_Text_243895, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6
-	msgbox BattleFrontier_OutsideEast_Text_243943, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF
-	msgbox BattleFrontier_OutsideEast_Text_2439A0, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8
-	lock
-	msgbox BattleFrontier_OutsideEast_Text_243A2B, 4
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3
-	lock
-	msgbox BattleFrontier_OutsideEast_Text_243A53, 4
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE
-	msgbox BattleFrontier_OutsideEast_Text_242F0D, 3
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7
-	msgbox BattleFrontier_OutsideEast_Text_242F4A, 3
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
-	msgbox BattleFrontier_OutsideEast_Text_243B68, 2
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
-	lock
-	faceplayer
-	checkflag FLAG_0x1C6
-	goto_eq BattleFrontier_OutsideEast_EventScript_242DFE
-	msgbox BattleFrontier_OutsideEast_Text_243C2C, 4
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE
-	msgbox BattleFrontier_OutsideEast_Text_243CA3, 4
-	release
-	end
-
-BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08
-	msgbox BattleFrontier_OutsideEast_Text_243D0B, 2
-	end
-
-BattleFrontier_OutsideEast_Text_242E11: @ 8242E11
-	.string "This is the BATTLE TOWER!\n"
-	.string "Keep the win streak as the toughest\l"
-	.string "TRAINER!$"
-
-BattleFrontier_OutsideEast_Text_242E58: @ 8242E58
-	.string "This is the BATTLE PALACE!\n"
-	.string "Keep your eyes on POKéMON battles!$"
-
-BattleFrontier_OutsideEast_Text_242E96: @ 8242E96
-	.string "This is the BATTLE ARENA!\n"
-	.string "Let the toughest teams gather!$"
-
-BattleFrontier_OutsideEast_Text_242ECF: @ 8242ECF
-	.string "This is the BATTLE PYRAMID!\n"
-	.string "Advance through the Battle Quest!$"
-
-BattleFrontier_OutsideEast_Text_242F0D: @ 8242F0D
-	.string "BATTLE FRONTIER RANKING HALL\n"
-	.string "Set your sights on new records!$"
-
-BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A
-	.string "BATTLE POINT EXCHANGE SERVICE CORNER\n"
-	.string "Exchange your Battle Points!$"
-
-BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C
-	.string "Wow!\n"
-	.string "It’s huge!\p"
-	.string "The BATTLE TOWER feels special.\n"
-	.string "It’s different from the others.$"
-
-BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC
-	.string "My grand ambition is to conquer both\n"
-	.string "the BATTLE FRONTIER and the POKéMON\l"
-	.string "LEAGUE.\p"
-	.string "And if my dream comes true…\p"
-	.string "I… I’m going to ask MIMI next door\n"
-	.string "if she will be friends with me!$"
-
-BattleFrontier_OutsideEast_Text_24308C: @ 824308C
-	.string "The BATTLE PYRAMID’s too harsh!\n"
-	.string "I just can’t make it to the top!\p"
-	.string "Since I’m out of options, maybe I can\n"
-	.string "climb the outside…$"
-
-BattleFrontier_OutsideEast_Text_243106: @ 8243106
-	.string "I thrive in darkness…\n"
-	.string "Yes… What is worthy of me?\l"
-	.string "None other than the BATTLE PYRAMID…\p"
-	.string "What say you to wandering in darkness\n"
-	.string "and in utter and total desperation?$"
-
-BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5
-	.string "I didn’t sleep for a week, but then\n"
-	.string "I put together the ultimate team!\p"
-	.string "I can’t see myself losing, no joke.\n"
-	.string "We’re storming the BATTLE ARENA!$"
-
-BattleFrontier_OutsideEast_Text_243230: @ 8243230
-	.string "Did SCOTT bring you here, too?\n"
-	.string "What is it with that guy?\p"
-	.string "It sounds like he really does know\n"
-	.string "how to spot talented TRAINERS, but…\p"
-	.string "I’ve never seen him battling in person\n"
-	.string "ever.$"
-
-BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD
-	.string "ZIGG!\n"
-	.string "I believe in you, little buddy!\p"
-	.string "I’ll make my little ZIGG any favorite\n"
-	.string "tasty treats you like if you win!$"
-
-BattleFrontier_OutsideEast_Text_24334B: @ 824334B
-	.string "ZIGZAGOON looks vacant…$"
-
-BattleFrontier_OutsideEast_Text_243363: @ 8243363
-	.string "People call me a busybody,\n"
-	.string "but I can’t help it.\p"
-	.string "Your hat’s on crooked!\n"
-	.string "Oh, no, trash on the ground!\l"
-	.string "Oops, it’s almost dinnertime!\p"
-	.string "I don’t know if I can stand to just\n"
-	.string "watch at the BATTLE PALACE…$"
-
-BattleFrontier_OutsideEast_Text_243425: @ 8243425
-	.string "I may not look that impressive now,\n"
-	.string "but I once beat a GYM LEADER.\p"
-	.string "Who knows, maybe I should give it\n"
-	.string "another shot at glory.$"
-
-BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0
-	.string "I’m fast on my BIKE, and that goes for\n"
-	.string "the way I battle, too.\p"
-	.string "I win matches in the blink of\n"
-	.string "an eye!$"
-
-BattleFrontier_OutsideEast_Text_243504: @ 8243504
-	.string "I’m better than my daddy\n"
-	.string "at POKéMON.$"
-
-BattleFrontier_OutsideEast_Text_243529: @ 8243529
-	.string "Go on, my baby sweetie!\n"
-	.string "Go rack up some wins for Daddy!\p"
-	.string "You’re just like your mother,\n"
-	.string "so you’ll be dominating!$"
-
-BattleFrontier_OutsideEast_Text_243598: @ 8243598
-	.string "It wasn’t easy getting here,\n"
-	.string "but I’d heard about this knockout\l"
-	.string "pretty girl at the BATTLE ARENA.\p"
-	.string "Instead of her, do you know what\n"
-	.string "I found?\p"
-	.string "A whole teeming mob of sweaty,\n"
-	.string "stinky, and primitive martial artists!$"
-
-BattleFrontier_OutsideEast_Text_243668: @ 8243668
-	.string "I sometimes see this really important-\n"
-	.string "looking old man going in there.\p"
-	.string "He has these really awesome POKéMON.\n"
-	.string "He seems really nice, though.$"
-
-BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2
-	.string "Do you know it?\n"
-	.string "The legend of the BATTLE PYRAMID?\p"
-	.string "When there comes a confident TRAINER\n"
-	.string "reaching for the golden pinnacle,\l"
-	.string "there shall appear a man among men.\p"
-	.string "Don’t know that legend?\n"
-	.string "Well, of course not!\l"
-	.string "I just made it up!\p"
-	.string "What’s it supposed to mean?\n"
-	.string "That, my friend, I can’t say!$"
-
-BattleFrontier_OutsideEast_Text_243809: @ 8243809
-	.string "Man! Oh man!\n"
-	.string "I’ve never lost once before!\p"
-	.string "But I got wiped out with no saving\n"
-	.string "grace at all!\p"
-	.string "And then I’m told I don’t have any\n"
-	.string "talent?! Man!$"
-
-BattleFrontier_OutsideEast_Text_243895: @ 8243895
-	.string "This guy ran into a horribly tough\n"
-	.string "TRAINER while he was on the BATTLE\l"
-	.string "TOWER challenge.\p"
-	.string "Now look at him…\p"
-	.string "You need to be cautious if you ever\n"
-	.string "decide to go to the BATTLE TOWER.$"
-
-BattleFrontier_OutsideEast_Text_243943: @ 8243943
-	.string "Yes!\n"
-	.string "I’ve finally got enough Battle Points!\p"
-	.string "I guess I’ll trade for another giant\n"
-	.string "plush DOLL!$"
-
-BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0
-	.string "Oh, yeah, okay!\n"
-	.string "So this is the RANKING HALL!\p"
-	.string "I’d like to go down in history as\n"
-	.string "a super champ and have my name\l"
-	.string "recorded here for posterity.$"
-
-BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B
-	.string "With you by my side, I can do anything.$"
-
-BattleFrontier_OutsideEast_Text_243A53: @ 8243A53
-	.string "Ooh, darling, you are so wonderful!\p"
-	.string "Ooh, I just can’t wait anymore!\p"
-	.string "Let’s go to a MULTI BATTLE ROOM\n"
-	.string "right this instant!\p"
-	.string "If we get together in the BATTLE SALON,\n"
-	.string "the power of our love will overcome\l"
-	.string "everyone we meet.\p"
-	.string "Why, before us, darling, everything\n"
-	.string "will topple like dominoes!$"
-
-BattleFrontier_OutsideEast_Text_243B68: @ 8243B68
-	.string "The BATTLE FRONTIER isn’t exclusively\n"
-	.string "for tough TRAINERS.\p"
-	.string "Many people with special abilities\n"
-	.string "have been invited, it seems.\p"
-	.string "That man SCOTT…\p"
-	.string "He may have built this place to serve\n"
-	.string "a bigger objective…$"
-
-BattleFrontier_OutsideEast_Text_243C2C: @ 8243C2C
-	.string "Excuse me, young one.\n"
-	.string "Have you good eyesight?\p"
-	.string "There is an odd tree past here, and to\n"
-	.string "my tired eyes it seems to wiggle.$"
-
-BattleFrontier_OutsideEast_Text_243CA3: @ 8243CA3
-	.string "Excuse me, young one.\n"
-	.string "Have you a good memory?\p"
-	.string "I have this feeling there once was\n"
-	.string "an odd tree past here.$"
-
-BattleFrontier_OutsideEast_Text_243D0B: @ 8243D0B
-	.string "I…\n"
-	.string "I saw it!\p"
-	.string "There was a sticky sort of a POKéMON\n"
-	.string "with a long tail up ahead!\p"
-	.string "It was hiding under a boulder, and\n"
-	.string "it kept staring at me!$"
diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc
deleted file mode 100644
index f5886bfff..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
-	step_25
-	step_25
-	step_end
-
-BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C
-	step_26
-	step_26
-	step_end
-
-BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F
-	step_28
-	step_28
-	step_end
-
-BattleFrontier_OutsideWest_Movement_23D632: @ 823D632
-	step_27
-	step_27
-	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/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc
deleted file mode 100644
index eca861f85..000000000
--- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc
+++ /dev/null
@@ -1,505 +0,0 @@
-BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
-	map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9
-	map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5
-	.byte 0
-
-BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
-	setflag FLAG_LANDMARK_BATTLE_FRONTIER
-	end
-
-BattleFrontier_ReceptionGate_MapScript2_2661E9: @ 82661E9
-	map_script_2 VAR_0x40D0, 0, BattleFrontier_ReceptionGate_EventScript_2661F3
-	.2byte 0
-
-BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
-	lockall
-	setvar VAR_0x40D0, 1
-	playse SE_PIN
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
-	waitmovement 0
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A
-	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266580, 4
-	closemessage
-	applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2
-	waitmovement 0
-	goto BattleFrontier_ReceptionGate_EventScript_266229
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
-	msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4
-	msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4
-	playfanfare MUS_FANFA4
-	message BattleFrontier_ReceptionGate_Text_266676
-	waitfanfare
-	waitmessage
-	msgbox BattleFrontier_ReceptionGate_Text_266695, 4
-	setflag FLAG_SYS_FRONTIER_PASS
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
-	msgbox BattleFrontier_ReceptionGate_Text_266703, 4
-	closemessage
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6
-	applymovement 255, BattleFrontier_ReceptionGate_Movement_2725A6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_272598
-	applymovement 255, BattleFrontier_ReceptionGate_Movement_272598
-	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266733, 4
-	closemessage
-	applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0
-	applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6
-	applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7
-	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0
-	waitmovement 0
-	msgbox BattleFrontier_ReceptionGate_Text_266764, 4
-	closemessage
-	applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8
-	waitmovement 0
-	removeobject 4
-	releaseall
-	end
-
-BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2
-	step_up
-	step_up
-	step_left
-	step_left
-	step_end
-
-BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7
-	step_14
-	step_14
-	step_14
-	step_13
-	step_28
-	step_end
-
-BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD
-	step_down
-	step_down
-	step_end
-
-BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_end
-
-BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0
-	step_14
-	step_14
-	step_14
-	step_13
-	step_28
-	step_end
-
-BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6
-	step_14
-	step_14
-	step_14
-	step_13
-	step_27
-	step_end
-
-BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC
-	lock
-	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
-	release
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310
-	lock
-	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_266857, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320
-	message BattleFrontier_ReceptionGate_Text_26689D
-	waitmessage
-	setvar VAR_0x8004, 8
-	special sub_813A128
-	waitstate
-	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_2663AE
-	case 1, BattleFrontier_ReceptionGate_EventScript_2663BC
-	case 2, BattleFrontier_ReceptionGate_EventScript_2663CA
-	case 3, BattleFrontier_ReceptionGate_EventScript_2663D8
-	case 4, BattleFrontier_ReceptionGate_EventScript_2663E6
-	case 5, BattleFrontier_ReceptionGate_EventScript_2663F4
-	case 6, BattleFrontier_ReceptionGate_EventScript_266402
-	case 7, BattleFrontier_ReceptionGate_EventScript_266410
-	case 8, BattleFrontier_ReceptionGate_EventScript_26641E
-	case 9, BattleFrontier_ReceptionGate_EventScript_26642C
-	case 127, BattleFrontier_ReceptionGate_EventScript_26642C
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE
-	msgbox BattleFrontier_ReceptionGate_Text_2668C2, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC
-	msgbox BattleFrontier_ReceptionGate_Text_26696F, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA
-	msgbox BattleFrontier_ReceptionGate_Text_266A34, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8
-	msgbox BattleFrontier_ReceptionGate_Text_266AC2, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6
-	msgbox BattleFrontier_ReceptionGate_Text_266B5D, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4
-	msgbox BattleFrontier_ReceptionGate_Text_266C24, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402
-	msgbox BattleFrontier_ReceptionGate_Text_266CBB, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410
-	msgbox BattleFrontier_ReceptionGate_Text_266D1C, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E
-	msgbox BattleFrontier_ReceptionGate_Text_266DCB, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266320
-	end
-
-BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
-	release
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436
-	lock
-	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_266E66, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266446
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446
-	message BattleFrontier_ReceptionGate_Text_266EE0
-	waitmessage
-	multichoice 15, 0, 95, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_2664A4
-	case 1, BattleFrontier_ReceptionGate_EventScript_2664B2
-	case 2, BattleFrontier_ReceptionGate_EventScript_2664C0
-	case 3, BattleFrontier_ReceptionGate_EventScript_2664CE
-	case 4, BattleFrontier_ReceptionGate_EventScript_2664DC
-	case 5, BattleFrontier_ReceptionGate_EventScript_2664EA
-	case 127, BattleFrontier_ReceptionGate_EventScript_2664EA
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4
-	msgbox BattleFrontier_ReceptionGate_Text_266F04, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266446
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2
-	msgbox BattleFrontier_ReceptionGate_Text_266F69, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266446
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0
-	msgbox BattleFrontier_ReceptionGate_Text_267080, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266446
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE
-	msgbox BattleFrontier_ReceptionGate_Text_26716A, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266446
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC
-	msgbox BattleFrontier_ReceptionGate_Text_267298, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266446
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
-	release
-	end
-
-BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4
-	lock
-	faceplayer
-	msgbox BattleFrontier_ReceptionGate_Text_267357, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266504
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504
-	message BattleFrontier_ReceptionGate_Text_26737C
-	waitmessage
-	multichoice 16, 4, 11, 0
-	switch VAR_RESULT
-	case 0, BattleFrontier_ReceptionGate_EventScript_26654C
-	case 1, BattleFrontier_ReceptionGate_EventScript_26655A
-	case 2, BattleFrontier_ReceptionGate_EventScript_266568
-	case 3, BattleFrontier_ReceptionGate_EventScript_266576
-	case 127, BattleFrontier_ReceptionGate_EventScript_266576
-	end
-
-BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C
-	msgbox BattleFrontier_ReceptionGate_Text_2673A1, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266504
-	end
-
-BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A
-	msgbox BattleFrontier_ReceptionGate_Text_2674F3, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266504
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568
-	msgbox BattleFrontier_ReceptionGate_Text_26761C, 4
-	goto BattleFrontier_ReceptionGate_EventScript_266504
-	end
-
-BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576
-	msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4
-	release
-	end
-
-BattleFrontier_ReceptionGate_Text_266580: @ 8266580
-	.string "Is it your first time here?\n"
-	.string "Please step this way!$"
-
-BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2
-	.string "The front lines of POKéMON battling!\n"
-	.string "Welcome to the BATTLE FRONTIER!$"
-
-BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7
-	.string "For a first-time visitor, we issue\n"
-	.string "the FRONTIER PASS.\p"
-	.string "It’s for use at all the facilities\n"
-	.string "in the BATTLE FRONTIER.\p"
-	.string "Here you are!$"
-
-BattleFrontier_ReceptionGate_Text_266676: @ 8266676
-	.string "{PLAYER} obtained\n"
-	.string "the FRONTIER PASS.$"
-
-BattleFrontier_ReceptionGate_Text_266695: @ 8266695
-	.string "{PLAYER} placed the TRAINER CARD\n"
-	.string "in the FRONTIER PASS.$"
-
-BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6
-	.string "We hope you enjoy all that the BATTLE\n"
-	.string "FRONTIER has to offer!$"
-
-BattleFrontier_ReceptionGate_Text_266703: @ 8266703
-	.string "???: Well, if it isn’t {PLAYER}{KUN}!\n"
-	.string "You came out here!$"
-
-BattleFrontier_ReceptionGate_Text_266733: @ 8266733
-	.string "GUIDE: Oh! MR. SCOTT, sir!\n"
-	.string "Good day to you, sir!$"
-
-BattleFrontier_ReceptionGate_Text_266764: @ 8266764
-	.string "SCOTT: It’s great to see you here,\n"
-	.string "it really is!\p"
-	.string "I hope you’ll take your time and\n"
-	.string "explore everywhere.\p"
-	.string "Naturally, I hope you’ll also experience\n"
-	.string "the pure essence of battling.\p"
-	.string "I also have my quarters here, so feel\n"
-	.string "free to visit if you have time.$"
-
-BattleFrontier_ReceptionGate_Text_266857: @ 8266857
-	.string "I’m your guide to the various facilities\n"
-	.string "here in the BATTLE FRONTIER.$"
-
-BattleFrontier_ReceptionGate_Text_26689D: @ 826689D
-	.string "Which would you like to learn about?$"
-
-BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2
-	.string "It is the gigantic tower considered\n"
-	.string "to be the BATTLE FRONTIER’s symbol.\p"
-	.string "There are four kinds of BATTLE ROOMS\n"
-	.string "in the tower for SINGLE, DOUBLE, MULTI,\l"
-	.string "and LINK MULTI BATTLES.$"
-
-BattleFrontier_ReceptionGate_Text_26696F: @ 826696F
-	.string "The BATTLE DOME is the large building\n"
-	.string "shaped like a huge egg.\p"
-	.string "Events named Battle Tourneys are held\n"
-	.string "in this facility.\p"
-	.string "The Battle Tourneys are offered in\n"
-	.string "two courses--for SINGLE and DOUBLE\l"
-	.string "BATTLES.$"
-
-BattleFrontier_ReceptionGate_Text_266A34: @ 8266A34
-	.string "The BATTLE PALACE is the red building\n"
-	.string "on the right of the BATTLE FRONTIER.\p"
-	.string "There are two kinds of BATTLE HALLS\n"
-	.string "for SINGLE and DOUBLE BATTLES.$"
-
-BattleFrontier_ReceptionGate_Text_266AC2: @ 8266AC2
-	.string "The BATTLE ARENA is the dojo-like\n"
-	.string "building at the center-right of\l"
-	.string "the BATTLE FRONTIER.\p"
-	.string "An event called the Set KO Tourney\n"
-	.string "takes place at the BATTLE ARENA.$"
-
-BattleFrontier_ReceptionGate_Text_266B5D: @ 8266B5D
-	.string "The BATTLE FACTORY is the large\n"
-	.string "building that is the closest to us.\p"
-	.string "An event called the Battle Swap\n"
-	.string "is conducted there.\p"
-	.string "The Battle Swap event is offered in\n"
-	.string "two courses for SINGLE and DOUBLE\l"
-	.string "BATTLES.$"
-
-BattleFrontier_ReceptionGate_Text_266C24: @ 8266C24
-	.string "The BATTLE PIKE is the building shaped\n"
-	.string "like a POKéMON at the center-left of\l"
-	.string "the BATTLE FRONTIER.\p"
-	.string "An event called the Battle Choice\n"
-	.string "is conducted there.$"
-
-BattleFrontier_ReceptionGate_Text_266CBB: @ 8266CBB
-	.string "The BATTLE PYRAMID is the enormous\n"
-	.string "pyramid.\p"
-	.string "An event called the Battle Quest\n"
-	.string "is conducted there.$"
-
-BattleFrontier_ReceptionGate_Text_266D1C: @ 8266D1C
-	.string "The RANKING HALL is located near\n"
-	.string "the BATTLE TOWER.\p"
-	.string "There, you may see the most fantastic\n"
-	.string "records left by the TRAINERS that\l"
-	.string "took on the many challenges of\l"
-	.string "the BATTLE FRONTIER.$"
-
-BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB
-	.string "The EXCHANGE SERVICE CORNER is near\n"
-	.string "the BATTLE TOWER.\p"
-	.string "The Battle Points you have earned in\n"
-	.string "the BATTLE FRONTIER may be exchanged\l"
-	.string "for fabulous prizes there.$"
-
-BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66
-	.string "I’m your guide to the basic rules that\n"
-	.string "are common to all the challenges\l"
-	.string "offered by the facilities in the BATTLE\l"
-	.string "FRONTIER.$"
-
-BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0
-	.string "What would you like to learn about?$"
-
-BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04
-	.string "All the challenges at the BATTLE\n"
-	.string "FRONTIER’s facilities come in\l"
-	.string "two courses--Level 50 and Open Level.$"
-
-BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69
-	.string "The Level 50 course is open to POKéMON\n"
-	.string "up to and including Level 50.\p"
-	.string "Please keep in mind, however, that\n"
-	.string "no TRAINER you face will have any\l"
-	.string "POKéMON below Level 50.\p"
-	.string "This course is the entry level for\n"
-	.string "battles at the BATTLE FRONTIER.\p"
-	.string "To begin, we hope you will challenge\n"
-	.string "this course.$"
-
-BattleFrontier_ReceptionGate_Text_267080: @ 8267080
-	.string "The Open Level course places no limit\n"
-	.string "on the levels of POKéMON entering\l"
-	.string "challenges.\p"
-	.string "The levels of your opponents will\n"
-	.string "be adjusted to match the levels of\l"
-	.string "your POKéMON.\p"
-	.string "However, no TRAINER you face will\n"
-	.string "have any POKéMON below Level 60.$"
-
-BattleFrontier_ReceptionGate_Text_26716A: @ 826716A
-	.string "Virtually any kind of POKéMON may take\n"
-	.string "on the challenges at all facilities.\p"
-	.string "EGGS and certain kinds of POKéMON,\n"
-	.string "however, are not permitted.\p"
-	.string "The numbers of POKéMON required for\n"
-	.string "challenges will depend on the facility.\p"
-	.string "At all facilities, however, two or more\n"
-	.string "of the same kind of POKéMON are not\l"
-	.string "permitted.$"
-
-BattleFrontier_ReceptionGate_Text_267298: @ 8267298
-	.string "When entering a challenge at a BATTLE\n"
-	.string "FRONTIER facility, POKéMON may not\l"
-	.string "be holding the same kind of item.\p"
-	.string "Please make sure that all POKéMON\n"
-	.string "entering a challenge are holding\l"
-	.string "different items.$"
-
-BattleFrontier_ReceptionGate_Text_267357: @ 8267357
-	.string "I’m your guide to the FRONTIER PASS.$"
-
-BattleFrontier_ReceptionGate_Text_26737C: @ 826737C
-	.string "Which would you like to learn about?$"
-
-BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1
-	.string "There are seven facilities at\n"
-	.string "the BATTLE FRONTIER.\p"
-	.string "TRAINERS who gain recognition for\n"
-	.string "their abilities may be rewarded with\l"
-	.string "symbols from each of the facilities.\p"
-	.string "To earn a symbol, TRAINERS may need\n"
-	.string "to defeat other TRAINERS in a row,\l"
-	.string "and may need to win events repeatedly.\p"
-	.string "It’s certainly not easy to win symbols.\n"
-	.string "I wish you the best of luck!$"
-
-BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3
-	.string "It is possible to record one battle\n"
-	.string "on your FRONTIER PASS.\p"
-	.string "You may record a battle you had with\n"
-	.string "a friend or friends.\p"
-	.string "Or you may record a battle conducted\n"
-	.string "at the BATTLE FRONTIER excluding\l"
-	.string "matches at the BATTLE PIKE or\l"
-	.string "the BATTLE PYRAMID.\p"
-	.string "You may choose to record your match\n"
-	.string "at the end of a battle.$"
-
-BattleFrontier_ReceptionGate_Text_26761C: @ 826761C
-	.string "Battle Points are rewards given to\n"
-	.string "TRAINERS who battled outstandingly\l"
-	.string "at the BATTLE FRONTIER.\p"
-	.string "You may trade in your Battle Points\n"
-	.string "for prizes at the EXCHANGE SERVICE\l"
-	.string "CORNER.$"
-
diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc
deleted file mode 100644
index 6fd637461..000000000
--- a/data/scripts/maps/BirthIsland_Exterior.inc
+++ /dev/null
@@ -1,125 +0,0 @@
-BirthIsland_Exterior_MapScripts:: @ 8267F15
-	map_script 3, BirthIsland_Exterior_MapScript1_267F29
-	map_script 5, BirthIsland_Exterior_MapScript1_267F65
-	map_script 7, BirthIsland_Exterior_MapScript1_267F25
-	.byte 0
-
-BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
-	special sub_813B1D0
-	end
-
-BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
-	setflag FLAG_0x8D3
-	setvar VAR_OBJ_GFX_ID_0, 100
-	setvar VAR_0x4034, 0
-	setvar VAR_0x4035, 0
-	checkflag FLAG_0x1AD
-	call_if 1, BirthIsland_Exterior_EventScript_267F4E
-	checkflag FLAG_0x1AD
-	call_if 0, BirthIsland_Exterior_EventScript_267F55
-	end
-
-BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
-	setflag FLAG_0x2FB
-	setflag FLAG_0x2FC
-	return
-
-BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
-	checkflag FLAG_0x1AC
-	goto_eq BirthIsland_Exterior_EventScript_27374E
-	clearflag FLAG_0x2FC
-	clearflag FLAG_0x8D4
-	return
-
-BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, BirthIsland_Exterior_EventScript_267F6F
-	end
-
-BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, BirthIsland_Exterior_EventScript_27374E
-	removeobject 2
-	return
-
-BirthIsland_Exterior_EventScript_267F83:: @ 8267F83
-	lock
-	faceplayer
-	special sub_813AFC8
-	waitstate
-	switch VAR_RESULT
-	case 0, BirthIsland_Exterior_EventScript_267FBB
-	case 1, BirthIsland_Exterior_EventScript_267FBD
-	case 2, BirthIsland_Exterior_EventScript_267FC1
-	case 3, BirthIsland_Exterior_EventScript_267FBF
-	end
-
-BirthIsland_Exterior_EventScript_267FBB:: @ 8267FBB
-	release
-	end
-
-BirthIsland_Exterior_EventScript_267FBD:: @ 8267FBD
-	release
-	end
-
-BirthIsland_Exterior_EventScript_267FBF:: @ 8267FBF
-	release
-	end
-
-BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
-	waitse
-	setfieldeffectargument 0, 1
-	setfieldeffectargument 1, 58
-	setfieldeffectargument 2, 26
-	dofieldeffect 65
-	playbgm MUS_RG_DEOEYE, 0
-	waitfieldeffect 65
-	addobject 2
-	applymovement 2, BirthIsland_Exterior_Movement_268054
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_DEOXYS, 2
-	delay 40
-	waitmoncry
-	setvar VAR_LAST_TALKED, 2
-	setvar VAR_0x8004, 410
-	setvar VAR_0x8005, 30
-	setvar VAR_0x8006, 0
-	special CreateObedientEnemyMon
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special BattleSetup_StartLegendaryBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq BirthIsland_Exterior_EventScript_26803B
-	compare VAR_RESULT, 4
-	goto_eq BirthIsland_Exterior_EventScript_268049
-	compare VAR_RESULT, 5
-	goto_eq BirthIsland_Exterior_EventScript_268049
-	setflag FLAG_0x1AD
-	release
-	end
-
-BirthIsland_Exterior_EventScript_26803B:: @ 826803B
-	setflag FLAG_0x1AC
-	setvar VAR_0x8004, 410
-	goto BirthIsland_Exterior_EventScript_273776
-	end
-
-BirthIsland_Exterior_EventScript_268049:: @ 8268049
-	setvar VAR_0x8004, 410
-	goto BirthIsland_Exterior_EventScript_273776
-	end
-
-BirthIsland_Exterior_Movement_268054: @ 8268054
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_end
-
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 f78d4ea15..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
-	step_up
-	step_up
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_left
-	step_left
-	step_17
-	step_17
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-DewfordTown_Movement_1E9865: @ 81E9865
-	step_right
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-DewfordTown_Movement_1E9911: @ 81E9911
-	step_right
-	step_up
-	step_end
-
-DewfordTown_Movement_1E9914: @ 81E9914
-	step_up
-	step_up
-	step_up
-	step_end
-
-DewfordTown_Movement_1E9918: @ 81E9918
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-DewfordTown_Movement_1E991D: @ 81E991D
-	step_up
-	step_end
-
-DewfordTown_Movement_1E991F: @ 81E991F
-	step_up
-	step_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/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
deleted file mode 100644
index 4d4c3732d..000000000
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ /dev/null
@@ -1,453 +0,0 @@
-DewfordTown_Hall_MapScripts:: @ 81FD4CF
-	.byte 0
-
-DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	special TrendyPhraseIsOld
-	compare VAR_RESULT, 1
-	goto_eq DewfordTown_Hall_EventScript_1FD4EF
-	msgbox DewfordTown_Hall_Text_1FD818, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF
-	msgbox DewfordTown_Hall_Text_1FD877, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FD8ED, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	special sub_811EF6C
-	msgbox DewfordTown_Hall_Text_1FD948, 5
-	compare VAR_RESULT, 1
-	goto_eq DewfordTown_Hall_EventScript_1FD533
-	compare VAR_RESULT, 0
-	goto_eq DewfordTown_Hall_EventScript_1FD53D
-	end
-
-DewfordTown_Hall_EventScript_1FD533:: @ 81FD533
-	msgbox DewfordTown_Hall_Text_1FD9B3, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D
-	msgbox DewfordTown_Hall_Text_1FDA06, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDA5C, 4
-	closemessage
-	applymovement 4, DewfordTown_Hall_Movement_2725A6
-	waitmovement 0
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDA99, 4
-	closemessage
-	applymovement 5, DewfordTown_Hall_Movement_2725A6
-	waitmovement 0
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDAC4, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD590:: @ 81FD590
-	lockall
-	call DewfordTown_Hall_EventScript_271E8B
-	msgbox DewfordTown_Hall_Text_1FDB89, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0
-	lockall
-	call DewfordTown_Hall_EventScript_271E8B
-	special GetDewfordHallPaintingNameIndex
-	switch VAR_RESULT
-	case 0, DewfordTown_Hall_EventScript_1FD607
-	case 4, DewfordTown_Hall_EventScript_1FD607
-	case 1, DewfordTown_Hall_EventScript_1FD611
-	case 5, DewfordTown_Hall_EventScript_1FD607
-	case 2, DewfordTown_Hall_EventScript_1FD61B
-	case 6, DewfordTown_Hall_EventScript_1FD61B
-	case 3, DewfordTown_Hall_EventScript_1FD625
-	case 7, DewfordTown_Hall_EventScript_1FD61B
-	end
-
-DewfordTown_Hall_EventScript_1FD607:: @ 81FD607
-	msgbox DewfordTown_Hall_Text_1FDC05, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD611:: @ 81FD611
-	msgbox DewfordTown_Hall_Text_1FDC21, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B
-	msgbox DewfordTown_Hall_Text_1FDC3C, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD625:: @ 81FD625
-	msgbox DewfordTown_Hall_Text_1FDC57, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F
-	lockall
-	setvar VAR_0x8008, 0
-	goto DewfordTown_Hall_EventScript_1FD647
-	end
-
-DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B
-	lockall
-	setvar VAR_0x8008, 1
-	goto DewfordTown_Hall_EventScript_1FD647
-	end
-
-DewfordTown_Hall_EventScript_1FD647:: @ 81FD647
-	call DewfordTown_Hall_EventScript_271E8B
-	special GetDewfordHallPaintingNameIndex
-	switch VAR_RESULT
-	case 0, DewfordTown_Hall_EventScript_1FD6AD
-	case 1, DewfordTown_Hall_EventScript_1FD6AD
-	case 2, DewfordTown_Hall_EventScript_1FD6C9
-	case 3, DewfordTown_Hall_EventScript_1FD6C9
-	case 4, DewfordTown_Hall_EventScript_1FD6E5
-	case 5, DewfordTown_Hall_EventScript_1FD6E5
-	case 6, DewfordTown_Hall_EventScript_1FD701
-	case 7, DewfordTown_Hall_EventScript_1FD71D
-	end
-
-DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDC76, 4
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDCE2, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDD95, 4
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDE0E, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDE77, 4
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDED8, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD701:: @ 81FD701
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FDF72, 4
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FDFF1, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D
-	call DewfordTown_Hall_EventScript_1FD73A
-	msgbox DewfordTown_Hall_Text_1FE09A, 4
-	call DewfordTown_Hall_EventScript_1FD772
-	msgbox DewfordTown_Hall_Text_1FE0F2, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1FD739:: @ 81FD739
-	return
-
-DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
-	applymovement 8, DewfordTown_Hall_Movement_1FD7D6
-	waitmovement 0
-	compare VAR_0x8008, 0
-	goto_eq DewfordTown_Hall_EventScript_1FD75B
-	compare VAR_0x8008, 1
-	goto_eq DewfordTown_Hall_EventScript_1FD771
-	end
-
-DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
-	compare VAR_FACING, 4
-	goto_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement 255, DewfordTown_Hall_Movement_2725A8
-	waitmovement 0
-	return
-
-DewfordTown_Hall_EventScript_1FD771:: @ 81FD771
-	return
-
-DewfordTown_Hall_EventScript_1FD772:: @ 81FD772
-	applymovement 7, DewfordTown_Hall_Movement_1FD7D8
-	waitmovement 0
-	compare VAR_0x8008, 0
-	goto_eq DewfordTown_Hall_EventScript_1FD793
-	compare VAR_0x8008, 1
-	goto_eq DewfordTown_Hall_EventScript_1FD7C0
-	end
-
-DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
-	compare VAR_FACING, 2
-	call_if 1, DewfordTown_Hall_EventScript_1FD7AA
-	compare VAR_FACING, 1
-	call_if 1, DewfordTown_Hall_EventScript_1FD7B5
-	return
-
-DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
-	applymovement 255, DewfordTown_Hall_Movement_2725A6
-	waitmovement 0
-	return
-
-DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
-	applymovement 255, DewfordTown_Hall_Movement_2725AA
-	waitmovement 0
-	return
-
-DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
-	compare VAR_FACING, 3
-	goto_eq DewfordTown_Hall_EventScript_1FD739
-	applymovement 255, DewfordTown_Hall_Movement_2725A4
-	waitmovement 0
-	return
-
-DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6
-	step_1f
-	step_end
-
-DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8
-	step_20
-	step_end
-
-DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_271E8B
-	checkflag FLAG_0x0E6
-	goto_eq DewfordTown_Hall_EventScript_1FD80E
-	msgbox DewfordTown_Hall_Text_1FE142, 4
-	giveitem_std ITEM_TM36
-	compare VAR_RESULT, 0
-	goto_eq DewfordTown_Hall_EventScript_272054
-	setflag FLAG_0x0E6
-	release
-	end
-
-DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E
-	msgbox DewfordTown_Hall_Text_1FE1ED, 4
-	release
-	end
-
-DewfordTown_Hall_Text_1FD818: @ 81FD818
-	.string "What’s in vogue? Why, it has to be\n"
-	.string "“{STR_VAR_1}”!\p"
-	.string "I can’t imagine what life would be like\n"
-	.string "without “{STR_VAR_1}”!$"
-
-DewfordTown_Hall_Text_1FD877: @ 81FD877
-	.string "What’s in vogue? Why, it has to be\n"
-	.string "“{STR_VAR_1}”!\p"
-	.string "But I’m getting kind of bored with it.\p"
-	.string "I should look for the next big thing.$"
-
-DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED
-	.string "I’m teaching my POKéMON about\n"
-	.string "“{STR_VAR_1},”\l"
-	.string "but it’s not going well.\p"
-	.string "It’s a bit too much, I think.$"
-
-DewfordTown_Hall_Text_1FD948: @ 81FD948
-	.string "I’m studying up on the hip and trendy\n"
-	.string "“{STR_VAR_1}” now.\p"
-	.string "Is it true that there’s a deep link\n"
-	.string "between “{STR_VAR_1}”\l"
-	.string "and “{STR_VAR_2}”?$"
-
-DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3
-	.string "Oh!\n"
-	.string "So, my hunch was right!\p"
-	.string "I’m one step closer to being hip and\n"
-	.string "happening, yowza!$"
-
-DewfordTown_Hall_Text_1FDA06: @ 81FDA06
-	.string "What?!\n"
-	.string "Is that so?!\p"
-	.string "It’s not easy for an older fellow like\n"
-	.string "me to keep up with trends!$"
-
-DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C
-	.string "This whole business about\n"
-	.string "“{STR_VAR_1}”…\l"
-	.string "Isn’t there a TV show on it?$"
-
-DewfordTown_Hall_Text_1FDA99: @ 81FDA99
-	.string "Across the sea…\p"
-	.string "Is “{STR_VAR_1}”\n"
-	.string "even more popular?$"
-
-DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4
-	.string "I collect official\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "licensed merchandise.\p"
-	.string "I have official\n"
-	.string "“{STR_VAR_1}” DOLLS…\p"
-	.string "Official “{STR_VAR_1}”\n"
-	.string "brand clothing…\p"
-	.string "And officially licensed\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "picture books.\p"
-	.string "Heheh, I own!\n"
-	.string "I’m not sharing anything with you!$"
-
-DewfordTown_Hall_Text_1FDB89: @ 81FDB89
-	.string "IDENTIFYING GOOD\n"
-	.string "“{STR_VAR_1}” &\l"
-	.string "BAD “{STR_VAR_1}”…\p"
-	.string "THE LINK BETWEEN\n"
-	.string "“{STR_VAR_1}” AND\l"
-	.string "POKéMON…\p"
-	.string "USEFUL\n"
-	.string "“{STR_VAR_1}”…\p"
-	.string "It’s neatly jammed with books about\n"
-	.string "“{STR_VAR_1}.”$"
-
-DewfordTown_Hall_Text_1FDC05: @ 81FDC05
-	.string "“{STR_VAR_1}’S\n"
-	.string "SCREAM” is the title.$"
-
-DewfordTown_Hall_Text_1FDC21: @ 81FDC21
-	.string "“{STR_VAR_1}’S\n"
-	.string "SMILE” is the title.$"
-
-DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C
-	.string "It’s titled “THE LAST\n"
-	.string "{STR_VAR_1}”.$"
-
-DewfordTown_Hall_Text_1FDC57: @ 81FDC57
-	.string "It’s titled “THE BIRTH OF\n"
-	.string "{STR_VAR_1}”.$"
-
-DewfordTown_Hall_Text_1FDC76: @ 81FDC76
-	.string "I saw “{STR_VAR_1}”!\n"
-	.string "Cool, huh?\p"
-	.string "It’s, like, the coolest thing going!\p"
-	.string "It was awesome!\n"
-	.string "It was the real thing, oh yeah!$"
-
-DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2
-	.string "Oh, no, no, no.\p"
-	.string "That alleged\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "you claim to have seen--it’s not.\p"
-	.string "The authentic article is much…\n"
-	.string "How should I say it?\l"
-	.string "Sharper, yet more mellow!\p"
-	.string "Ah, no matter. It’s astonishing!$"
-
-DewfordTown_Hall_Text_1FDD95: @ 81FDD95
-	.string "Hey, listen, I composed a theme song\n"
-	.string "for “{STR_VAR_1}.”\p"
-	.string "“{STR_VAR_1}”\n"
-	.string "is really popular right now.\p"
-	.string "Okay, listen!\n"
-	.string "… …\p"
-	.string "Oh!\n"
-	.string "{STR_VAR_1}!\p"
-	.string "Wonderful\n"
-	.string "{STR_VAR_1}!$"
-
-DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E
-	.string "… …\p"
-	.string "I dare say, chap, it would pay for you\n"
-	.string "to work on your singing before you\l"
-	.string "trifle yourself with\l"
-	.string "“{STR_VAR_1}.”$"
-
-DewfordTown_Hall_Text_1FDE77: @ 81FDE77
-	.string "Anyway, as I was saying earlier, we\n"
-	.string "should get together and organize a\l"
-	.string "“{STR_VAR_1}” party\l"
-	.string "on the island.$"
-
-DewfordTown_Hall_Text_1FDED8: @ 81FDED8
-	.string "Oh, a smashing good idea!\p"
-	.string "It will settle once and for all\n"
-	.string "who is the best at\l"
-	.string "“{STR_VAR_1}.”\l"
-	.string "Brilliant, indeed!\p"
-	.string "Starting today, our lives will revolve\n"
-	.string "around “{STR_VAR_1}”!$"
-
-DewfordTown_Hall_Text_1FDF72: @ 81FDF72
-	.string "I was thinking, though…\p"
-	.string "Wouldn’t you agree that\n"
-	.string "“{STR_VAR_1}” has\l"
-	.string "grown from being something trendy to\l"
-	.string "being a part of our daily lives?$"
-
-DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1
-	.string "Beg pardon?\n"
-	.string "That much, what?\p"
-	.string "However, it’s true that\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "weighs heavily on your mind, whether\l"
-	.string "you’re awake or asleep.\p"
-	.string "Absolutely, you’re the\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "PROFESSOR, old sport!$"
-
-DewfordTown_Hall_Text_1FE09A: @ 81FE09A
-	.string "If you and me team up as a combo,\n"
-	.string "we’ll be invincible when it comes to all\l"
-	.string "things “{STR_VAR_1}”!$"
-
-DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2
-	.string "Spot on, my friend!\p"
-	.string "We shall be the\n"
-	.string "“{STR_VAR_1}” DUO!\p"
-	.string "Isn’t that a ripe image?\n"
-	.string "Hahahah!$"
-
-DewfordTown_Hall_Text_1FE142: @ 81FE142
-	.string "For me, SLUDGE BOMB is at the peak\n"
-	.string "of popularity. It’s the one.\p"
-	.string "Hunh? You’re telling me that you don’t\n"
-	.string "know about SLUDGE BOMB?\p"
-	.string "That’s outright pitiful.\n"
-	.string "I’ll give you one.$"
-
-DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED
-	.string "I love SLUDGE BOMB.\p"
-	.string "But POKéMON with the move\n"
-	.string "“{STR_VAR_1}”\l"
-	.string "are in, too.$"
-
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
deleted file mode 100644
index 71410a43f..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
-	step_up
-	step_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
-	step_up
-	step_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20
-	step_up
-	step_14
-	step_up
-	step_13
-	step_54
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_28
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F
-	step_26
-	step_14
-	step_28
-	step_14
-	step_26
-	step_13
-	step_28
-	step_14
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38
-	step_right
-	step_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B
-	step_up
-	step_up
-	step_25
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F
-	step_up
-	step_13
-	step_54
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_27
-	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/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
deleted file mode 100644
index de29dca0f..000000000
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-EverGrandeCity_HallOfFame_MapScripts:: @ 822982C
-	map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846
-	map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837
-	.byte 0
-
-EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229841
-	.2byte 0
-
-EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
-	turnobject 255, 2
-	end
-
-EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_229850
-	.2byte 0
-
-EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
-	lockall
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_229901
-	waitmovement 0
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4
-	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_22990E, 4
-	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_229908
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_229908
-	waitmovement 0
-	delay 20
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4
-	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_2299A3, 4
-	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6
-	waitmovement 0
-	delay 20
-	dofieldeffect 62
-	waitfieldeffect 62
-	delay 40
-	setvar VAR_TEMP_1, 1
-	call EverGrandeCity_HallOfFame_EventScript_2717C1
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9
-	compare VAR_RESULT, 1
-	goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5
-	end
-
-EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
-	setrespawn 1
-	fadescreenspeed 1, 24
-	special GameClear
-	waitstate
-	releaseall
-	end
-
-EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
-	setrespawn 2
-	fadescreenspeed 1, 24
-	special GameClear
-	waitstate
-	releaseall
-	end
-
-EverGrandeCity_HallOfFame_Movement_229901: @ 8229901
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-EverGrandeCity_HallOfFame_Movement_229908: @ 8229908
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-EverGrandeCity_HallOfFame_Text_22990E: @ 822990E
-	.string "WALLACE: This room…\p"
-	.string "This is where we keep records of\n"
-	.string "POKéMON that prevailed through\l"
-	.string "harsh battles.\p"
-	.string "It is here that the LEAGUE CHAMPIONS\n"
-	.string "are honored.$"
-
-EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3
-	.string "WALLACE: Come on, let’s record your\n"
-	.string "name as a TRAINER who triumphed over\l"
-	.string "the POKéMON LEAGUE, and the names of\l"
-	.string "the partners who battled with you.$"
-
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
deleted file mode 100644
index a9e27ec73..000000000
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,104 +0,0 @@
-EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
-	map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
-	map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
-	.byte 0
-
-EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
-	setrespawn 11
-	checkflag FLAG_0x1CF
-	call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
-	end
-
-EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
-	checkflag FLAG_BADGE06_GET
-	goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
-	clearflag FLAG_0x319
-	return
-
-EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
-	setvar VAR_0x800B, 1
-	call EverGrandeCity_PokemonCenter_1F_EventScript_27191E
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, 2
-	end
-
-EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, 2
-	end
-
-EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
-	lock
-	faceplayer
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6
-	compare VAR_FACING, 4
-	call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
-	compare VAR_FACING, 3
-	call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
-	addvar VAR_0x40D1, 1
-	setflag FLAG_0x1CF
-	playse SE_KAIDAN
-	waitse
-	removeobject 4
-	release
-	end
-
-EverGrandeCity_PokemonCenter_1F_EventScript_229AB6:: @ 8229AB6
-	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229ACC
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1
-	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229AD3
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC
-	step_left
-	step_down
-	step_down
-	step_left
-	step_down
-	step_down
-	step_end
-
-EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
-
-EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA
-	.string "The POKéMON LEAGUE is only a short\n"
-	.string "distance after the VICTORY ROAD.\p"
-	.string "If you’ve come this far, what choice\n"
-	.string "do you have but to keep going?$"
-
-EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62
-	.string "The long and harrowing VICTORY ROAD…\p"
-	.string "It’s like reliving the path one has\n"
-	.string "traveled in life…\p"
-	.string "Believe in your POKéMON and give it\n"
-	.string "your very best!$"
-
-EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1
-	.string "SCOTT: {PLAYER}{KUN}, you’ve clawed your\n"
-	.string "way up to face the POKéMON LEAGUE!\p"
-	.string "I’m happy for you!\n"
-	.string "You made my cheering worthwhile!\p"
-	.string "{PLAYER}{KUN}, if you were to become\n"
-	.string "the POKéMON LEAGUE CHAMPION…\p"
-	.string "I’ll get in touch with you then.\p"
-	.string "Okay, {PLAYER}{KUN}.\n"
-	.string "Go for greatness!$"
-
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
deleted file mode 100644
index 4fd73b3bf..000000000
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc
+++ /dev/null
@@ -1,142 +0,0 @@
-EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
-	map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
-	map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
-	.byte 0
-
-EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
-	setrespawn 20
-	setflag FLAG_LANDMARK_POKEMON_LEAGUE
-	checkflag FLAG_0x107
-	call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
-	end
-
-EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
-	setobjectxyperm 3, 9, 2
-	setobjectxyperm 4, 10, 2
-	return
-
-EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
-	setvar VAR_0x800B, 1
-	call EverGrandeCity_PokemonLeague_1F_EventScript_27191E
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A
-	lock
-	faceplayer
-	message gUnknown_08272A21
-	waitmessage
-	pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624
-	msgbox gUnknown_08272A3F, 4
-	release
-	end
-
-	.align 2
-EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
-	.2byte ITEM_ULTRA_BALL
-	.2byte ITEM_HYPER_POTION
-	.2byte ITEM_MAX_POTION
-	.2byte ITEM_FULL_RESTORE
-	.2byte ITEM_FULL_HEAL
-	.2byte ITEM_REVIVE
-	.2byte ITEM_MAX_REPEL
-	.2byte ITEM_NONE
-	release
-	end
-
-EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
-	lockall
-	checkflag FLAG_0x107
-	goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_0, 11
-	call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698
-	compare VAR_TEMP_0, 8
-	call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3
-	message EverGrandeCity_PokemonLeague_1F_Text_2296E8
-	waitmessage
-	delay 120
-	checkflag FLAG_BADGE06_GET
-	goto_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE
-	closemessage
-	applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2
-	applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5
-	waitmovement 0
-	delay 10
-	playfanfare MUS_ME_BACHI
-	message EverGrandeCity_PokemonLeague_1F_Text_2297EF
-	waitmessage
-	waitfanfare
-	closemessage
-	moveobjectoffscreen 3
-	moveobjectoffscreen 4
-	setflag FLAG_0x107
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698
-	applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DA
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3
-	applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DE
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE
-	playse SE_HAZURE
-	msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, 4
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E
-	waitmovement 0
-	msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA
-	step_down
-	step_left
-	step_26
-	step_end
-
-EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE
-	step_down
-	step_right
-	step_26
-	step_end
-
-EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2
-	step_left
-	step_25
-	step_end
-
-EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5
-	step_right
-	step_25
-	step_end
-
-EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8
-	.string "Beyond this point, only those TRAINERS\n"
-	.string "who have collected all the GYM BADGES\l"
-	.string "are permitted to enter.\p"
-	.string "TRAINER, let us confirm that you have\n"
-	.string "all the GYM BADGES.$"
-
-EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787
-	.string "You haven’t obtained all the BADGES.\p"
-	.string "If you’re bound for the POKéMON\n"
-	.string "LEAGUE, you must return with them.$"
-
-EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF
-	.string "TRAINER! Believe in yourself and your\n"
-	.string "POKéMON, and go forth!$"
-
diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
deleted file mode 100644
index f6750009d..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
-	step_up
-	step_up
-	step_up
-	step_28
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92
-	step_28
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94
-	step_27
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96
-	step_down
-	step_down
-	step_down
-	step_down
-	step_27
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C
-	step_left
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3
-	step_51
-	step_46
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6
-	step_down
-	step_down
-	step_down
-	step_28
-	step_end
-
-FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB
-	step_up
-	step_up
-	step_up
-	step_25
-	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 1325b0332..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700
-	step_up
-
-FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701
-	step_up
-	step_54
-	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 327221120..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
-	step_up
-	step_up
-	step_up
-	step_end
-
-FallarborTown_BattleTentLobby_Movement_200202: @ 8200202
-	step_up
-	step_54
-	step_end
-
-FallarborTown_BattleTentLobby_Movement_200205: @ 8200205
-	step_up
-	step_up
-	step_up
-	step_end
-
-FallarborTown_BattleTentLobby_Movement_200209: @ 8200209
-	step_up
-	step_up
-	step_54
-	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/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
deleted file mode 100644
index 1cc3999f7..000000000
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,111 +0,0 @@
-FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
-	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
-	map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30
-	.byte 0
-
-FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
-	setrespawn 17
-	call FallarborTown_PokemonCenter_1F_EventScript_2718DE
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
-	setvar VAR_0x800B, 1
-	call FallarborTown_PokemonCenter_1F_EventScript_27191E
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF
-	msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8
-	msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01
-	lock
-	faceplayer
-	msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4
-	closemessage
-	switch VAR_FACING
-	case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28
-	case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53
-	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60
-	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
-	playse SE_JIDO_DOA
-	removeobject 4
-	clearflag FLAG_0x366
-	release
-	end
-
-FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
-	.string "Oh, hello.\n"
-	.string "You are?\p"
-	.string "Okay, your name’s {PLAYER}{KUN}.\n"
-	.string "I can see that you’re a TRAINER.\p"
-	.string "So that means you use the POKéMON\n"
-	.string "Storage System I developed.\p"
-	.string "How I arrived at that conclusion is\n"
-	.string "a simple deductive process.\p"
-	.string "You spoke to me because you wanted\n"
-	.string "to access something on this PC.\p"
-	.string "Oh, I’m sorry. I’m LANETTE.\p"
-	.string "Honestly, I’m glad to meet you--it’s\n"
-	.string "great you’re using the Storage System.\p"
-	.string "If you could, please visit me at home.\n"
-	.string "My house is on ROUTE 114.$"
-
-FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22
-	.string "I wonder what POKéMON looked like\n"
-	.string "long, long ago?\p"
-	.string "Maybe the FOSSIL MANIAC at the edge\n"
-	.string "of town will know.$"
-
-FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B
-	.string "In the fields of FALLARBOR, we plant\n"
-	.string "seedlings of hardy trees that thrive\l"
-	.string "even in volcanic ash.$"
-
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/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc
deleted file mode 100644
index 42b18983f..000000000
--- a/data/scripts/maps/FarawayIsland_Interior.inc
+++ /dev/null
@@ -1,207 +0,0 @@
-FarawayIsland_Interior_MapScripts:: @ 8267CFA
-	map_script 5, FarawayIsland_Interior_MapScript1_267D54
-	map_script 3, FarawayIsland_Interior_MapScript1_267D72
-	map_script 2, FarawayIsland_Interior_MapScript2_267D98
-	map_script 7, FarawayIsland_Interior_MapScript1_267D0F
-	.byte 0
-
-FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, FarawayIsland_Interior_EventScript_267D19
-	end
-
-FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq FarawayIsland_Interior_EventScript_267D4B
-	compare VAR_RESULT, 4
-	goto_eq FarawayIsland_Interior_EventScript_267D4B
-	compare VAR_RESULT, 5
-	goto_eq FarawayIsland_Interior_EventScript_267D4B
-	compare VAR_RESULT, 10
-	goto_eq FarawayIsland_Interior_EventScript_267D4B
-	return
-
-FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B
-	setvar VAR_0x8004, 1
-	special sub_81D4A90
-	return
-
-FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, FarawayIsland_Interior_EventScript_267D5E
-	end
-
-FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, FarawayIsland_Interior_EventScript_27374E
-	removeobject VAR_LAST_TALKED
-	return
-
-FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
-	setvar VAR_0x403A, 0
-	setvar VAR_TEMP_1, 1
-	checkflag FLAG_0x1CA
-	call_if 0, FarawayIsland_Interior_EventScript_267D86
-	end
-
-FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
-	checkflag FLAG_0x1C7
-	goto_eq FarawayIsland_Interior_EventScript_27374E
-	clearflag FLAG_0x2CE
-	setvar VAR_TEMP_1, 0
-	return
-
-FarawayIsland_Interior_MapScript2_267D98: @ 8267D98
-	map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_267DA2
-	.2byte 0
-
-FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
-	lockall
-	playse SE_PIN
-	applymovement 1, FarawayIsland_Interior_Movement_272598
-	waitmovement 0
-	applymovement 1, FarawayIsland_Interior_Movement_27259A
-	waitmovement 0
-	applymovement 1, FarawayIsland_Interior_Movement_267DCE
-	waitmovement 0
-	moveobjectoffscreen 1
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-FarawayIsland_Interior_Movement_267DCE: @ 8267DCE
-	step_up
-	step_up
-	step_up
-	step_25
-	step_54
-	step_end
-
-FarawayIsland_Interior_Movement_267DD4: @ 8267DD4
-	step_55
-	step_end
-
-FarawayIsland_Interior_Movement_267DD6: @ 8267DD6
-	step_40
-	step_16
-	step_16
-	step_41
-	step_1d
-	step_1d
-	step_end
-
-FarawayIsland_Interior_Movement_267DDD: @ 8267DDD
-	step_40
-	step_16
-	step_16
-	step_41
-	step_1e
-	step_1e
-	step_end
-
-FarawayIsland_Interior_Movement_267DE4: @ 8267DE4
-	step_40
-	step_16
-	step_16
-	step_41
-	step_20
-	step_20
-	step_end
-
-FarawayIsland_Interior_Movement_267DEB: @ 8267DEB
-	step_40
-	step_16
-	step_16
-	step_41
-	step_1f
-	step_1f
-	step_end
-
-FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
-	lock
-	faceplayer
-	applymovement 1, FarawayIsland_Interior_Movement_267DD4
-	waitmovement 0
-	setvar VAR_0x8004, 0
-	special sub_81D4A90
-	message FarawayIsland_Interior_Text_2C6DFF
-	waitse
-	playmoncry SPECIES_MEW, 2
-	compare VAR_FACING, 2
-	call_if 1, FarawayIsland_Interior_EventScript_267EAF
-	compare VAR_FACING, 1
-	call_if 1, FarawayIsland_Interior_EventScript_267EBA
-	compare VAR_FACING, 3
-	call_if 1, FarawayIsland_Interior_EventScript_267EC5
-	compare VAR_FACING, 4
-	call_if 1, FarawayIsland_Interior_EventScript_267ED0
-	special sub_81D4BEC
-	delay 40
-	waitmoncry
-	setvar VAR_0x8004, 151
-	setvar VAR_0x8005, 30
-	setvar VAR_0x8006, 0
-	special CreateObedientEnemyMon
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special BattleSetup_StartLegendaryBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq FarawayIsland_Interior_EventScript_267E96
-	compare VAR_RESULT, 4
-	goto_eq FarawayIsland_Interior_EventScript_267EA4
-	compare VAR_RESULT, 5
-	goto_eq FarawayIsland_Interior_EventScript_267EA4
-	compare VAR_RESULT, 10
-	goto_eq FarawayIsland_Interior_EventScript_267EA4
-	setflag FLAG_0x1CA
-	release
-	end
-
-FarawayIsland_Interior_EventScript_267E96:: @ 8267E96
-	setflag FLAG_0x1C7
-	setvar VAR_0x8004, 151
-	goto FarawayIsland_Interior_EventScript_273776
-	end
-
-FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4
-	setvar VAR_0x8004, 151
-	goto FarawayIsland_Interior_EventScript_273776
-	end
-
-FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF
-	applymovement 1, FarawayIsland_Interior_Movement_267DD6
-	waitmovement 0
-	return
-
-FarawayIsland_Interior_EventScript_267EBA:: @ 8267EBA
-	applymovement 1, FarawayIsland_Interior_Movement_267DDD
-	waitmovement 0
-	return
-
-FarawayIsland_Interior_EventScript_267EC5:: @ 8267EC5
-	applymovement 1, FarawayIsland_Interior_Movement_267DE4
-	waitmovement 0
-	return
-
-FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0
-	applymovement 1, FarawayIsland_Interior_Movement_267DEB
-	waitmovement 0
-	return
-
-FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB
-	lockall
-	fadescreenswapbuffers 1
-	setflag FLAG_0x2CE
-	removeobject 1
-	fadescreenswapbuffers 0
-	msgbox FarawayIsland_Interior_Text_267EF1, 4
-	closemessage
-	releaseall
-	end
-
-FarawayIsland_Interior_Text_267EF1: @ 8267EF1
-	.string "The feeling of being watched faded…$"
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
deleted file mode 100644
index 0b4b71c2b..000000000
--- a/data/scripts/maps/FortreeCity.inc
+++ /dev/null
@@ -1,159 +0,0 @@
-FortreeCity_MapScripts:: @ 81E25A4
-	map_script 3, FortreeCity_MapScript1_1E25AF
-	map_script 5, FortreeCity_MapScript1_1E25B3
-	.byte 0
-
-FortreeCity_MapScript1_1E25AF: @ 81E25AF
-	setflag FLAG_VISITED_FORTREE_CITY
-	end
-
-FortreeCity_MapScript1_1E25B3: @ 81E25B3
-	setstepcallback 2
-	end
-
-FortreeCity_EventScript_1E25B6:: @ 81E25B6
-	msgbox FortreeCity_Text_1E2676, 2
-	end
-
-FortreeCity_EventScript_1E25BF:: @ 81E25BF
-	lock
-	faceplayer
-	checkflag FLAG_0x127
-	goto_eq FortreeCity_EventScript_1E25D4
-	msgbox FortreeCity_Text_1E2738, 4
-	release
-	end
-
-FortreeCity_EventScript_1E25D4:: @ 81E25D4
-	msgbox FortreeCity_Text_1E27B6, 4
-	release
-	end
-
-FortreeCity_EventScript_1E25DE:: @ 81E25DE
-	msgbox FortreeCity_Text_1E27FE, 2
-	end
-
-FortreeCity_EventScript_1E25E7:: @ 81E25E7
-	msgbox FortreeCity_Text_1E2880, 2
-	end
-
-FortreeCity_EventScript_1E25F0:: @ 81E25F0
-	msgbox FortreeCity_Text_1E292E, 2
-	end
-
-FortreeCity_EventScript_1E25F9:: @ 81E25F9
-	msgbox FortreeCity_Text_1E299D, 2
-	end
-
-FortreeCity_EventScript_1E2602:: @ 81E2602
-	msgbox FortreeCity_Text_1E2AAC, 3
-	end
-
-FortreeCity_EventScript_1E260B:: @ 81E260B
-	msgbox FortreeCity_Text_1E2AE6, 3
-	end
-
-FortreeCity_EventScript_1E2614:: @ 81E2614
-	lock
-	faceplayer
-	checkitem ITEM_DEVON_SCOPE, 1
-	compare VAR_RESULT, 1
-	goto_eq FortreeCity_EventScript_1E2630
-	msgbox FortreeCity_Text_1E29E5, 4
-	release
-	end
-
-FortreeCity_EventScript_1E2630:: @ 81E2630
-	msgbox FortreeCity_Text_1E2A08, 5
-	compare VAR_RESULT, 1
-	goto_eq FortreeCity_EventScript_1E2645
-	release
-	end
-
-FortreeCity_EventScript_1E2645:: @ 81E2645
-	msgbox FortreeCity_Text_1E2A48, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KECLEON, 2
-	delay 40
-	waitmoncry
-	applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674
-	waitmovement 0
-	removeobject VAR_LAST_TALKED
-	setflag FLAG_0x127
-	release
-	end
-
-FortreeCity_Movement_1E2674: @ 81E2674
-	step_right
-	step_end
-
-FortreeCity_Text_1E2676: @ 81E2676
-	.string "No one believes me, but I saw this\n"
-	.string "gigantic POKéMON in the sky.\p"
-	.string "It seemed to squirm as it flew toward\n"
-	.string "ROUTE 131.\p"
-	.string "By the way… Sniff…\n"
-	.string "Um… You, uh…smell singed.\p"
-	.string "Were you at a volcano or something?$"
-
-FortreeCity_Text_1E2738: @ 81E2738
-	.string "I want to go to the POKéMON GYM,\n"
-	.string "but something’s blocking the way.\p"
-	.string "After all the bother I went through\n"
-	.string "training on ROUTE 120…$"
-
-FortreeCity_Text_1E27B6: @ 81E27B6
-	.string "I’ve got my pride-and-joy POKéMON\n"
-	.string "with me. This time, I’ll beat WINONA.$"
-
-FortreeCity_Text_1E27FE: @ 81E27FE
-	.string "The ground absorbs rainwater, and\n"
-	.string "trees grow by drinking that water…\p"
-	.string "Our FORTREE CITY exists because\n"
-	.string "there’s both water and soil.$"
-
-FortreeCity_Text_1E2880: @ 81E2880
-	.string "The CITY consists of homes built on\n"
-	.string "trees.\p"
-	.string "Perhaps because of that lifestyle,\n"
-	.string "everyone is healthy and lively.\p"
-	.string "Why, even myself--I feel as if I’ve\n"
-	.string "grown thirty years younger.$"
-
-FortreeCity_Text_1E292E: @ 81E292E
-	.string "Living on top of trees is okay.\p"
-	.string "But sometimes BUG POKéMON come in\n"
-	.string "through windows.\l"
-	.string "It can be really startling.$"
-
-FortreeCity_Text_1E299D: @ 81E299D
-	.string "There are POKéMON that evolve when\n"
-	.string "you trade them! That’s what I heard.$"
-
-FortreeCity_Text_1E29E5: @ 81E29E5
-	.string "Something unseeable is in the way.$"
-
-FortreeCity_Text_1E2A08: @ 81E2A08
-	.string "Something unseeable is in the way.\p"
-	.string "Want to use the DEVON SCOPE?$"
-
-FortreeCity_Text_1E2A48: @ 81E2A48
-	.string "{PLAYER} used the DEVON SCOPE.\p"
-	.string "An invisible POKéMON became completely\n"
-	.string "visible!\p"
-	.string "The startled POKéMON fled!$"
-
-FortreeCity_Text_1E2AAC: @ 81E2AAC
-	.string "FORTREE CITY\n"
-	.string "“The treetop city that frolics with\l"
-	.string "nature.”$"
-
-FortreeCity_Text_1E2AE6: @ 81E2AE6
-	.string "FORTREE CITY POKéMON GYM\n"
-	.string "LEADER: WINONA\p"
-	.string "“The bird user taking flight into\n"
-	.string "the world.”$"
-
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
deleted file mode 100644
index 521e99021..000000000
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-FortreeCity_House4_MapScripts:: @ 8217C80
-	.byte 0
-
-FortreeCity_House4_EventScript_217C81:: @ 8217C81
-	msgbox FortreeCity_House4_Text_217D33, 2
-	end
-
-FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
-	lockall
-	checkflag FLAG_0x0DF
-	goto_eq FortreeCity_House4_EventScript_217D06
-	checkflag FLAG_0x0E0
-	goto_eq FortreeCity_House4_EventScript_217CD8
-	checkflag FLAG_0x0DE
-	goto_eq FortreeCity_House4_EventScript_217CC4
-	msgbox FortreeCity_House4_Text_217DB9, 4
-	closemessage
-	setflag FLAG_0x0DE
-	clearflag FLAG_0x3A6
-	applymovement 3, FortreeCity_House4_Movement_217D1A
-	waitmovement 0
-	removeobject 3
-	releaseall
-	end
-
-FortreeCity_House4_EventScript_217CC4:: @ 8217CC4
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
-	waitmovement 0
-	msgbox FortreeCity_House4_Text_217DD2, 4
-	releaseall
-	end
-
-FortreeCity_House4_EventScript_217CD8:: @ 8217CD8
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
-	waitmovement 0
-	msgbox FortreeCity_House4_Text_217E05, 4
-	giveitem_std ITEM_MENTAL_HERB
-	compare VAR_RESULT, 0
-	goto_eq FortreeCity_House4_EventScript_272054
-	setflag FLAG_0x0DF
-	releaseall
-	end
-
-FortreeCity_House4_EventScript_217D06:: @ 8217D06
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E
-	waitmovement 0
-	msgbox FortreeCity_House4_Text_217EA8, 4
-	releaseall
-	end
-
-FortreeCity_House4_Movement_217D1A: @ 8217D1A
-	step_15
-	step_15
-	step_18
-	step_25
-	step_13
-	step_end
-
-FortreeCity_House4_EventScript_217D20:: @ 8217D20
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox FortreeCity_House4_Text_217EE0, 4
-	waitmoncry
-	release
-	end
-
-FortreeCity_House4_Text_217D33: @ 8217D33
-	.string "By being together with POKéMON,\n"
-	.string "people make more and more friends.\p"
-	.string "And that brings the world closer\n"
-	.string "together. I think it’s wonderful!$"
-
-FortreeCity_House4_Text_217DB9: @ 8217DB9
-	.string "There!\n"
-	.string "Go, BIRD POKéMON!$"
-
-FortreeCity_House4_Text_217DD2: @ 8217DD2
-	.string "Heheh, I asked my WINGULL to run\n"
-	.string "an errand for me.$"
-
-FortreeCity_House4_Text_217E05: @ 8217E05
-	.string "Good!\n"
-	.string "Welcome back, WINGULL!\p"
-	.string "Huh? What is this?\n"
-	.string "What is it holding?\p"
-	.string "A MENTAL HERB?\n"
-	.string "It must have picked it up somewhere.\p"
-	.string "But I’m not a TRAINER, so you can\n"
-	.string "have it.$"
-
-FortreeCity_House4_Text_217EA8: @ 8217EA8
-	.string "Thanks to my WINGULL, I have friends\n"
-	.string "who live far away.$"
-
-FortreeCity_House4_Text_217EE0: @ 8217EE0
-	.string "WINGULL: Pihyoh!$"
-
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/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
deleted file mode 100644
index 9d61bc1a5..000000000
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ /dev/null
@@ -1,124 +0,0 @@
-GraniteCave_StevensRoom_MapScripts:: @ 822DC7A
-	.byte 0
-
-GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
-	lock
-	faceplayer
-	msgbox GraniteCave_StevensRoom_Text_22DD5A, 4
-	setvar VAR_0x8004, 274
-	call GraniteCave_StevensRoom_EventScript_2723E4
-	setflag FLAG_0x0BD
-	msgbox GraniteCave_StevensRoom_Text_22DDBD, 4
-	giveitem_std ITEM_TM47
-	compare VAR_RESULT, 0
-	call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C
-	msgbox GraniteCave_StevensRoom_Text_22DE6B, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox GraniteCave_StevensRoom_Text_22DF6A, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x131
-	msgbox GraniteCave_StevensRoom_Text_22DF8C, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D
-	compare VAR_FACING, 1
-	call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A
-	compare VAR_FACING, 3
-	call_if 1, GraniteCave_StevensRoom_EventScript_22DD18
-	compare VAR_FACING, 4
-	call_if 1, GraniteCave_StevensRoom_EventScript_22DD18
-	playse SE_KAIDAN
-	removeobject 1
-	release
-	end
-
-GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
-	waitmovement 0
-	return
-
-GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18
-	applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
-	waitmovement 0
-	return
-
-GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A
-	applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD51
-	waitmovement 0
-	return
-
-GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C
-	msgbox GraniteCave_StevensRoom_Text_22DFAA, 4
-	return
-
-GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_end
-
-GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C
-	step_14
-	step_14
-	step_14
-	step_26
-	step_end
-
-GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51
-	step_left
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_13
-	step_end
-
-GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A
-	.string "My name is STEVEN.\p"
-	.string "I’m interested in rare stones,\n"
-	.string "so I travel here and there.\p"
-	.string "Oh?\n"
-	.string "A LETTER for me?$"
-
-GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD
-	.string "STEVEN: Okay, thank you.\p"
-	.string "You went through all this trouble to\n"
-	.string "deliver that. I need to thank you.\p"
-	.string "Let me see…\n"
-	.string "I’ll give you this TM.\p"
-	.string "It contains my favorite move,\n"
-	.string "STEEL WING.$"
-
-GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B
-	.string "STEVEN: Your POKéMON appear quite\n"
-	.string "capable.\p"
-	.string "If you keep training, you could even\n"
-	.string "become the CHAMPION of the POKéMON\l"
-	.string "LEAGUE one day. That’s what I think.\p"
-	.string "I know, since we’ve gotten to know each\n"
-	.string "other, let’s register one another in\l"
-	.string "our POKéNAVS.\p"
-	.string "… … … … … …$"
-
-GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A
-	.string "Registered STEVEN\n"
-	.string "in the POKéNAV.$"
-
-GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C
-	.string "Now, I’ve got to hurry along.$"
-
-GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA
-	.string "Oh, your BAG is full…\n"
-	.string "That’s too bad, then.$"
-
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/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
deleted file mode 100644
index 0631a5d33..000000000
--- a/data/scripts/maps/LavaridgeTown.inc
+++ /dev/null
@@ -1,425 +0,0 @@
-LavaridgeTown_MapScripts:: @ 81EA4D3
-	map_script 3, LavaridgeTown_MapScript1_1EA4DE
-	map_script 2, LavaridgeTown_MapScript2_1EA547
-	.byte 0
-
-LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
-	setflag FLAG_VISITED_LAVARIDGE_TOWN
-	checkflag FLAG_0x06C
-	call_if 1, LavaridgeTown_EventScript_1EA514
-	checkflag FLAG_0x08B
-	call_if 1, LavaridgeTown_EventScript_1EA53F
-	call LavaridgeTown_EventScript_271ED7
-	call LavaridgeTown_EventScript_271EFB
-	compare VAR_0x4053, 1
-	call_if 1, LavaridgeTown_EventScript_1EA518
-	compare VAR_0x4053, 1
-	call_if 1, LavaridgeTown_EventScript_1EA543
-	end
-
-LavaridgeTown_EventScript_1EA514:: @ 81EA514
-	clearflag FLAG_0x06C
-	return
-
-LavaridgeTown_EventScript_1EA518:: @ 81EA518
-	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 9
-	goto_eq LavaridgeTown_EventScript_1EA529
-	return
-
-LavaridgeTown_EventScript_1EA529:: @ 81EA529
-	setobjectxyperm 8, 11, 9
-	setobjectxyperm 7, 9, 8
-	setobjectmovementtype 7, 7
-	clearflag FLAG_0x3A1
-	return
-
-LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
-	clearflag FLAG_0x36D
-	return
-
-LavaridgeTown_EventScript_1EA543:: @ 81EA543
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	return
-
-LavaridgeTown_MapScript2_1EA547: @ 81EA547
-	map_script_2 VAR_0x4053, 1, LavaridgeTown_EventScript_1EA551
-	.2byte 0
-
-LavaridgeTown_EventScript_1EA551:: @ 81EA551
-	lockall
-	getplayerxy VAR_0x8008, VAR_0x8009
-	compare VAR_0x8008, 9
-	call_if 1, LavaridgeTown_EventScript_1EA63A
-	compare VAR_0x8008, 9
-	call_if 5, LavaridgeTown_EventScript_1EA65C
-	delay 20
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LavaridgeTown_EventScript_1EA630
-	compare VAR_RESULT, 1
-	call_if 1, LavaridgeTown_EventScript_1EA635
-	compare VAR_0x8008, 9
-	call_if 1, LavaridgeTown_EventScript_1EA6A1
-	compare VAR_0x8008, 9
-	call_if 5, LavaridgeTown_EventScript_1EA6AC
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LavaridgeTown_EventScript_1EA5B5
-	compare VAR_RESULT, 1
-	goto_eq LavaridgeTown_EventScript_1EA5DA
-	end
-
-LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
-	msgbox LavaridgeTown_Text_1EA7C0, 4
-	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_0x0DD
-	msgbox LavaridgeTown_Text_1EA897, 4
-	goto LavaridgeTown_EventScript_1EA5FF
-	end
-
-LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA
-	msgbox LavaridgeTown_Text_1EA9A2, 4
-	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_0x0DD
-	msgbox LavaridgeTown_Text_1EAA2E, 4
-	goto LavaridgeTown_EventScript_1EA5FF
-	end
-
-LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
-	closemessage
-	removeobject 8
-	addobject 7
-	delay 30
-	compare VAR_0x8008, 9
-	call_if 1, LavaridgeTown_EventScript_1EA6B7
-	compare VAR_0x8008, 9
-	call_if 5, LavaridgeTown_EventScript_1EA6C9
-	removeobject 7
-	setvar VAR_0x4053, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	releaseall
-	end
-
-LavaridgeTown_EventScript_1EA630:: @ 81EA630
-	playbgm MUS_GIRL_SUP, 1
-	return
-
-LavaridgeTown_EventScript_1EA635:: @ 81EA635
-	playbgm MUS_BOY_SUP, 1
-	return
-
-LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
-	applymovement 8, LavaridgeTown_Movement_2725A6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 8, LavaridgeTown_Movement_272598
-	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_27259A
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
-	opendoor 12, 15
-	waitdooranim
-	addobject 8
-	applymovement 8, LavaridgeTown_Movement_1EA6F8
-	waitmovement 0
-	closedoor 12, 15
-	waitdooranim
-	applymovement 8, LavaridgeTown_Movement_2725A4
-	waitmovement 0
-	playse SE_PIN
-	applymovement 8, LavaridgeTown_Movement_272598
-	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_27259A
-	waitmovement 0
-	applymovement 255, LavaridgeTown_Movement_2725A8
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_1EA6A1:: @ 81EA6A1
-	applymovement 8, LavaridgeTown_Movement_1EA6F4
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC
-	applymovement 8, LavaridgeTown_Movement_1EA6ED
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7
-	applymovement 255, LavaridgeTown_Movement_1EA6DF
-	applymovement 7, LavaridgeTown_Movement_1EA6E3
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9
-	applymovement 7, LavaridgeTown_Movement_1EA6D4
-	waitmovement 0
-	return
-
-LavaridgeTown_Movement_1EA6D4: @ 81EA6D4
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-LavaridgeTown_Movement_1EA6DF: @ 81EA6DF
-	step_14
-	step_13
-	step_28
-	step_end
-
-LavaridgeTown_Movement_1EA6E3: @ 81EA6E3
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-LavaridgeTown_Movement_1EA6ED: @ 81EA6ED
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LavaridgeTown_Movement_1EA6F4: @ 81EA6F4
-	step_left
-	step_left
-	step_up
-	step_end
-
-LavaridgeTown_Movement_1EA6F8: @ 81EA6F8
-	step_down
-	step_end
-
-LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA
-	specialvar VAR_RESULT, player_get_direction_lower_nybble
-	compare VAR_RESULT, 1
-	goto_eq LavaridgeTown_EventScript_1EA70B
-	end
-
-LavaridgeTown_EventScript_1EA70B:: @ 81EA70B
-	incrementgamestat 49
-	end
-
-LavaridgeTown_EventScript_1EA70E:: @ 81EA70E
-	msgbox LavaridgeTown_Text_1EAE03, 2
-	end
-
-LavaridgeTown_EventScript_1EA717:: @ 81EA717
-	msgbox LavaridgeTown_Text_1EAEE1, 3
-	end
-
-LavaridgeTown_EventScript_1EA720:: @ 81EA720
-	msgbox LavaridgeTown_Text_1EAF9B, 2
-	end
-
-LavaridgeTown_EventScript_1EA729:: @ 81EA729
-	msgbox LavaridgeTown_Text_1EB003, 2
-	end
-
-LavaridgeTown_EventScript_1EA732:: @ 81EA732
-	msgbox LavaridgeTown_Text_1EB092, 2
-	end
-
-LavaridgeTown_EventScript_1EA73B:: @ 81EA73B
-	msgbox LavaridgeTown_Text_1EAF4E, 2
-	end
-
-LavaridgeTown_EventScript_1EA744:: @ 81EA744
-	lock
-	faceplayer
-	checkflag FLAG_0x10A
-	goto_eq LavaridgeTown_EventScript_1EA787
-	msgbox LavaridgeTown_Text_1EAB80, 5
-	compare VAR_RESULT, 0
-	goto_eq LavaridgeTown_EventScript_1EA79B
-	getpartysize
-	compare VAR_RESULT, 6
-	goto_eq LavaridgeTown_EventScript_1EA791
-	msgbox LavaridgeTown_Text_1EACC0, 4
-	setflag FLAG_0x10A
-	playfanfare MUS_FANFA4
-	message LavaridgeTown_Text_1EACF4
-	waitfanfare
-	giveegg SPECIES_WYNAUT
-	release
-	end
-
-LavaridgeTown_EventScript_1EA787:: @ 81EA787
-	msgbox LavaridgeTown_Text_1EAD9E, 4
-	release
-	end
-
-LavaridgeTown_EventScript_1EA791:: @ 81EA791
-	msgbox LavaridgeTown_Text_1EAD09, 4
-	release
-	end
-
-LavaridgeTown_EventScript_1EA79B:: @ 81EA79B
-	msgbox LavaridgeTown_Text_1EAD44, 4
-	release
-	end
-
-LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5
-	msgbox LavaridgeTown_Text_1EB12B, 3
-	end
-
-LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE
-	msgbox LavaridgeTown_Text_1EB178, 3
-	end
-
-LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7
-	msgbox LavaridgeTown_Text_1EB1CB, 3
-	end
-
-LavaridgeTown_Text_1EA7C0: @ 81EA7C0
-	.string "MAY: {PLAYER}{KUN}! Long time no see!\p"
-	.string "Oh? While I visited the hot springs,\n"
-	.string "you got the LAVARIDGE GYM BADGE.\p"
-	.string "You must have collected\n"
-	.string "good POKéMON…\l"
-	.string "No, I believe you raised some.\p"
-	.string "I guess it would be okay for you to\n"
-	.string "have this.$"
-
-LavaridgeTown_Text_1EA897: @ 81EA897
-	.string "MAY: With those GO-GOGGLES, you’ll\n"
-	.string "have no trouble getting through the\l"
-	.string "desert near ROUTE 111.\p"
-	.string "But, wow, {PLAYER}{KUN}…\n"
-	.string "Challenging GYMS…\p"
-	.string "You’re trying hard because you don’t\n"
-	.string "want to lose to me, I bet!\p"
-	.string "{PLAYER}{KUN}, I think I should challenge\n"
-	.string "your dad in PETALBURG GYM.\p"
-	.string "See you again!$"
-
-LavaridgeTown_Text_1EA9A2: @ 81EA9A2
-	.string "BRENDAN: {PLAYER}, hey, it’s been a while.\n"
-	.string "How’s it going?\p"
-	.string "Hmm…\n"
-	.string "That’s a decent collection of BADGES.\p"
-	.string "All right, then.\n"
-	.string "You may as well have this.$"
-
-LavaridgeTown_Text_1EAA2E: @ 81EAA2E
-	.string "BRENDAN: Keep those with you if you’re\n"
-	.string "planning on going into that desert near\l"
-	.string "ROUTE 111.\p"
-	.string "There should be some POKéMON that\n"
-	.string "are exclusively desert-dwellers.\l"
-	.string "You might look around for those.\p"
-	.string "As for me…\n"
-	.string "I’m considering challenging NORMAN,\l"
-	.string "the GYM LEADER of PETALBURG.\p"
-	.string "Unlike you, {PLAYER}, your dad looks like\n"
-	.string "he really is tough.\p"
-	.string "See you around!$"
-
-LavaridgeTown_Text_1EAB80: @ 81EAB80
-	.string "I have here an EGG.\p"
-	.string "I’d hoped to hatch it by covering it in\n"
-	.string "hot sand by the hot springs.\l"
-	.string "But that doesn’t seem to be enough…\p"
-	.string "I’ve heard it would be best if it were\n"
-	.string "kept together with POKéMON and\l"
-	.string "carried about.\p"
-	.string "You are a TRAINER, yes?\n"
-	.string "And your POKéMON radiate vitality.\p"
-	.string "So, what say you?\n"
-	.string "Will you take this EGG to hatch?$"
-
-LavaridgeTown_Text_1EACC0: @ 81EACC0
-	.string "Good! I hope you’ll walk plenty with\n"
-	.string "this here EGG!$"
-
-LavaridgeTown_Text_1EACF4: @ 81EACF4
-	.string "{PLAYER} received the EGG.$"
-
-LavaridgeTown_Text_1EAD09: @ 81EAD09
-	.string "Oh? You’ve too many POKéMON.\n"
-	.string "There’s no room for this EGG…$"
-
-LavaridgeTown_Text_1EAD44: @ 81EAD44
-	.string "As you wish, then…\p"
-	.string "If you have a change of heart about\n"
-	.string "hatching this EGG, I will be here.$"
-
-LavaridgeTown_Text_1EAD9E: @ 81EAD9E
-	.string "Every so often, an EGG will be found at\n"
-	.string "the POKéMON DAY CARE.\p"
-	.string "Or at least that’s how the rumor goes.$"
-
-LavaridgeTown_Text_1EAE03: @ 81EAE03
-	.string "We draw as much hot water as we need,\n"
-	.string "and yet the hot springs never run dry.\p"
-	.string "Isn’t it magical?\p"
-	.string "These hot springs appear near active\n"
-	.string "volcanoes. Veins of water under the\l"
-	.string "ground are heated by magma to well up\l"
-	.string "as hot springs.$"
-
-LavaridgeTown_Text_1EAEE1: @ 81EAEE1
-	.string "Being buried in this hot sand is…\n"
-	.string "Sigh…\p"
-	.string "So warm and heavenly…\p"
-	.string "Eh? Gyaah! Ouch!\p"
-	.string "A POKéMON nipped my backside!$"
-
-LavaridgeTown_Text_1EAF4E: @ 81EAF4E
-	.string "Oh, you like hot springs, do you?\p"
-	.string "That’s surprising for one as young\n"
-	.string "as you.$"
-
-LavaridgeTown_Text_1EAF9B: @ 81EAF9B
-	.string "I bathe in the hot springs every day.\p"
-	.string "I want to become a beautiful and strong\n"
-	.string "GYM LEADER like FLANNERY.$"
-
-LavaridgeTown_Text_1EB003: @ 81EB003
-	.string "If people put POKéMON in hot springs,\n"
-	.string "it might be seriously strange.\p"
-	.string "Why, it might be an electric bath, or\n"
-	.string "a bubble bath, or even a lava bath…$"
-
-LavaridgeTown_Text_1EB092: @ 81EB092
-	.string "They’re claiming that these hot springs\n"
-	.string "are good for calming nervous tension,\l"
-	.string "relieving aching muscles, solving\l"
-	.string "romantic problems, and attracting\l"
-	.string "money…$"
-
-LavaridgeTown_Text_1EB12B: @ 81EB12B
-	.string "LAVARIDGE TOWN\p"
-	.string "“POKéMON CENTER HOT SPRINGS\n"
-	.string "An excellent place for relaxing!”$"
-
-LavaridgeTown_Text_1EB178: @ 81EB178
-	.string "LAVARIDGE TOWN POKéMON GYM\n"
-	.string "LEADER: FLANNERY\l"
-	.string "“One with a fiery passion that burns!”$"
-
-LavaridgeTown_Text_1EB1CB: @ 81EB1CB
-	.string "POKéMON HERB SHOP\n"
-	.string "“Bitter taste--better cure!”$"
-
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
deleted file mode 100644
index 0db441592..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
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A418: @ 821A418
-	step_27
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_28
-	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
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A545: @ 821A545
-	step_28
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A547: @ 821A547
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_27
-	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
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2
-	step_27
-	step_left
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5
-	step_left
-	step_left
-	step_25
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9
-	step_down
-	step_down
-	step_26
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21A706: @ 821A706
-	step_28
-	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 Text_DecideLinkLeader
-	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
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB
-	step_right
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD
-	step_right
-	step_right
-	step_25
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1
-	step_down
-	step_down
-	step_26
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
-	step_27
-	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_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
deleted file mode 100644
index 5f2b79a5d..000000000
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ /dev/null
@@ -1,131 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188
-	.byte 0
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189
-	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA
-	checkflag FLAG_BADGE07_GET
-	goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, 4
-	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, 4
-	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, 4
-	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2
-	waitmovement 0
-	releaseall
-	end
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
-	lockall
-	playse SE_PIN
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_272598
-	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A
-	waitmovement 0
-	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, 4
-	closemessage
-	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E
-	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260
-	waitmovement 0
-	release
-	end
-
-LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259
-	step_03
-	step_40
-	step_left
-	step_41
-	step_end
-
-LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E
-	step_up
-	step_end
-
-LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260
-	step_00
-	step_down
-	step_01
-	step_end
-
-LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264
-	.string "Hm, so they doubled the guests by\n"
-	.string "using POKéMON as attractions?\p"
-	.string "Hm, well, maybe I should make a cute\n"
-	.string "POKéMON our inn’s mascot.\p"
-	.string "I wonder if that will attract more\n"
-	.string "guests to stay with us?$"
-
-LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E
-	.string "Oh, sorry, sorry!\n"
-	.string "I was too involved in watching TV!\p"
-	.string "Since that TEAM AQUA came to town,\n"
-	.string "the tourists have been staying away.$"
-
-LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B
-	.string "Hey, down in front!\n"
-	.string "I can’t see the TV!$"
-
-LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3
-	.string "Amazing! You’re telling me a POKéMON\n"
-	.string "found someone’s lost item?\p"
-	.string "That’s something. If we had some smart\n"
-	.string "POKéMON like that…\p"
-	.string "We could recover anything that our\n"
-	.string "guests mislaid…$"
-
-LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470
-	.string "Oh, sorry, sorry!\n"
-	.string "I was too involved in watching TV!\p"
-	.string "I heard that someone busted\n"
-	.string "the TEAM AQUA HIDEOUT.\p"
-	.string "Thanks to that, we just booked\n"
-	.string "a reservation from a big group.\p"
-	.string "It was a company called… Uh…\n"
-	.string "GAME something…$"
-
-LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544
-	.string "Amazing! A house-sitting POKéMON\n"
-	.string "caught a burglar?\p"
-	.string "That’s something. If we had a tough\n"
-	.string "POKéMON as a security guard…\p"
-	.string "We would be able to provide our guests\n"
-	.string "with greater safety.$"
-
-LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4
-	.string "Oh, sorry, sorry!\n"
-	.string "I was too involved in watching TV.\p"
-	.string "Oh, yes. A big group of guests arrived\n"
-	.string "a little while ago.\p"
-	.string "They booked in as GAME FREAK,\n"
-	.string "so I guess they must make games.\p"
-	.string "Uh-oh, I’d better get working on\n"
-	.string "their dinner!$"
-
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 f57ca14b5..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
-	step_right
-	step_26
-	step_end
-
-LilycoveCity_Harbor_Movement_21E633: @ 821E633
-	step_up
-	step_end
-
-LilycoveCity_Harbor_Movement_21E635: @ 821E635
-	step_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
-	step_28
-	step_40
-	step_left
-	step_41
-	step_end
-
-LilycoveCity_Harbor_Movement_21E671: @ 821E671
-	step_40
-	step_down
-	step_41
-	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
-	step_26
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7
-	step_14
-	step_up
-	step_14
-	step_54
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC
-	step_14
-	step_14
-	step_14
-	step_right
-	step_26
-	step_14
-	step_54
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4
-	step_14
-	step_right
-	step_26
-	step_14
-	step_54
-	step_end
-
-LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA
-	step_14
-	step_14
-	step_14
-	step_up
-	step_14
-	step_54
-	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 8103a623c..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
-	step_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B
-	step_left
-	step_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E
-	step_right
-	step_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1
-	step_up
-	step_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/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
deleted file mode 100644
index 97dba4704..000000000
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ /dev/null
@@ -1,340 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
-	map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_219745
-	map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE
-	.byte 0
-
-LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745
-	checkflag FLAG_0x0A0
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754
-	checkflag FLAG_0x0A1
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763
-	checkflag FLAG_0x0A2
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772
-	checkflag FLAG_0x0A3
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
-	checkflag FLAG_0x0A4
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
-	setmetatile 10, 6, 606, 1
-	setmetatile 11, 6, 607, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3
-	setmetatile 18, 6, 604, 1
-	setmetatile 19, 6, 605, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB
-	setmetatile 14, 10, 608, 1
-	setmetatile 15, 10, 609, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3
-	setmetatile 6, 10, 602, 1
-	setmetatile 7, 10, 603, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
-	setmetatile 2, 6, 610, 1
-	setmetatile 3, 6, 611, 1
-	end
-
-LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
-	map_script_2 VAR_0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219808
-	.2byte 0
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808
-	lockall
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, 3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
-	waitmovement 0
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, 3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
-	waitmovement 0
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, 3
-	copyvar VAR_0x4094, 0x1
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861
-	step_27
-	step_end
-
-LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
-	step_01
-	step_14
-	step_end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
-	lockall
-	checkflag FLAG_0x0EC
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219921
-	specialvar VAR_0x8004, sub_80F8940
-	switch VAR_0x8004
-	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
-	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, 4
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, 4
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4
-	givedecoration_std 44
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
-	setflag FLAG_0x0EC
-	closemessage
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911
-	call LilycoveCity_LilycoveMuseum_2F_EventScript_272071
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, 4
-	closemessage
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, 2
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B
-	lockall
-	checkflag FLAG_0x0A2
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E
-	lockall
-	checkflag FLAG_0x0A4
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951
-	lockall
-	checkflag FLAG_0x0A0
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964
-	lockall
-	checkflag FLAG_0x0A1
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977
-	lockall
-	checkflag FLAG_0x0A3
-	goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
-	fadescreen 1
-	drawcontestwinner 9
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
-	fadescreen 1
-	drawcontestwinner 10
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
-	fadescreen 1
-	drawcontestwinner 11
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
-	fadescreen 1
-	drawcontestwinner 12
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3
-	fadescreen 1
-	drawcontestwinner 13
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB
-	.string "This is our special exhibit hall.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D
-	.string "As you can plainly see, there is not\n"
-	.string "a single painting on exhibit.\p"
-	.string "Here, I don’t wish to exhibit works of\n"
-	.string "so-called classical art.\p"
-	.string "Such classical works you can see on\n"
-	.string "our ground floor.\p"
-	.string "I wish to exhibit work that is far\n"
-	.string "different from the classics.\p"
-	.string "Art, after all, is not restricted to old,\n"
-	.string "famous works!\p"
-	.string "This exhibit hall, I wish to fill it with…\p"
-	.string "Modern and vibrant artworks of\n"
-	.string "POKéMON seemingly ready to spring\l"
-	.string "forth into glorious life!$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4
-	.string "I beg your pardon. I didn’t intend\n"
-	.string "to monopolize the conversation.\p"
-	.string "Now, as you are young, and yet\n"
-	.string "obviously well traveled…\p"
-	.string "You must encounter lively POKéMON\n"
-	.string "and works of art depicting them.\p"
-	.string "If you were to come across such\n"
-	.string "a painting, may we ask you to obtain\l"
-	.string "the artist’s permission to exhibit\l"
-	.string "it here?$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3
-	.string "I wish to fill this exhibit hall with\n"
-	.string "modern and vibrant paintings of\l"
-	.string "POKéMON.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42
-	.string "Thanks to you, we’ve added a new\n"
-	.string "painting to our collection!\p"
-	.string "I’ve heard it depicts your POKéMON.\n"
-	.string "Truly magnificent!\p"
-	.string "Thank you so very, very much!$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4
-	.string "Ah! It’s you!\n"
-	.string "{PLAYER}!$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6
-	.string "Isn’t this marvelous?\n"
-	.string "This collection of paintings!\p"
-	.string "Each one of them flawless!\n"
-	.string "None better than another!\p"
-	.string "These paintings have attracted\n"
-	.string "more guests to our ART MUSEUM.\p"
-	.string "Sincerely, I thank you, {PLAYER}.\n"
-	.string "This is my dream come true!$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219EC5: @ 8219EC5
-	.string "This is merely a token of my gratitude.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED
-	.string "I will keep this for you until we\n"
-	.string "meet again.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B
-	.string "Ah, so good to see you, {PLAYER}!\p"
-	.string "It’s an honor to have you visit us\n"
-	.string "on your busy journeys.\p"
-	.string "Please, relax and do enjoy your\n"
-	.string "visit with us.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0
-	.string "It’s a picture frame with pink-colored\n"
-	.string "adornments.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3
-	.string "It’s a picture frame with\n"
-	.string "yellow-colored adornments.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008
-	.string "It’s a picture frame with\n"
-	.string "blue-colored adornments.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B
-	.string "It’s a picture frame with\n"
-	.string "red-colored adornments.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D
-	.string "It’s a picture frame with\n"
-	.string "green-colored adornments.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1
-	.string "It’s a painting of POKéMON.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD
-	.string "I’ve been away awhile, so the new\n"
-	.string "paintings up here surprised me.\p"
-	.string "I wish someone would paint my POKéMON\n"
-	.string "this pretty.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132
-	.string "Well… So this is where they show\n"
-	.string "the topical POKéMON paintings.\p"
-	.string "I see, these new paintings are indeed\n"
-	.string "rather amusing.$"
-
-LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8
-	.string "Wow, is that right?\n"
-	.string "These paintings are of your POKéMON.\p"
-	.string "Isn’t that just the ultimate joy for\n"
-	.string "a TRAINER?$"
-
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
deleted file mode 100644
index cdcef8e9a..000000000
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ /dev/null
@@ -1,864 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
-	map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
-	map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D
-	.byte 0
-
-LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
-	map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
-	.2byte 0
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
-	lockall
-	applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA
-	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, 4
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
-	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
-	waitmovement 0
-	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8
-	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, 4
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
-	waitmovement 0
-	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4
-	waitmovement 0
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
-	waitmovement 0
-	setvar VAR_0x4095, 2
-	releaseall
-	end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5
-	step_13
-	step_25
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD
-	step_17
-	step_17
-	step_15
-	step_15
-	step_17
-	step_15
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_21C804: @ 821C804
-	step_down
-	step_28
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
-	step_49
-	step_16
-	step_16
-	step_18
-	step_25
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
-	compare VAR_0x4095, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8
-	compare VAR_0x4095, 2
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
-	special sub_813BCE8
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
-	setvar VAR_0x8004, 8
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
-	setvar VAR_0x8004, 9
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
-	setvar VAR_0x8004, 10
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
-	setvar VAR_0x8004, 11
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
-	setvar VAR_0x8004, 12
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
-	setvar VAR_0x8004, 13
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
-	setvar VAR_0x8004, 14
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
-	setvar VAR_0x8004, 15
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA
-	specialvar VAR_RESULT, sub_80EE7C0
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1
-	clearflag FLAG_0x2DA
-	clearflag FLAG_0x0D2
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
-	setflag FLAG_0x2DA
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
-	setvar VAR_0x8005, 8
-	setvar VAR_0x8004, 8
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 9
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 10
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 11
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 12
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 13
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 14
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	setvar VAR_0x8004, 15
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
-	compare VAR_0x8005, 5
-	goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE:: @ 821C9AE
-	subvar VAR_0x8005, 1
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4:: @ 821C9B4
-	special sub_80EE72C
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8:: @ 821C9B8
-	setobjectxyperm 1, 7, 5
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0:: @ 821C9C0
-	setobjectxyperm 3, 3, 4
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8:: @ 821C9C8
-	setobjectxyperm 4, 7, 2
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0:: @ 821C9D0
-	setobjectxyperm 5, 5, 5
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8:: @ 821C9D8
-	setobjectxyperm 6, 5, 2
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0:: @ 821C9E0
-	setobjectxyperm 2, 8, 4
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8:: @ 821C9E8
-	setobjectxyperm 7, 3, 3
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0:: @ 821C9F0
-	setobjectxyperm 8, 8, 3
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8:: @ 821C9F8
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
-	lock
-	faceplayer
-	setvar VAR_0x8004, 13
-	special sub_813BDB4
-	compare VAR_0x4095, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
-	lock
-	faceplayer
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	compare VAR_0x4095, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
-	lock
-	faceplayer
-	setvar VAR_0x8004, 9
-	special sub_813BDB4
-	compare VAR_0x4095, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
-	lock
-	faceplayer
-	setvar VAR_0x8004, 10
-	special sub_813BDB4
-	compare VAR_0x4095, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
-	lock
-	faceplayer
-	setvar VAR_0x8004, 11
-	special sub_813BDB4
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
-	lock
-	faceplayer
-	setvar VAR_0x8004, 12
-	special sub_813BDB4
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
-	lock
-	faceplayer
-	setvar VAR_0x8004, 14
-	special sub_813BDB4
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
-	lock
-	faceplayer
-	setvar VAR_0x8004, 15
-	special sub_813BDB4
-	specialvar VAR_RESULT, sub_813BD60
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 7
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
-	specialvar VAR_RESULT, sub_813BCA8
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B
-	lock
-	faceplayer
-	checkflag FLAG_0x0D2
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
-	checkflag FLAG_0x0D2
-	goto_if 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
-	setvar VAR_0x8005, 11
-	special InterviewBefore
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
-	copyvar VAR_0x800A, VAR_0x8006
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4
-	setvar VAR_0x8004, 14
-	copyvar VAR_0x8005, VAR_0x800A
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
-	lock
-	faceplayer
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4
-	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4
-	setvar VAR_0x8004, 14
-	copyvar VAR_0x8005, VAR_0x800A
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
-	lock
-	faceplayer
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	message LilycoveCity_PokemonTrainerFanClub_Text_281C95
-	waitmessage
-	setvar VAR_0x8004, 2
-	special sub_813A128
-	waitstate
-	setvar VAR_0x8004, 8
-	switch VAR_RESULT
-	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
-	case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	copyvar VAR_0x8006, VAR_0x800A
-	copyvar VAR_0x8005, VAR_RESULT
-	special PutFanClubSpecialOnTheAir
-	goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5
-	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
-	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4
-	setflag FLAG_0x0D2
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
-	setvar VAR_0x8004, 8
-	special sub_813BDB4
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF
-	end
-
-LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00
-	.string "Oh, wow!\n"
-	.string "It’s {PLAYER}!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12
-	.string "I’ve heard the news!\n"
-	.string "You’re really strong, aren’t you?\p"
-	.string "We always argue about who is the\n"
-	.string "strongest of all TRAINERS here.\p"
-	.string "So when I heard about you, I decided\n"
-	.string "to be your fan!\p"
-	.string "I hope you’ll keep on battling other\n"
-	.string "tough TRAINERS.\p"
-	.string "That way, we’ll be able to see more\n"
-	.string "of your hot, hot battles.\p"
-	.string "That will make the others here see\n"
-	.string "exactly how great you are.\p"
-	.string "Remember, I’m cheering for you,\n"
-	.string "{PLAYER}!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D094: @ 821D094
-	.string "Yo, {PLAYER}!\n"
-	.string "You’re the one we want to win!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D0BB: @ 821D0BB
-	.string "The others, they don’t know that\n"
-	.string "you’re the best of the best!\p"
-	.string "Isn’t that right, {PLAYER}?\n"
-	.string "Show them you’ve got guts!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D12A: @ 821D12A
-	.string "I hate to say this, but the TRAINER\n"
-	.string "everybody’s talking about is\l"
-	.string "{STR_VAR_1}, no question about it!\p"
-	.string "That TRAINER’s power…\n"
-	.string "It’s out of the ordinary.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D1B5: @ 821D1B5
-	.string "Darn it… I’ve been telling people\n"
-	.string "that {STR_VAR_1} is the best now…\p"
-	.string "But no one wants to listen…$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C
-	.string "I’ve been hearing things about\n"
-	.string "a tough new TRAINER.\p"
-	.string "This TRAINER’s supposed to be beating\n"
-	.string "GYM LEADERS, even.\p"
-	.string "Do you know anything about this\n"
-	.string "new TRAINER?$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D2A6: @ 821D2A6
-	.string "Oh!\n"
-	.string "{PLAYER}!\p"
-	.string "Go for it!\n"
-	.string "I’m pulling for you!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE
-	.string "Sigh…\n"
-	.string "BRAWLY…\p"
-	.string "Oh, no! Wait!\n"
-	.string "That’s not right! No, no, no!\p"
-	.string "I’m your fan through and through!\p"
-	.string "So make me proud!\n"
-	.string "Go for it!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D347: @ 821D347
-	.string "I can’t help it, I can only get to\n"
-	.string "like BRAWLY…$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D377: @ 821D377
-	.string "Nobody understands the charm of\n"
-	.string "BRAWLY…\p"
-	.string "I don’t care!\p"
-	.string "Even if I’m the only one, I’m going\n"
-	.string "to keep cheering for BRAWLY!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D3EE: @ 821D3EE
-	.string "Whatever anyone says, my favorite\n"
-	.string "TRAINER is DEWFORD’s GYM LEADER\l"
-	.string "BRAWLY!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D438: @ 821D438
-	.string "You’ve surpassed your own father in\n"
-	.string "every regard!\p"
-	.string "I’m telling you, so there’s no question\n"
-	.string "about it at all!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D4A3: @ 821D4A3
-	.string "Even when things turned bleak,\n"
-	.string "your father never gave up.\p"
-	.string "This I know to be true.\p"
-	.string "You never give up even if you lose!\n"
-	.string "So keep on battling!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E
-	.string "NORMAN battled with more power,\n"
-	.string "charisma, and showmanship than you.\p"
-	.string "Even though people may say that\n"
-	.string "you’re strong…\p"
-	.string "You’ve still got a long way to go\n"
-	.string "compared to your father.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC
-	.string "You’re beginning to get the same\n"
-	.string "air of awe NORMAN exudes.\p"
-	.string "But there’s something conclusively\n"
-	.string "different between you and NORMAN.\p"
-	.string "I can’t tell you what that is.\n"
-	.string "You’ll have to find it yourself.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C
-	.string "Everyone here, we’re all huge fans\n"
-	.string "of POKéMON battles.\p"
-	.string "We discuss who we consider to be\n"
-	.string "the strongest of all TRAINERS.\p"
-	.string "If you were to become famous,\n"
-	.string "we might even become your fans!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D751: @ 821D751
-	.string "Oh, woweee! It’s {PLAYER}!\n"
-	.string "For real, too!\p"
-	.string "Please, shake my hand, shake my hand!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B
-	.string "I’ll always cheer for you, {PLAYER}!\n"
-	.string "Always, always!\p"
-	.string "I don’t want to see you lose ever,\n"
-	.string "{PLAYER}.\p"
-	.string "Because I know you’re really,\n"
-	.string "really strong, {PLAYER}!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822
-	.string "{STR_VAR_1} is really cool…\p"
-	.string "Everyone thinks so, right, right?$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D857: @ 821D857
-	.string "{STR_VAR_1} really is cool, don’t\n"
-	.string "you think so?\p"
-	.string "Even if it’s just me, I’m going to keep\n"
-	.string "cheering my favorite TRAINER.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4
-	.string "My favorite TRAINER is…\p"
-	.string "Cool…\p"
-	.string "Strong…\p"
-	.string "And really nice…\p"
-	.string "I wish there was a TRAINER like that…$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D921: @ 821D921
-	.string "Whoa! It’s {PLAYER}!\n"
-	.string "Wicked!\p"
-	.string "When I grow up, I want to be strong\n"
-	.string "like you, {PLAYER}!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D96A: @ 821D96A
-	.string "Even if I’m the only one…\p"
-	.string "You’ll always be the only one\n"
-	.string "I cheer for, {PLAYER}!\p"
-	.string "Because I believe in you, {PLAYER}!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21D9D1: @ 821D9D1
-	.string "{STR_VAR_1} is so wickedly cool…\n"
-	.string "I want to shake hands with my hero.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DA0D: @ 821DA0D
-	.string "Even if I’m the only one…\p"
-	.string "I’m never going to stop being\n"
-	.string "{STR_VAR_1}’s fan!\p"
-	.string "Because I’ve heard, {STR_VAR_1}\n"
-	.string "never loses!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73
-	.string "{PLAYER}!\n"
-	.string "You are amazing after all!\p"
-	.string "Ever since I set eyes on you,\n"
-	.string "I knew that you were great.\p"
-	.string "It looks like my eyes didn’t deceive me.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DAF5: @ 821DAF5
-	.string "Who cares about the others.\n"
-	.string "I’m in your corner!\p"
-	.string "You don’t need to worry. Just get\n"
-	.string "out there and battle like always.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69
-	.string "You’re a pretty decent TRAINER,\n"
-	.string "I think.\p"
-	.string "But I also think that {STR_VAR_1}\n"
-	.string "is number one right now.\p"
-	.string "That’s just my opinion.\n"
-	.string "Don’t worry about it too much.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DBFB: @ 821DBFB
-	.string "Wow, you really are strong.\n"
-	.string "Maybe even stronger than {STR_VAR_1}.\p"
-	.string "But {STR_VAR_1} needs me.\p"
-	.string "If I don’t cheer for {STR_VAR_1},\n"
-	.string "who will?$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DC68: @ 821DC68
-	.string "You’ve changed my mind!\n"
-	.string "You are strong, aren’t you?\p"
-	.string "I’d like you to tell me how you managed\n"
-	.string "to get so strong!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DCD6: @ 821DCD6
-	.string "The tougher the situation, the more\n"
-	.string "attractively you battle.\p"
-	.string "I can’t wait for your next battle!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DD36: @ 821DD36
-	.string "Among the recently hot TRAINERS,\n"
-	.string "{STR_VAR_1} is the standout.\p"
-	.string "That toughness, it’s simply not normal.\p"
-	.string "You’re doing okay, but you’re not in\n"
-	.string "the same class as {STR_VAR_1}.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE
-	.string "You are really popular…\p"
-	.string "You’re strong, and you’re caring to\n"
-	.string "POKéMON. No one can knock you.\p"
-	.string "But, you know, I believe in {STR_VAR_1}.\p"
-	.string "{STR_VAR_1} is definitely stronger!\n"
-	.string "I’m positive!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72
-	.string "You…\p"
-	.string "Impressive!$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83
-	.string "Your true worth, it is fine if only\n"
-	.string "I recognized it.\p"
-	.string "The others I doubt will understand\n"
-	.string "the hidden power that beats within.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DEFF: @ 821DEFF
-	.string "Yes, I see strength in your eyes.\p"
-	.string "But!\p"
-	.string "You still haven’t realized your\n"
-	.string "potential.$"
-
-LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51
-	.string "It is true that you are tremendously\n"
-	.string "powerful.\p"
-	.string "But!\n"
-	.string "I can tell…\p"
-	.string "That strength cannot be considered\n"
-	.string "true strength yet!\p"
-	.string "True strength is…!\n"
-	.string "… …\p"
-	.string "Actually, I have no idea, either.$"
-
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
deleted file mode 100644
index 0fcdc46d5..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
-	step_down
-	step_end
-
-LittlerootTown_Movement_1E7F9A: @ 81E7F9A
-	step_down
-	step_27
-	step_end
-
-LittlerootTown_Movement_1E7F9D: @ 81E7F9D
-	step_14
-	step_13
-	step_up
-	step_end
-
-LittlerootTown_Movement_1E7FA1: @ 81E7FA1
-	step_up
-	step_54
-	step_end
-
-LittlerootTown_Movement_1E7FA4: @ 81E7FA4
-	step_14
-	step_13
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E7FA9: @ 81E7FA9
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_Movement_1E7FAC: @ 81E7FAC
-	step_45
-	step_14
-	step_14
-	step_14
-	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
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_17
-	step_00
-	step_end
-
-LittlerootTown_Movement_1E80DF: @ 81E80DF
-	step_down
-	step_end
-
-LittlerootTown_Movement_1E80E1: @ 81E80E1
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_25
-	step_end
-
-LittlerootTown_Movement_1E80EB: @ 81E80EB
-	step_40
-	step_down
-	step_41
-	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
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_18
-	step_00
-	step_end
-
-LittlerootTown_Movement_1E8118: @ 81E8118
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_25
-	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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_Movement_1E85D8: @ 81E85D8
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_Movement_1E85DF: @ 81E85DF
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_1E85E4: @ 81E85E4
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_1E85EA: @ 81E85EA
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_1E85ED: @ 81E85ED
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_1E85F1: @ 81E85F1
-	step_left
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_1E85F5: @ 81E85F5
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_1E85F8: @ 81E85F8
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_1E85FE: @ 81E85FE
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_1E8603: @ 81E8603
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LittlerootTown_Movement_1E8609: @ 81E8609
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LittlerootTown_Movement_1E860F: @ 81E860F
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E8615: @ 81E8615
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E861C: @ 81E861C
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E8620: @ 81E8620
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E8625: @ 81E8625
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E862A: @ 81E862A
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E862E: @ 81E862E
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E8635: @ 81E8635
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_1E863B: @ 81E863B
-	step_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 0f3fa1a0e..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
-	step_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
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_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
-	step_27
-	step_left
-	step_26
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_up
-	step_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
-	step_14
-	step_13
-	step_28
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB
-	step_14
-	step_13
-	step_28
-	step_14
-	step_14
-	step_26
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02
-	step_14
-	step_13
-	step_27
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_27
-	step_left
-	step_26
-	step_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16
-	step_27
-	step_left
-	step_26
-	step_up
-	step_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_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
deleted file mode 100644
index a5223d38a..000000000
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ /dev/null
@@ -1,318 +0,0 @@
-LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
-	map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE
-	map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A
-	.byte 0
-
-LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
-	compare VAR_0x408D, 2
-	call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457
-	compare VAR_0x408D, 3
-	call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A
-	compare VAR_0x4092, 4
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE
-	call LittlerootTown_BrendansHouse_2F_EventScript_275CE1
-	setvar VAR_0x4089, 0
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
-	checkflag FLAG_0x124
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433
-	compare VAR_0x4084, 2
-	goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456
-	goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456
-	compare VAR_0x40D3, 2
-	goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309
-	setobjectxyperm 1, 0, 2
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
-	checkplayergender
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464
-	setvar VAR_0x408D, 2
-	return
-
-LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
-	map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474
-	.2byte 0
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq EventScript_275D0C
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481
-	lockall
-	compare VAR_0x408D, 2
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
-	delay 10
-	addobject 1
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_272598
-	waitmovement 0
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_27259A
-	waitmovement 0
-	delay 10
-	playbgm MUS_BOY_SUP, 1
-	compare VAR_FACING, 2
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507
-	compare VAR_FACING, 1
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536
-	compare VAR_FACING, 3
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565
-	compare VAR_FACING, 4
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594
-	setvar VAR_0x408D, 3
-	setflag FLAG_0x331
-	clearflag FLAG_0x2F8
-	setvar VAR_0x4050, 1
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0
-	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
-	closemessage
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7
-	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
-	closemessage
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8
-	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
-	closemessage
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD
-	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4
-	closemessage
-	applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC
-	step_down
-	step_down
-	step_27
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF
-	step_14
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7
-	step_left
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2
-	step_14
-	step_26
-	step_14
-	step_14
-	step_27
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8
-	step_left
-	step_left
-	step_down
-	step_27
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6
-	step_13
-	step_14
-	step_26
-	step_14
-	step_14
-	step_27
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604
-	step_up
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609
-	step_14
-	step_14
-	step_27
-	step_end
-
-gUnknown_081F860D:: @ 81F860D
-	lockall
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
-	setvar VAR_0x8004, 1
-	special DoPCTurnOnEffect
-	playse SE_PC_ON
-	msgbox gUnknown_08272D87, 4
-	special BedroomPC
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F
-	setvar VAR_0x8004, 1
-	playse SE_PC_OFF
-	special DoPCTurnOffEffect
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C
-	msgbox gUnknown_08272CD5, 4
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656
-LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F
-LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3
-	end
-
-LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668
-	.string "The clock is stopped…\p"
-	.string "Better set it and start it!$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A
-	.string "MOM: {PLAYER}, how do you like your\n"
-	.string "new room?\p"
-	.string "Good! Everything’s put away neatly!\p"
-	.string "They finished moving everything in\n"
-	.string "downstairs, too.\p"
-	.string "POKéMON movers are so convenient!\p"
-	.string "Oh, you should make sure that\n"
-	.string "everything’s all there on your desk.$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F
-	.string "{PLAYER} flipped open the notebook.\p"
-	.string "ADVENTURE RULE NO. 1\n"
-	.string "Open the MENU with START.\p"
-	.string "ADVENTURE RULE NO. 2\n"
-	.string "Record your progress with SAVE.\p"
-	.string "The remaining pages are blank…$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820
-	.string "{PLAYER} took a closer look at the\n"
-	.string "HOENN region map.$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F
-	.string "It’s a Nintendo GameCube.\p"
-	.string "A Game Boy Advance is connected to\n"
-	.string "serve as the Controller.$"
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
deleted file mode 100644
index e0229b9ea..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
-	step_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
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_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
-	step_27
-	step_left
-	step_26
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_up
-	step_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
-	step_14
-	step_13
-	step_28
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4
-	step_14
-	step_13
-	step_28
-	step_14
-	step_14
-	step_26
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB
-	step_14
-	step_13
-	step_27
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5
-	step_28
-	step_right
-	step_26
-	step_up
-	step_up
-	step_27
-	step_left
-	step_26
-	step_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF
-	step_27
-	step_left
-	step_26
-	step_up
-	step_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/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
deleted file mode 100644
index f300b5849..000000000
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ /dev/null
@@ -1,422 +0,0 @@
-LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
-	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1
-	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_1F931D
-	.byte 0
-
-LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
-	compare VAR_0x408D, 2
-	call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A
-	compare VAR_0x408D, 3
-	call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD
-	compare VAR_0x4092, 4
-	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE
-	call LittlerootTown_MaysHouse_2F_EventScript_275CE1
-	setvar VAR_0x4089, 0
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
-	checkflag FLAG_0x124
-	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6
-	compare VAR_0x4084, 2
-	goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
-	goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
-
-LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
-	checkplayergender
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
-	compare VAR_0x40D3, 2
-	goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
-	setobjectxyperm 1, 8, 2
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309
-LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
-	return
-
-LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
-	return
-
-LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317
-	setvar VAR_0x408D, 2
-	return
-
-LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
-	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327
-	.2byte 0
-
-LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
-	checkplayergender
-	compare VAR_RESULT, 1
-	goto_eq EventScript_275D0C
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
-	lockall
-	compare VAR_0x408D, 2
-	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
-	delay 10
-	addobject 1
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_272598
-	waitmovement 0
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_27259A
-	waitmovement 0
-	delay 10
-	playbgm MUS_GIRL_SUP, 1
-	compare VAR_FACING, 2
-	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA
-	compare VAR_FACING, 1
-	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9
-	compare VAR_FACING, 3
-	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418
-	compare VAR_FACING, 4
-	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440
-	setvar VAR_0x408D, 3
-	setflag FLAG_0x332
-	clearflag FLAG_0x2D2
-	setvar VAR_0x4050, 1
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473
-	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4
-	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
-	closemessage
-	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B
-	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4
-	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
-	closemessage
-	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D
-	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6
-	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
-	closemessage
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD
-	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4
-	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4
-	closemessage
-	applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB
-	applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2
-	waitmovement 0
-	return
-
-LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F
-	step_down
-	step_down
-	step_28
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473
-	step_right
-	step_right
-	step_down
-	step_down
-	step_right
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479
-	step_up
-	step_up
-	step_up
-	step_28
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483
-	step_14
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_28
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F
-	step_up
-	step_28
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4
-	step_up
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9
-	step_14
-	step_14
-	step_28
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD
-	step_right
-	step_right
-	step_down
-	step_28
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
-	step_end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1
-LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1
-	lockall
-	checkflag FLAG_0x124
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, 4
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, 4
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E
-	waitmovement 0
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F
-	setflag FLAG_0x125
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D
-	checkflag FLAG_0x125
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F
-	checkflag FLAG_0x125
-	goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4
-	return
-
-gUnknown_081F9553:: @ 81F9553
-	lockall
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
-	msgbox gUnknown_08272CD5, 4
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
-	setvar VAR_0x8004, 2
-	special DoPCTurnOnEffect
-	playse SE_PC_ON
-	msgbox gUnknown_08272D87, 4
-	special BedroomPC
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F
-	setvar VAR_0x8004, 2
-	playse SE_PC_OFF
-	special DoPCTurnOffEffect
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C
-	.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_2F_Text_1F978A: @ 81F978A
-	.string "POKéMON fully restored!\n"
-	.string "Items ready, and…$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4
-	.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_2F_Text_1F9962: @ 81F9962
-	.string "POKéMON fully restored…\n"
-	.string "Items all packed, and…$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991
-LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991
-	.string "It’s {RIVAL}’s POKé BALL!\p"
-	.string "Better leave it right where it is.$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9
-	.string "MAY: {PLAYER}{KUN}!\p"
-	.string "I was just checking my POKéDEX.\p"
-	.string "There’s still a lot of POKéMON that\n"
-	.string "I’ve seen but haven’t caught.\p"
-	.string "And there are many others that\n"
-	.string "I think will evolve.\p"
-	.string "I wonder where I should go catch\n"
-	.string "some POKéMON next?$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E
-	.string "MAY: I wonder where I should go catch\n"
-	.string "some POKéMON next?\p"
-	.string "Wouldn’t it be funny if we ran into each\n"
-	.string "other, {PLAYER}{KUN}?$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D
-	.string "BRENDAN: Hey, it’s {PLAYER}.\p"
-	.string "I was just checking out my POKéDEX.\p"
-	.string "There are still many POKéMON that\n"
-	.string "I need to catch, I know, but this\l"
-	.string "is looking pretty good.\p"
-	.string "Checking this POKéDEX out gives me\n"
-	.string "the urge to hit the road again.$"
-
-LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7
-	.string "BRENDAN: I’m having a hard time deciding\n"
-	.string "where I should catch POKéMON next.\p"
-	.string "Hey, {PLAYER}, if I see you while I’m out\n"
-	.string "catching POKéMON, I can pitch you a\l"
-	.string "battle if you’d like.$"
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
deleted file mode 100644
index c7d968d78..000000000
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ /dev/null
@@ -1,1030 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
-	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1
-	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06
-	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9
-	.byte 0
-
-LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
-	call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
-	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
-	compare VAR_0x40D3, 4
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
-	compare VAR_0x40D3, 3
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
-	specialvar VAR_RESULT, sub_80C08E4
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
-	setobjectmovementtype 3, 3
-	setobjectxyperm 3, 5, 10
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
-	setvar VAR_0x40D3, 4
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
-	setmaplayoutindex 432
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
-	setmaplayoutindex 432
-	setobjectmovementtype 3, 3
-	setobjectxyperm 3, 5, 10
-	end
-
-LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
-	map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
-	map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
-	map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
-	map_script_2 VAR_0x40D3, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
-	map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
-	map_script_2 VAR_0x40D3, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
-	.2byte 0
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
-	turnobject 255, 2
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45
-	turnobject 255, 2
-	addobject 2
-	addobject 3
-	turnobject 3, 2
-	setobjectxy 3, 5, 5
-	turnobject 2, 1
-	setobjectxy 2, 6, 4
-	turnobject 1, 4
-	setobjectxy 1, 10, 10
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71:: @ 81F9D71
-	addobject 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
-	addobject 4
-	addobject 5
-	addobject 6
-	addobject 3
-	turnobject 4, 1
-	setobjectxy 4, 8, 4
-	turnobject 5, 1
-	setobjectxy 5, 9, 4
-	turnobject 6, 1
-	setobjectxy 6, 10, 4
-	turnobject 2, 1
-	setobjectxy 2, 6, 4
-	turnobject 3, 4
-	setobjectxy 3, 5, 5
-	end
-
-LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9
-	map_script_2 VAR_0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
-	map_script_2 VAR_0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80
-	map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62
-	.2byte 0
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
-	lockall
-	bufferleadmonspeciesname 0
-	message LittlerootTown_ProfessorBirchsLab_Text_1FA74D
-	waitmessage
-	playfanfare MUS_FANFA4
-	waitfanfare
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07
-	setvar VAR_0x8004, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4
-	clearflag FLAG_0x3DF
-	setvar VAR_0x4084, 3
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67
-	lockall
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78
-	waitmovement 0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8
-	end
-
-LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
-	lockall
-	delay 30
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, 4
-	closemessage
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46
-	waitmovement 0
-	delay 20
-	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 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4
-	waitmovement 0
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C
-	playse SE_PC_ON
-	waitse
-	delay 20
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58
-	waitmovement 0
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6
-	waitmovement 0
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4
-	playfanfare MUS_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_1FB436
-	waitmessage
-	waitfanfare
-	setflag FLAG_SYS_NATIONAL_DEX
-	special EnableNationalPokedex
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4
-	closemessage
-	setflag FLAG_0x31B
-	setflag FLAG_0x31A
-	setvar VAR_0x40D3, 2
-	setvar VAR_0x40F5, 0
-	setflag FLAG_0x072
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, 4
-	closemessage
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, 4
-	closemessage
-	return
-
-LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46
-	step_left
-	step_25
-	step_14
-	step_14
-	step_right
-	step_25
-	step_14
-	step_14
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_25
-	step_end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62
-	lockall
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C
-	waitmovement 0
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, 4
-	setvar VAR_0x40D3, 5
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84
-	lock
-	faceplayer
-	compare VAR_0x4084, 3
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1
-	checkflag FLAG_0x058
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, 4
-	setflag FLAG_0x058
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
-	release
-	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
-	waitmovement 0
-	drawmonpic SPECIES_CYNDAQUIL, 10, 3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
-	release
-	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
-	waitmovement 0
-	drawmonpic SPECIES_TOTODILE, 10, 3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
-	release
-	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
-	applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
-	waitmovement 0
-	drawmonpic SPECIES_CHIKORITA, 10, 3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, 4
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
-	erasemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, 4
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
-	bufferspeciesname 0, SPECIES_CYNDAQUIL
-	setvar VAR_TEMP_1, 155
-	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
-	erasemonpic
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
-	removeobject 4
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
-	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
-	removeobject 4
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
-	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
-	erasemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4
-	setvar VAR_0x40D3, 6
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
-	bufferspeciesname 0, SPECIES_TOTODILE
-	setvar VAR_TEMP_1, 158
-	givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
-	erasemonpic
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
-	removeobject 5
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
-	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
-	removeobject 5
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
-	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
-	erasemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4
-	setvar VAR_0x40D3, 6
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
-	bufferspeciesname 0, SPECIES_CHIKORITA
-	setvar VAR_TEMP_1, 152
-	givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
-	compare VAR_RESULT, 1
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
-	erasemonpic
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_273811
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
-	removeobject 6
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
-	call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
-	removeobject 6
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
-	call LittlerootTown_ProfessorBirchsLab_EventScript_273797
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
-	call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
-	erasemonpic
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4
-	setvar VAR_0x40D3, 6
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F
-	playfanfare MUS_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_1FB9D7
-	waitmessage
-	waitfanfare
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
-	lock
-	faceplayer
-	compare VAR_0x40D3, 5
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
-	compare VAR_0x40D3, 2
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
-	checkflag FLAG_0x119
-	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
-	checkflag FLAG_0x380
-	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141
-	compare VAR_0x40D3, 3
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
-	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141
-	compare VAR_0x4084, 5
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2
-Route101_EventScript_1FA2D2:: @ 81FA2D2
-	msgbox Route101_Text_2B5F52, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox Route101_Text_2B603A, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x119
-	setvar VAR_0x40DA, 2
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, 4
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, 4
-	closemessage
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0
-	waitmovement 0
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8
-	waitmovement 0
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F
-	setvar VAR_0x4084, 5
-	setflag FLAG_0x074
-	setvar VAR_0x4051, 1
-	setvar VAR_0x408D, 4
-	setvar VAR_0x4050, 3
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4
-	giveitem_std ITEM_POKE_BALL, 5
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4
-	setvar VAR_RESULT, 0
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4
-	giveitem_std ITEM_POKE_BALL, 5
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4
-	setvar VAR_RESULT, 1
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC
-	playfanfare MUS_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_1FAC32
-	waitfanfare
-	setflag FLAG_SYS_POKEDEX_GET
-	special sub_81AFDA0
-	setflag FLAG_0x8E4
-	setvar VAR_0x40CD, 1
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0
-	step_down
-	step_27
-	step_end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC
-	lock
-	faceplayer
-	compare VAR_0x40D3, 5
-	goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A
-	compare VAR_0x40D3, 6
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465
-	compare VAR_0x40D3, 2
-	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9
-	compare VAR_RESULT, 1
-	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6
-	lockall
-	pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A
-	waitmessage
-	clearflag FLAG_0x072
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2
-	.string "Hunh? PROF. BIRCH?\p"
-	.string "The PROF’s away on fieldwork.\n"
-	.string "Ergo, he isn’t here.\p"
-	.string "Oh, let me explain what fieldwork is.\p"
-	.string "It is to study things in the natural\n"
-	.string "environment, like fields and mountains,\l"
-	.string "instead of a laboratory.\p"
-	.string "The PROF isn’t one for doing desk work.\n"
-	.string "He’s the type of person who would\l"
-	.string "rather go outside and experience\l"
-	.string "things than read about them here.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641
-	.string "The PROF isn’t one for doing desk work.\n"
-	.string "He’s the type of person who would\l"
-	.string "rather go outside and experience\l"
-	.string "things than read about them here.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE
-	.string "PROF. BIRCH is studying the habitats\n"
-	.string "and distribution of POKéMON.\p"
-	.string "The PROF enjoys {RIVAL}’s help, too.\n"
-	.string "There’s a lot of love there.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D
-	.string "PROF. BIRCH: So, {PLAYER}{KUN}.\p"
-	.string "I’ve heard so much about you from\n"
-	.string "your father.\p"
-	.string "I’ve heard that you don’t have your\n"
-	.string "own POKéMON yet.\p"
-	.string "But the way you battled earlier,\n"
-	.string "you pulled it off with aplomb!\p"
-	.string "I guess you have your father’s blood\n"
-	.string "in your veins after all!\p"
-	.string "Oh, yes. As thanks for rescuing me,\n"
-	.string "I’d like you to have the POKéMON you\l"
-	.string "used earlier.\p"
-	.string "{PLAYER} received the {STR_VAR_1}!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1
-	.string "PROF. BIRCH: While you’re at it, why not\n"
-	.string "give a nickname to that {STR_VAR_1}?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6
-	.string "PROF. BIRCH: If you work at POKéMON\n"
-	.string "and gain experience, I think you’ll make\l"
-	.string "an extremely good TRAINER.\p"
-	.string "My kid, {RIVAL}, is also studying\n"
-	.string "POKéMON while helping me out.\p"
-	.string "{PLAYER}{KUN}, don’t you think it might be\n"
-	.string "a good idea to go see {RIVAL}?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5
-	.string "PROF. BIRCH: Great!\n"
-	.string "{RIVAL} should be happy, too.\p"
-	.string "Get {RIVAL} to teach you what it\n"
-	.string "means to be a TRAINER.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35
-	.string "PROF. BIRCH: Oh, don’t be that way.\n"
-	.string "You should go meet my kid.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74
-	.string "PROF. BIRCH: {RIVAL}?\n"
-	.string "Gone home, I think.\p"
-	.string "Or maybe that kid’s scrabbling around\n"
-	.string "in tall grass again somewhere…\p"
-	.string "If you or your POKéMON get tired,\n"
-	.string "you should get some rest at home.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22
-	.string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p"
-	.string "I heard you beat {RIVAL} on\n"
-	.string "your first try. That’s excellent!\p"
-	.string "{RIVAL}’s been helping with my research\n"
-	.string "for a long time.\p"
-	.string "{RIVAL} has an extensive history as\n"
-	.string "a TRAINER already.\p"
-	.string "Here, {PLAYER}{KUN}, I ordered this for my\n"
-	.string "research, but I think you should have\l"
-	.string "this POKéDEX.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAC32: @ 81FAC32
-	.string "{PLAYER} received the POKéDEX!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B
-	.string "PROF. BIRCH: The POKéDEX is a high-tech\n"
-	.string "tool that automatically makes a record\l"
-	.string "of any POKéMON you meet or catch.\p"
-	.string "My kid, {RIVAL}, goes everywhere\n"
-	.string "with it.\p"
-	.string "Whenever my kid catches a rare POKéMON\n"
-	.string "and records its data in the POKéDEX,\l"
-	.string "why, {RIVAL} looks for me while I’m out\l"
-	.string "doing fieldwork, and shows me.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F
-	.string "PROF. BIRCH: Countless POKéMON\n"
-	.string "await you!\p"
-	.string "Argh, I’m getting the itch to get out\n"
-	.string "and do fieldwork again!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7
-	.string "MAY: Oh, wow, {PLAYER}{KUN}!\n"
-	.string "You got a POKéDEX, too!\p"
-	.string "That’s great! Just like me!\n"
-	.string "I’ve got something for you, too!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40
-	.string "MAY: It’s fun if you can get a lot of\n"
-	.string "POKéMON!\p"
-	.string "I’m going to look all over the place\n"
-	.string "because I want different POKéMON.\p"
-	.string "If I find any cute POKéMON, I’ll catch\n"
-	.string "them with POKé BALLS!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3
-	.string "Oh? Your BAG’s full.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08
-	.string "MAY: I wonder where I should go look\n"
-	.string "for POKéMON next?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F
-	.string "BRENDAN: Huh…\n"
-	.string "So you got a POKéDEX, too.\p"
-	.string "Well then, here.\n"
-	.string "I’ll give you these.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E
-	.string "BRENDAN: You know it’s more fun to\n"
-	.string "have a whole bunch of POKéMON.\p"
-	.string "I’m going to explore all over the place\n"
-	.string "to find different POKéMON.\p"
-	.string "If I find any cool POKéMON, you bet\n"
-	.string "I’ll try to get them with POKé BALLS.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D
-	.string "Hey, your BAG’s full.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073
-	.string "BRENDAN: Where should I look for\n"
-	.string "POKéMON next…$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2
-	.string "It’s a serious-looking machine.\n"
-	.string "The PROF must use this for research.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7
-	.string "It’s a PC used for research.\n"
-	.string "Better not mess around with it.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124
-	.string "It’s crammed with books on POKéMON.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148
-	.string "It’s a book that’s too hard to read.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D
-	.string "PROF. BIRCH: Now…\p"
-	.string "{PLAYER}{KUN} and {RIVAL}, I’ve had the two\n"
-	.string "of you help me study POKéMON.\p"
-	.string "Thanks to your help, new facts\n"
-	.string "are coming to light.\p"
-	.string "It appears that in the HOENN region,\n"
-	.string "there are also POKéMON from other\l"
-	.string "regions.\p"
-	.string "It goes to show how rich and varied\n"
-	.string "the natural environments of HOENN\l"
-	.string "happen to be.\p"
-	.string "That’s why I think it’s necessary for\n"
-	.string "me to upgrade your POKéDEX to\l"
-	.string "the NATIONAL Mode.\p"
-	.string "Here, let me see your POKéDEX units.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F
-	.string "MAY: Eheheh!\p"
-	.string "It’s so cool that even my POKéDEX\n"
-	.string "is getting updated!\p"
-	.string "It’s because you went out and caught\n"
-	.string "so many POKéMON, {PLAYER}{KUN}!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E
-	.string "BRENDAN: I went out all over HOENN\n"
-	.string "and checked out POKéMON.\p"
-	.string "You can thank me for getting\n"
-	.string "the NATIONAL Mode POKéDEX.\p"
-	.string "Yep, you’re lucky, {PLAYER}!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419
-	.string "PROF. BIRCH: Okay, all done!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436
-	.string "{PLAYER}’s POKéDEX was upgraded\n"
-	.string "to the NATIONAL Mode!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466
-	.string "PROF. BIRCH: But listen.\n"
-	.string "You’ve become the CHAMPION,\l"
-	.string "but your POKéMON journey isn’t over.\p"
-	.string "There is no end to the road\n"
-	.string "that is POKéMON.\p"
-	.string "Somewhere, there is a grassy patch\n"
-	.string "that’s waiting for you!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528
-	.string "MAY: I think I’ll take a short break\n"
-	.string "from fieldwork.\p"
-	.string "I think I’ll help the PROF here for\n"
-	.string "a while.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A
-	.string "BRENDAN: For the time being,\n"
-	.string "I’m taking a break from fieldwork.\p"
-	.string "I’ll be helping out the PROF here\n"
-	.string "for a while.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9
-	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
-	.string "Let’s have a look at your POKéDEX.\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "Yes, there’s no doubt about it.\p"
-	.string "You really have completed the HOENN\n"
-	.string "region’s POKéDEX.\p"
-	.string "That’s more than just impressive.\p"
-	.string "I have a gift for you.\p"
-	.string "Consider it my show of appreciation\n"
-	.string "for the fantastic work you’ve done.\p"
-	.string "My gift is a rare POKéMON only found\n"
-	.string "in another region!\p"
-	.string "You can have any one of these\n"
-	.string "three POKéMON!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787
-	.string "PROF. BIRCH: These are rare POKéMON\n"
-	.string "only found in another region!\p"
-	.string "You can have any one of these\n"
-	.string "three POKéMON!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6
-	.string "PROF. BIRCH: The FIRE POKéMON\n"
-	.string "CYNDAQUIL caught your eye!\p"
-	.string "You’re as sharp as ever!\p"
-	.string "So the CYNDAQUIL is your choice?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869
-	.string "PROF. BIRCH: The WATER POKéMON\n"
-	.string "TOTODILE is your choice!\p"
-	.string "You know how to pick a good one.\p"
-	.string "So, you’ll take the TOTODILE?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0
-	.string "PROF. BIRCH: The GRASS POKéMON\n"
-	.string "CHIKORITA is your choice!\p"
-	.string "You sure know what you’re doing.\p"
-	.string "So, you’ll take the CHIKORITA?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959
-	.string "PROF. BIRCH: Take your time before\n"
-	.string "you decide.\p"
-	.string "They’re all invaluable POKéMON.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8
-	.string "PROF. BIRCH: I see!\n"
-	.string "You picked a fine POKéMON!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB9D7: @ 81FB9D7
-	.string "{PLAYER} received the {STR_VAR_1}\n"
-	.string "from PROF. BIRCH!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC
-	.string "Want to give a nickname to\n"
-	.string "the {STR_VAR_1} you received?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C
-	.string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n"
-	.string "You’ve completed the HOENN POKéDEX,\l"
-	.string "but your POKéMON journey isn’t over.\p"
-	.string "There is no end to the road\n"
-	.string "that is POKéMON.\p"
-	.string "Somewhere, there is a grassy patch\n"
-	.string "that’s waiting for you!$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8
-	.string "You received the promised POKéMON.\n"
-	.string "Better leave the others alone.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A
-	.string "Oh, you don’t have any room for\n"
-	.string "this POKéMON.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68
-	.string "MAY: {PLAYER}{KUN}, after this…\n"
-	.string "What are you going to do?\p"
-	.string "Are you going to keep battling\n"
-	.string "and sharpening your skills?\p"
-	.string "Or are you going to try filling\n"
-	.string "the NATIONAL POKéDEX?\p"
-	.string "I’m staying here to help the PROF.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D
-	.string "BRENDAN: Rather than collecting\n"
-	.string "POKéMON, I prefer slowly and \l"
-	.string "steadily raising the one I chose.$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBC8D: @ 81FBC8D
-	.string "MAY: Oh, hi, {PLAYER}{KUN}!\n"
-	.string "Have you gone to that place,\l"
-	.string "the BATTLE FRONTIER?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBCD2: @ 81FBCD2
-	.string "BRENDAN: Hey, {PLAYER}!\n"
-	.string "Have you gone out to that place,\l"
-	.string "the BATTLE FRONTIER?$"
-
-LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A
-	.string "… … … … … …\n"
-	.string "… … … … … Beep!\p"
-	.string "SCOTT: Hi, hi, {PLAYER}!\n"
-	.string "It’s me, SCOTT.\p"
-	.string "I’m aboard the S.S. TIDAL now.\n"
-	.string "It feels great to be on the sea!\p"
-	.string "By the way…\p"
-	.string "There’s this place that I’d like to\n"
-	.string "invite you to for a visit.\p"
-	.string "If you’re interested, board a ferry\n"
-	.string "at either SLATEPORT or LILYCOVE.\p"
-	.string "I’ll fill you in on the details when\n"
-	.string "we meet. I’ll be waiting!\p"
-	.string "… … … … … …\n"
-	.string "… … … … … Click!$"
diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc
deleted file mode 100644
index cb0580580..000000000
--- a/data/scripts/maps/MagmaHideout_4F.inc
+++ /dev/null
@@ -1,228 +0,0 @@
-MagmaHideout_4F_MapScripts:: @ 823A55F
-	.byte 0
-
-MagmaHideout_4F_EventScript_23A560:: @ 823A560
-	lockall
-	playbgm MUS_MGM0, 0
-	msgbox MagmaHideout_4F_Text_23A9F4, 4
-	closemessage
-	delay 20
-	setvar VAR_RESULT, 1
-	playse SE_W197
-	setfieldeffectargument 0, 18
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	waitfieldeffect 54
-	setvar VAR_RESULT, 1
-	playfanfare MUS_ME_TAMA
-	playse SE_TAMA
-	special sub_80B0534
-	applymovement 255, MagmaHideout_4F_Movement_2725A6
-	waitmovement 0
-	delay 150
-	removeobject 7
-	addobject 1
-	waitstate
-	delay 60
-	applymovement 1, MagmaHideout_4F_Movement_23A672
-	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, MagmaHideout_4F_Movement_23A67D
-	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
-	applymovement 6, MagmaHideout_4F_Movement_23A680
-	waitmovement 0
-	msgbox MagmaHideout_4F_Text_23AADA, 4
-	closemessage
-	applymovement 255, MagmaHideout_4F_Movement_2725A8
-	waitmovement 0
-	delay 30
-	applymovement 6, MagmaHideout_4F_Movement_27259E
-	waitmovement 0
-	msgbox MagmaHideout_4F_Text_23AB33, 4
-	closemessage
-	trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5
-	msgbox MagmaHideout_4F_Text_23ABE2, 4
-	closemessage
-	clearflag FLAG_0x348
-	clearflag FLAG_0x343
-	setvar VAR_0x4058, 1
-	setflag FLAG_0x06F
-	setvar VAR_0x40A0, 1
-	fadescreen 1
-	removeobject 6
-	removeobject 2
-	removeobject 3
-	removeobject 4
-	removeobject 5
-	setflag FLAG_0x359
-	fadescreen 0
-	releaseall
-	end
-
-MagmaHideout_4F_Movement_23A672: @ 823A672
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	step_end
-
-MagmaHideout_4F_Movement_23A67D: @ 823A67D
-	step_32
-	step_32
-	step_end
-
-MagmaHideout_4F_Movement_23A680: @ 823A680
-	step_02
-	step_14
-	step_03
-	step_14
-	step_02
-	step_14
-	step_03
-	step_14
-	step_01
-	step_14
-	step_14
-	step_end
-
-MagmaHideout_4F_EventScript_23A68C:: @ 823A68C
-	trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775
-	msgbox MagmaHideout_4F_Text_23A7B5, 6
-	end
-
-MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3
-	trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B
-	msgbox MagmaHideout_4F_Text_23A841, 6
-	end
-
-MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA
-	trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7
-	msgbox MagmaHideout_4F_Text_23A8C6, 6
-	end
-
-MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1
-	trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994
-	msgbox MagmaHideout_4F_Text_23A9AC, 6
-	end
-
-MagmaHideout_4F_Text_23A6E8: @ 823A6E8
-	.string "I want to see GROUDON, too, but they\n"
-	.string "won’t let me see even its tail…\p"
-	.string "It’s got me feeling really frustrated.\p"
-	.string "Oh, no!\n"
-	.string "I blabbed about GROUDON!$"
-
-MagmaHideout_4F_Text_23A775: @ 823A775
-	.string "I guess it’s impossible to win if one\n"
-	.string "doesn’t have a calm mind…$"
-
-MagmaHideout_4F_Text_23A7B5: @ 823A7B5
-	.string "I wonder if GROUDON even has a tail?$"
-
-MagmaHideout_4F_Text_23A7DA: @ 823A7DA
-	.string "Fuhahaha!\n"
-	.string "Soon! Very soon!\l"
-	.string "Our grand objective will be achieved!$"
-
-MagmaHideout_4F_Text_23A81B: @ 823A81B
-	.string "Grrr…\n"
-	.string "I’ve come so far, but now this?$"
-
-MagmaHideout_4F_Text_23A841: @ 823A841
-	.string "MAXIE, sir!\n"
-	.string "An intruder is headed your way!$"
-
-MagmaHideout_4F_Text_23A86D: @ 823A86D
-	.string "You’re not finished yet!\n"
-	.string "You’re not getting by me easily!$"
-
-MagmaHideout_4F_Text_23A8A7: @ 823A8A7
-	.string "Was I that easy to knock down?$"
-
-MagmaHideout_4F_Text_23A8C6: @ 823A8C6
-	.string "C-come on, one more match…$"
-
-MagmaHideout_4F_Text_23A8E1: @ 823A8E1
-	.string "Hehehe!\n"
-	.string "You made it this far, so I’ll tell you!\p"
-	.string "That’s right!\n"
-	.string "Up ahead, GROUDON is sleeping!\p"
-	.string "MAXIE went to GROUDON just seconds\n"
-	.string "ago!\p"
-	.string "It’s going to awaken real soon!\n"
-	.string "Hehe! Hehehe!$"
-
-MagmaHideout_4F_Text_23A994: @ 823A994
-	.string "Taken down again…\n"
-	.string "Hehe…$"
-
-MagmaHideout_4F_Text_23A9AC: @ 823A9AC
-	.string "…And while you wasted time with me,\n"
-	.string "MAXIE should have awakened GROUDON…$"
-
-MagmaHideout_4F_Text_23A9F4: @ 823A9F4
-	.string "MAXIE: GROUDON…\p"
-	.string "Nothing could awaken you from your\n"
-	.string "sleep bathed in magma…\p"
-	.string "This BLUE ORB is what you sought.\n"
-	.string "Wasn’t it?\p"
-	.string "I have brought you the BLUE ORB.\n"
-	.string "Let its shine awaken you!\p"
-	.string "And show me…\n"
-	.string "Show me the full extent of your power!$"
-
-MagmaHideout_4F_Text_23AADA: @ 823AADA
-	.string "MAXIE: GROUDON!\n"
-	.string "What’s wrong?\p"
-	.string "Wasn’t the BLUE ORB the key?\p"
-	.string "GROUDON!\n"
-	.string "Where have you gone…$"
-
-MagmaHideout_4F_Text_23AB33: @ 823AB33
-	.string "MAXIE: Oh, so it was you?\p"
-	.string "I’ve seen you poking around uninvited\n"
-	.string "here and there…\p"
-	.string "I get it now!\n"
-	.string "You must have pulled a cheap stunt!$"
-
-MagmaHideout_4F_Text_23ABB5: @ 823ABB5
-	.string "What makes you so adept at handling\n"
-	.string "POKéMON?$"
-
-MagmaHideout_4F_Text_23ABE2: @ 823ABE2
-	.string "MAXIE: There has to be some reason\n"
-	.string "why GROUDON fled…\p"
-	.string "That’s what you’re trying to say,\n"
-	.string "aren’t you?\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "Humph…\n"
-	.string "You think I didn’t know that?\p"
-	.string "With GROUDON gone, there is no longer\n"
-	.string "any need for this blasted volcano.\p"
-	.string "I am going after GROUDON, so this\n"
-	.string "is where we part!$"
-
diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc
deleted file mode 100644
index c8e7c6fad..000000000
--- a/data/scripts/maps/MarineCave_End.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-MarineCave_End_MapScripts:: @ 823AFDF
-	map_script 5, MarineCave_End_MapScript1_23AFEA
-	map_script 3, MarineCave_End_MapScript1_23B008
-	.byte 0
-
-MarineCave_End_MapScript1_23AFEA: @ 823AFEA
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, MarineCave_End_EventScript_23AFF4
-	end
-
-MarineCave_End_EventScript_23AFF4:: @ 823AFF4
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, MarineCave_End_EventScript_27374E
-	removeobject 1
-	return
-
-MarineCave_End_MapScript1_23B008: @ 823B008
-	checkflag FLAG_0x1BE
-	call_if 0, MarineCave_End_EventScript_23B012
-	end
-
-MarineCave_End_EventScript_23B012:: @ 823B012
-	clearflag FLAG_0x30E
-	setvar VAR_TEMP_1, 1
-	return
-
-MarineCave_End_EventScript_23B01B:: @ 823B01B
-	lockall
-	applymovement 255, MarineCave_End_Movement_2725B2
-	waitmovement 0
-	applymovement 1, MarineCave_End_Movement_23B09D
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KYOGRE, 2
-	delay 40
-	waitmoncry
-	setvar VAR_LAST_TALKED, 1
-	setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special BattleSetup_StartLegendaryBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	setvar VAR_TEMP_1, 0
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq MarineCave_End_EventScript_23B084
-	compare VAR_RESULT, 4
-	goto_eq MarineCave_End_EventScript_23B092
-	compare VAR_RESULT, 5
-	goto_eq MarineCave_End_EventScript_23B092
-	setvar VAR_0x4039, 1
-	setflag FLAG_0x1BE
-	releaseall
-	end
-
-MarineCave_End_EventScript_23B084:: @ 823B084
-	setvar VAR_0x4039, 1
-	setflag FLAG_0x1BE
-	goto MarineCave_End_EventScript_27376D
-	end
-
-MarineCave_End_EventScript_23B092:: @ 823B092
-	setvar VAR_0x8004, 404
-	goto MarineCave_End_EventScript_273776
-	end
-
-MarineCave_End_Movement_23B09D: @ 823B09D
-	step_5e
-	step_62
-	step_14
-	step_14
-	step_63
-	step_14
-	step_14
-	step_63
-	step_end
-
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/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
deleted file mode 100644
index 40578a907..000000000
--- a/data/scripts/maps/MauvilleCity.inc
+++ /dev/null
@@ -1,677 +0,0 @@
-MauvilleCity_MapScripts:: @ 81DF385
-	map_script 3, MauvilleCity_MapScript1_1DF38B
-	.byte 0
-
-MauvilleCity_MapScript1_1DF38B: @ 81DF38B
-	setflag FLAG_VISITED_MAUVILLE_CITY
-	clearflag FLAG_0x09D
-	clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
-	setflag FLAG_SYS_TV_START
-	clearflag FLAG_0x063
-	setvar VAR_0x4093, 0
-	checkflag FLAG_GOT_TM24_FROM_WATTSON
-	call_if 1, MauvilleCity_EventScript_1DF3A9
-	end
-
-MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
-	clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
-	setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
-	setflag FLAG_WATTSON_REMATCH_AVAILABLE
-	return
-
-MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
-	msgbox MauvilleCity_Text_1E0301, 2
-	end
-
-MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC
-	msgbox MauvilleCity_Text_1E037C, 2
-	end
-
-MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5
-	msgbox MauvilleCity_Text_1E03FB, 2
-	end
-
-MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE
-	msgbox MauvilleCity_Text_1E044A, 2
-	end
-
-MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7
-	msgbox MauvilleCity_Text_1E0485, 3
-	end
-
-MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0
-	msgbox MauvilleCity_Text_1E04B7, 3
-	end
-
-MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9
-	msgbox MauvilleCity_Text_1E0504, 3
-	end
-
-MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2
-	msgbox MauvilleCity_Text_1E053C, 3
-	end
-
-MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB
-	lock
-	faceplayer
-	checkflag FLAG_0x062
-	goto_eq MauvilleCity_EventScript_1DF413
-	msgbox MauvilleCity_Text_1E056A, 4
-	setflag FLAG_0x062
-	release
-	end
-
-MauvilleCity_EventScript_1DF413:: @ 81DF413
-	msgbox MauvilleCity_Text_1E0699, 4
-	release
-	end
-
-MauvilleCity_EventScript_1DF41D:: @ 81DF41D
-	lock
-	faceplayer
-	checkflag FLAG_0x11C
-	goto_eq MauvilleCity_EventScript_1DF43D
-	msgbox MauvilleCity_Text_1DF7DC, 4
-	closemessage
-	applymovement 7, MauvilleCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MauvilleCity_EventScript_1DF43D:: @ 81DF43D
-	msgbox MauvilleCity_Text_1DFAA5, 4
-	closemessage
-	applymovement 7, MauvilleCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MauvilleCity_EventScript_1DF452:: @ 81DF452
-	lockall
-	checkflag FLAG_0x11C
-	goto_eq MauvilleCity_EventScript_1DF690
-	applymovement 6, MauvilleCity_Movement_2725A8
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DF845, 4
-	msgbox MauvilleCity_Text_1DF8B9, 4
-	msgbox MauvilleCity_Text_1DF963, 4
-	applymovement 6, MauvilleCity_Movement_27259E
-	waitmovement 0
-	playse SE_PIN
-	applymovement 6, MauvilleCity_Movement_272598
-	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_27259A
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DF9B2, 5
-	goto MauvilleCity_EventScript_1DF4AD
-	end
-
-MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
-	compare VAR_RESULT, 1
-	call_if 1, MauvilleCity_EventScript_1DF63A
-	compare VAR_RESULT, 0
-	goto_eq MauvilleCity_EventScript_1DF683
-	closemessage
-	switch VAR_FACING
-	case 2, MauvilleCity_EventScript_1DF4E0
-	case 4, MauvilleCity_EventScript_1DF53D
-	end
-
-MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
-	applymovement 255, MauvilleCity_Movement_1DF6DF
-	applymovement 6, MauvilleCity_Movement_1DF6A8
-	applymovement 7, MauvilleCity_Movement_1DF6E2
-	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_2725A8
-	waitmovement 0
-	delay 30
-	applymovement 255, MauvilleCity_Movement_1DF6EE
-	applymovement 7, MauvilleCity_Movement_1DF6F3
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DFD34, 4
-	closemessage
-	applymovement 255, MauvilleCity_Movement_1DF6CC
-	applymovement 7, MauvilleCity_Movement_1DF6FA
-	applymovement 6, MauvilleCity_Movement_1DF6B4
-	waitmovement 0
-	goto MauvilleCity_EventScript_1DF593
-	end
-
-MauvilleCity_EventScript_1DF53D:: @ 81DF53D
-	applymovement 255, MauvilleCity_Movement_1DF6DC
-	applymovement 6, MauvilleCity_Movement_1DF6AE
-	applymovement 7, MauvilleCity_Movement_1DF6E8
-	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_2725A8
-	waitmovement 0
-	delay 30
-	applymovement 7, MauvilleCity_Movement_1DF6F7
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DFD34, 4
-	closemessage
-	applymovement 255, MauvilleCity_Movement_1DF6D0
-	applymovement 7, MauvilleCity_Movement_1DF703
-	applymovement 6, MauvilleCity_Movement_1DF6C0
-	waitmovement 0
-	goto MauvilleCity_EventScript_1DF593
-	end
-
-MauvilleCity_EventScript_1DF593:: @ 81DF593
-	removeobject 6
-	removeobject 7
-	clearflag FLAG_0x326
-	clearflag FLAG_0x329
-	setflag FLAG_0x0BE
-	setvar VAR_0x40F2, 0
-	setflag FLAG_0x088
-	compare VAR_FACING, 2
-	call_if 1, MauvilleCity_EventScript_1DF5F3
-	compare VAR_FACING, 4
-	call_if 1, MauvilleCity_EventScript_1DF601
-	applymovement 255, MauvilleCity_Movement_2725AA
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DFED5, 4
-	closemessage
-	addvar VAR_0x40D1, 1
-	compare VAR_FACING, 2
-	call_if 1, MauvilleCity_EventScript_1DF616
-	compare VAR_FACING, 4
-	call_if 1, MauvilleCity_EventScript_1DF628
-	removeobject 11
-	releaseall
-	end
-
-MauvilleCity_EventScript_1DF5F3:: @ 81DF5F3
-	addobject 11
-	applymovement 11, MauvilleCity_Movement_1DF70D
-	waitmovement 0
-	return
-
-MauvilleCity_EventScript_1DF601:: @ 81DF601
-	setobjectxyperm 11, 12, 13
-	addobject 11
-	applymovement 11, MauvilleCity_Movement_1DF719
-	waitmovement 0
-	return
-
-MauvilleCity_EventScript_1DF616:: @ 81DF616
-	applymovement 255, MauvilleCity_Movement_1DF6D5
-	applymovement 11, MauvilleCity_Movement_1DF725
-	waitmovement 0
-	return
-
-MauvilleCity_EventScript_1DF628:: @ 81DF628
-	applymovement 255, MauvilleCity_Movement_1DF6D8
-	applymovement 11, MauvilleCity_Movement_1DF72F
-	waitmovement 0
-	return
-
-MauvilleCity_EventScript_1DF63A:: @ 81DF63A
-	msgbox MauvilleCity_Text_1DFB6D, 4
-	trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96
-	applymovement 6, MauvilleCity_Movement_2725A8
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DFBC3, 4
-	applymovement 6, MauvilleCity_Movement_27259E
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DFBED, 4
-	applymovement 6, MauvilleCity_Movement_2725A8
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DFC8A, 4
-	return
-
-MauvilleCity_EventScript_1DF683:: @ 81DF683
-	setflag FLAG_0x11C
-	msgbox MauvilleCity_Text_1DFA4A, 4
-	release
-	end
-
-MauvilleCity_EventScript_1DF690:: @ 81DF690
-	applymovement 6, MauvilleCity_Movement_27259E
-	waitmovement 0
-	msgbox MauvilleCity_Text_1DFB42, 5
-	goto MauvilleCity_EventScript_1DF4AD
-	end
-
-MauvilleCity_Movement_1DF6A8: @ 81DF6A8
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_end
-
-MauvilleCity_Movement_1DF6AE: @ 81DF6AE
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_1DF6B4: @ 81DF6B4
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_13
-	step_end
-
-MauvilleCity_Movement_1DF6C0: @ 81DF6C0
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_13
-	step_end
-
-MauvilleCity_Movement_1DF6CC: @ 81DF6CC
-	step_14
-	step_13
-	step_27
-	step_end
-
-MauvilleCity_Movement_1DF6D0: @ 81DF6D0
-	step_14
-	step_14
-	step_14
-	step_27
-	step_end
-
-MauvilleCity_Movement_1DF6D5: @ 81DF6D5
-	step_14
-	step_27
-	step_end
-
-MauvilleCity_Movement_1DF6D8: @ 81DF6D8
-	step_14
-	step_14
-	step_27
-	step_end
-
-MauvilleCity_Movement_1DF6DC: @ 81DF6DC
-	step_14
-	step_25
-	step_end
-
-MauvilleCity_Movement_1DF6DF: @ 81DF6DF
-	step_14
-	step_27
-	step_end
-
-MauvilleCity_Movement_1DF6E2: @ 81DF6E2
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
-
-MauvilleCity_Movement_1DF6E8: @ 81DF6E8
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_1DF6EE: @ 81DF6EE
-	step_14
-	step_13
-	step_12
-	step_25
-	step_end
-
-MauvilleCity_Movement_1DF6F3: @ 81DF6F3
-	step_right
-	step_right
-	step_26
-	step_end
-
-MauvilleCity_Movement_1DF6F7: @ 81DF6F7
-	step_right
-	step_up
-	step_end
-
-MauvilleCity_Movement_1DF6FA: @ 81DF6FA
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_1DF703: @ 81DF703
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_1DF70D: @ 81DF70D
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-MauvilleCity_Movement_1DF719: @ 81DF719
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
-
-MauvilleCity_Movement_1DF725: @ 81DF725
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_1DF72F: @ 81DF72F
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_EventScript_1DF73A:: @ 81DF73A
-	lock
-	faceplayer
-	checkflag FLAG_GOT_TM24_FROM_WATTSON
-	goto_eq MauvilleCity_EventScript_1DF7B0
-	compare VAR_0x40BA, 2
-	goto_eq MauvilleCity_EventScript_1DF784
-	checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
-	goto_eq MauvilleCity_EventScript_1DF77A
-	msgbox MauvilleCity_Text_1DFFE4, 4
-	giveitem_std ITEM_BASEMENT_KEY
-	setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
-	msgbox MauvilleCity_Text_1E0154, 4
-	release
-	end
-
-MauvilleCity_EventScript_1DF77A:: @ 81DF77A
-	msgbox MauvilleCity_Text_1E0154, 4
-	release
-	end
-
-MauvilleCity_EventScript_1DF784:: @ 81DF784
-	msgbox MauvilleCity_Text_1E020E, 4
-	giveitem_std ITEM_TM24
-	compare VAR_RESULT, 0
-	goto_eq MauvilleCity_EventScript_272054
-	setflag FLAG_GOT_TM24_FROM_WATTSON
-	msgbox MauvilleCity_Text_1E02AA, 4
-	release
-	end
-
-MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0
-	msgbox MauvilleCity_Text_1E02AA, 4
-	release
-	end
-
-MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA
-	lockall
-	pokenavcall MauvilleCity_Text_1DFDFB
-	waitmessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox MauvilleCity_Text_1DFEB4, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x0D6
-	clearflag FLAG_0x088
-	releaseall
-	end
-
-MauvilleCity_Text_1DF7DC: @ 81DF7DC
-	.string "UNCLE: It’s because of POKéMON that\n"
-	.string "this boy’s got more pep, I suppose…\l"
-	.string "But he’s become a bit too peppy…$"
-
-MauvilleCity_Text_1DF845: @ 81DF845
-	.string "WALLY: Aww, UNCLE, please?\p"
-	.string "I want to challenge this GYM and see\n"
-	.string "how much better I’ve become.\p"
-	.string "Please? May I, please?$"
-
-MauvilleCity_Text_1DF8B9: @ 81DF8B9
-	.string "UNCLE: Now hold on, WALLY.\p"
-	.string "Since you started living with POKéMON,\n"
-	.string "you have grown quite a lot stronger.\p"
-	.string "But don’t you think you’re pushing it\n"
-	.string "to suddenly challenge a GYM?$"
-
-MauvilleCity_Text_1DF963: @ 81DF963
-	.string "WALLY: I’m not pushing it.\p"
-	.string "If I combine forces with RALTS,\n"
-	.string "we can beat anyone!$"
-
-MauvilleCity_Text_1DF9B2: @ 81DF9B2
-	.string "WALLY: Oh! Hi, {PLAYER}!\p"
-	.string "I’ve gotten a lot stronger since\n"
-	.string "we met.\p"
-	.string "{PLAYER}, I want you and my UNCLE to\n"
-	.string "understand that.\p"
-	.string "{PLAYER}, please, will you have\n"
-	.string "a battle with me?$"
-
-MauvilleCity_Text_1DFA4A: @ 81DFA4A
-	.string "WALLY: Oh… If you won’t battle me,\n"
-	.string "{PLAYER}, my UNCLE won’t know that I’ve\l"
-	.string "become really strong.$"
-
-MauvilleCity_Text_1DFAA5: @ 81DFAA5
-	.string "UNCLE: {PLAYER}{KUN}, was it?\n"
-	.string "On WALLY’s behalf, can I ask you to\l"
-	.string "battle with him just this once?\p"
-	.string "I don’t think he’s going to listen to\n"
-	.string "any reason the way he is now.$"
-
-MauvilleCity_Text_1DFB42: @ 81DFB42
-	.string "WALLY: {PLAYER}, please!\n"
-	.string "Battle with me, please.$"
-
-MauvilleCity_Text_1DFB6D: @ 81DFB6D
-	.string "WALLY: {PLAYER}, thank you.\p"
-	.string "Okay… Here I come!$"
-
-MauvilleCity_Text_1DFB96: @ 81DFB96
-	.string "WALLY: … … … … … … …\p"
-	.string "… … … … … … … …\p"
-	.string "I lost…$"
-
-MauvilleCity_Text_1DFBC3: @ 81DFBC3
-	.string "WALLY: UNCLE…\n"
-	.string "I’ll go back to VERDANTURF…$"
-
-MauvilleCity_Text_1DFBED: @ 81DFBED
-	.string "{PLAYER}, thank you.\n"
-	.string "Being a TRAINER is tough, isn’t it?\p"
-	.string "It’s not enough just to have POKéMON\n"
-	.string "and make them battle. That isn’t what\l"
-	.string "being a real TRAINER is about.$"
-
-MauvilleCity_Text_1DFC8A: @ 81DFC8A
-	.string "UNCLE: WALLY, there’s no need to be so\n"
-	.string "down on yourself.\p"
-	.string "Why, what’s keeping you from becoming\n"
-	.string "stronger and stronger?\p"
-	.string "Come on, let’s go home.\n"
-	.string "Everyone’s waiting for you.$"
-
-MauvilleCity_Text_1DFD34: @ 81DFD34
-	.string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n"
-	.string "that you must be the TRAINER who kept\l"
-	.string "an eye out for WALLY when he caught\l"
-	.string "his POKéMON.\p"
-	.string "Why don’t you visit us in VERDANTURF\n"
-	.string "sometime?\l"
-	.string "I’m sure WALLY would enjoy it.$"
-
-
-MauvilleCity_Text_1DFDFB: @ 81DFDFB
-	.string "… … … … … …\n"
-	.string "… … … … … Beep!\p"
-	.string "WALLY: Oh, hello, {PLAYER}!\p"
-	.string "I just wanted to tell you that\n"
-	.string "my uncle bought me a POKéNAV!\p"
-	.string "Now I can get in touch with you\n"
-	.string "anytime, {PLAYER}!\p"
-	.string "… … … … … …\n"
-	.string "… … … … … Click!$"
-
-MauvilleCity_Text_1DFEB4: @ 81DFEB4
-	.string "Registered WALLY\n"
-	.string "in the POKéNAV.$"
-
-MauvilleCity_Text_1DFED5: @ 81DFED5
-	.string "SCOTT: Hehe…\n"
-	.string "I was watching that match!\p"
-	.string "You’re friends with that boy WALLY,\n"
-	.string "aren’t you?\p"
-	.string "But you didn’t hold anything back\n"
-	.string "and beat him impressively.\p"
-	.string "Yeah! That’s what a real POKéMON\n"
-	.string "battle is all about!\p"
-	.string "I idolize TRAINERS like that!\p"
-	.string "… … … … … …\n"
-	.string "I’ll be cheering for you!$"
-
-MauvilleCity_Text_1DFFE4: @ 81DFFE4
-	.string "WATTSON: Oh, {PLAYER}{KUN}!\n"
-	.string "You look like you have a lot of zip!\l"
-	.string "That’s a good thing, wahahahaha!\p"
-	.string "Fine! I’ve decided!\n"
-	.string "I need a favor, {PLAYER}{KUN}!\p"
-	.string "MAUVILLE CITY has an underground\n"
-	.string "sector called NEW MAUVILLE.\p"
-	.string "{PLAYER}{KUN}, I’d like you to go there and\n"
-	.string "switch off the GENERATOR.\p"
-	.string "The GENERATOR has been running a bit\n"
-	.string "haywire. It’s getting unsafe.\p"
-	.string "Here, this is the KEY to get into\n"
-	.string "NEW MAUVILLE.$"
-
-MauvilleCity_Text_1E0154: @ 81E0154
-	.string "WATTSON: Don’t you worry about it.\n"
-	.string "It won’t be a challenge to you.\p"
-	.string "The entrance to NEW MAUVILLE is just\n"
-	.string "a short SURF away from ROUTE 110.\p"
-	.string "That’s it, then, you have my trust!\n"
-	.string "Wahahahaha!$"
-
-MauvilleCity_Text_1E020E: @ 81E020E
-	.string "WATTSON: Wahahahaha!\p"
-	.string "I knew it, {PLAYER}{KUN}! I knew I’d made\n"
-	.string "the right choice asking you!\p"
-	.string "This is my thanks--a TM containing\n"
-	.string "THUNDERBOLT!\p"
-	.string "Go on, you’ve earned it!$"
-
-MauvilleCity_Text_1E02AA: @ 81E02AA
-	.string "WATTSON: Wahahahaha!\p"
-	.string "It pleases me to no end to see\n"
-	.string "the young step up and take charge!$"
-
-MauvilleCity_Text_1E0301: @ 81E0301
-	.string "You know, it’s cool to have POKéMON\n"
-	.string "battles and stuff…\p"
-	.string "But if your POKéMON gets hurt,\n"
-	.string "you have to nurse it back to health.$"
-
-MauvilleCity_Text_1E037C: @ 81E037C
-	.string "The roads of this town stretch north\n"
-	.string "and south, and east and west.\p"
-	.string "Because of that, we get all sorts of\n"
-	.string "people coming through.$"
-
-MauvilleCity_Text_1E03FB: @ 81E03FB
-	.string "Have you been to RYDEL’S CYCLES yet?\p"
-	.string "RYDEL, the owner, is a very generous\n"
-	.string "man.$"
-
-MauvilleCity_Text_1E044A: @ 81E044A
-	.string "Even if you’re riding a BIKE,\n"
-	.string "wild POKéMON could jump you.$"
-
-MauvilleCity_Text_1E0485: @ 81E0485
-	.string "MAUVILLE CITY\n"
-	.string "“The bright and shiny city of fun!”$"
-
-MauvilleCity_Text_1E04B7: @ 81E04B7
-	.string "MAUVILLE CITY POKéMON GYM\n"
-	.string "LEADER: WATTSON\l"
-	.string "“The cheerfully electrifying man!”$"
-
-MauvilleCity_Text_1E0504: @ 81E0504
-	.string "“Ride in gravel and shake up your\n"
-	.string "soul!”\l"
-	.string "RYDEL’S CYCLES$"
-
-MauvilleCity_Text_1E053C: @ 81E053C
-	.string "“The play spot for all!”\n"
-	.string "MAUVILLE GAME CORNER$"
-
-MauvilleCity_Text_1E056A: @ 81E056A
-	.string "Hi, do you check out TV at all?\p"
-	.string "They’ve added a bunch of cool new\n"
-	.string "shows recently.\p"
-	.string "TV is so cool. I’ve seen my friends on\n"
-	.string "TV just out of the blue.\p"
-	.string "And, sometimes, they even put you on TV\n"
-	.string "without telling you.\p"
-	.string "I wish I would be on TV sometime.\p"
-	.string "That’s why I think you should check\n"
-	.string "out TVs whenever you can.$"
-
-MauvilleCity_Text_1E0699: @ 81E0699
-	.string "Hi, have you been checking out TVs?$"
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
deleted file mode 100644
index 03b7928aa..000000000
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
-	map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_210E66
-	map_script 5, MauvilleCity_PokemonCenter_1F_MapScript1_277C30
-	.byte 0
-
-MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
-	setrespawn 5
-	call MauvilleCity_PokemonCenter_1F_EventScript_2718DE
-	goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
-	special ScrSpecial_SetMauvilleOldManMapObjGfx
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
-	setvar VAR_0x800B, 1
-	call MauvilleCity_PokemonCenter_1F_EventScript_27191E
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, 2
-	end
-
-MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1
-	.string "That man over there, he says weird\n"
-	.string "things!\p"
-	.string "He’s funny in a weird way.\n"
-	.string "I doubt I’ll forget about him!$"
-
-MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06
-	.string "When I accessed the RECORD CORNER,\n"
-	.string "the data for what’s hot in DEWFORD\l"
-	.string "got updated.\p"
-	.string "Now that bit of data is the same\n"
-	.string "as my friend’s!$"
-
-MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A
-	.string "A RECORD CORNER opened upstairs in\n"
-	.string "the POKéMON CENTER.\p"
-	.string "I don’t know what it’s about, but it\n"
-	.string "sounds fun. I’ll go check it out!$"
-
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
deleted file mode 100644
index 50b218f04..000000000
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ /dev/null
@@ -1,312 +0,0 @@
-MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
-	map_script 1, MeteorFalls_1F_1R_MapScript1_22BD30
-	.byte 0
-
-MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A
-	end
-
-MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
-	setmetatile 4, 1, 582, 1
-	setmetatile 3, 2, 589, 1
-	setmetatile 4, 2, 590, 0
-	setmetatile 5, 2, 591, 1
-	return
-
-MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
-	lockall
-	playbgm MUS_MGM0, 0
-	applymovement 255, MeteorFalls_1F_1R_Movement_2725B0
-	waitmovement 0
-	delay 30
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725B4
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BF47, 4
-	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A6
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A6
-	waitmovement 0
-	playse SE_PIN
-	applymovement 5, MeteorFalls_1F_1R_Movement_272598
-	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_27259A
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BF84, 4
-	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BFE4, 4
-	closemessage
-	applymovement 255, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
-	waitmovement 0
-	addobject 7
-	addobject 8
-	addobject 9
-	playbgm MUS_AQA_0, 0
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BED9
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8
-	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_2725A4
-	applymovement 6, MeteorFalls_1F_1R_Movement_2725A4
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C04E, 4
-	closemessage
-	applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D
-	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4
-	applymovement 6, MeteorFalls_1F_1R_Movement_22BECE
-	waitmovement 0
-	removeobject 5
-	removeobject 6
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C11C, 4
-	closemessage
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BF08
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BF18
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C268, 4
-	applymovement 7, MeteorFalls_1F_1R_Movement_2725AA
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C292, 4
-	applymovement 7, MeteorFalls_1F_1R_Movement_2725A4
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C2FC, 4
-	closemessage
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D
-	waitmovement 0
-	fadedefaultbgm
-	removeobject 7
-	removeobject 8
-	removeobject 9
-	setflag FLAG_0x333
-	setflag FLAG_0x0CF
-	setflag FLAG_0x2FF
-	setvar VAR_0x40BF, 1
-	releaseall
-	end
-
-MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0
-	step_right
-	step_right
-	step_26
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8
-	step_right
-	step_right
-	step_up
-	step_up
-	step_27
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
-	step_25
-	step_12
-	step_28
-	step_40
-	step_left
-	step_41
-	step_03
-	step_end
-
-MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25
-	lock
-	faceplayer
-	checkflag FLAG_0x0F4
-	goto_eq MeteorFalls_1F_1R_EventScript_22BF3D
-	setflag FLAG_0x0F4
-	msgbox MeteorFalls_1F_1R_Text_22C342, 4
-	release
-	end
-
-MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D
-	msgbox MeteorFalls_1F_1R_Text_22C47D, 4
-	release
-	end
-
-MeteorFalls_1F_1R_Text_22BF47: @ 822BF47
-	.string "Hehehe!\p"
-	.string "With this METEORITE, that thing in\n"
-	.string "MT. CHIMNEY will…$"
-
-MeteorFalls_1F_1R_Text_22BF84: @ 822BF84
-	.string "Heh?\p"
-	.string "I don’t know who you are, but if you get\n"
-	.string "in the way of TEAM MAGMA, don’t\l"
-	.string "expect any mercy!$"
-
-MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4
-	.string "Hold it right there, TEAM MAGMA!\p"
-	.string "You’re badly mistaken if you think you\n"
-	.string "can have your way with the world!$"
-
-MeteorFalls_1F_1R_Text_22C04E: @ 822C04E
-	.string "Hehehe!\n"
-	.string "Even TEAM AQUA joins us!\p"
-	.string "But it’s too much trouble to deal with\n"
-	.string "you all…\p"
-	.string "Heh, it doesn’t matter!\p"
-	.string "We’ve got the METEORITE, so off to\n"
-	.string "MT. CHIMNEY we go!\p"
-	.string "Hehehe! Be seeing you, you TEAM\n"
-	.string "AQUA dingbats!$"
-
-MeteorFalls_1F_1R_Text_22C11C: @ 822C11C
-	.string "ARCHIE: Didn’t I see you before?\n"
-	.string "At SLATEPORT’s MUSEUM?\p"
-	.string "Ah, so your name is {PLAYER}.\p"
-	.string "At the time, I thought you were one\n"
-	.string "of TEAM MAGMA’s goons.\p"
-	.string "Humph…\n"
-	.string "You’re one odd kid.\p"
-	.string "TEAM MAGMA is a dangerous group of\n"
-	.string "total fanatics.\p"
-	.string "They engage in destruction, claiming\n"
-	.string "to expand the land mass.\p"
-	.string "They are the rivals to us,\n"
-	.string "the sea-loving TEAM AQUA!$"
-
-MeteorFalls_1F_1R_Text_22C268: @ 822C268
-	.string "BOSS, we should give chase to\n"
-	.string "TEAM MAGMA…$"
-
-MeteorFalls_1F_1R_Text_22C292: @ 822C292
-	.string "ARCHIE: Yes, yes, we must!\n"
-	.string "We’ve got to hurry.\p"
-	.string "There’s no telling what TEAM MAGMA\n"
-	.string "will do at MT. CHIMNEY!$"
-
-MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC
-	.string "ARCHIE: {PLAYER}, you should keep\n"
-	.string "an eye out for TEAM MAGMA, too.\p"
-	.string "Farewell!$"
-
-MeteorFalls_1F_1R_Text_22C342: @ 822C342
-	.string "I… I’m COZMO…\n"
-	.string "I’m a PROFESSOR…\p"
-	.string "TEAM MAGMA asked me to guide them\n"
-	.string "to METEOR FALLS…\p"
-	.string "But they tricked me.\n"
-	.string "They even took my METEORITE away…\p"
-	.string "And then another similar bunch,\n"
-	.string "TEAM AQUA showed up.\p"
-	.string "After that…\n"
-	.string "I don’t understand any of it.\p"
-	.string "But that TEAM MAGMA…\p"
-	.string "What are they going to do with that\n"
-	.string "METEORITE at MT. CHIMNEY?$"
-
-MeteorFalls_1F_1R_Text_22C47D: @ 822C47D
-	.string "PROF. COZMO: But that TEAM MAGMA…\p"
-	.string "What are they going to do with that\n"
-	.string "METEORITE at MT. CHIMNEY?$"
-
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.inc b/data/scripts/maps/MossdeepCity.inc
deleted file mode 100644
index 4e8531a4e..000000000
--- a/data/scripts/maps/MossdeepCity.inc
+++ /dev/null
@@ -1,436 +0,0 @@
-MossdeepCity_MapScripts:: @ 81E4A96
-	map_script 3, MossdeepCity_MapScript1_1E4A9C
-	.byte 0
-
-MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
-	clearflag FLAG_0x064
-	clearflag FLAG_0x065
-	clearflag FLAG_0x066
-	clearflag FLAG_0x067
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, MossdeepCity_EventScript_27207A
-	end
-
-MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
-	lock
-	faceplayer
-	checkflag FLAG_0x07B
-	goto_eq MossdeepCity_EventScript_1E4AC7
-	msgbox MossdeepCity_Text_1E4E90, 4
-	release
-	end
-
-MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7
-	msgbox MossdeepCity_Text_1E4F15, 4
-	release
-	end
-
-MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1
-	lock
-	faceplayer
-	checkflag FLAG_0x07B
-	goto_eq MossdeepCity_EventScript_1E4AE6
-	msgbox MossdeepCity_Text_1E4F50, 4
-	release
-	end
-
-MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6
-	msgbox MossdeepCity_Text_1E5051, 4
-	release
-	end
-
-MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0
-	msgbox MossdeepCity_Text_1E4E22, 2
-	end
-
-MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9
-	msgbox MossdeepCity_Text_1E5135, 2
-	end
-
-MossdeepCity_EventScript_1E4B02:: @ 81E4B02
-	msgbox MossdeepCity_Text_1E50D9, 2
-	end
-
-MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B
-	msgbox MossdeepCity_Text_1E529D, 2
-	end
-
-MossdeepCity_EventScript_1E4B14:: @ 81E4B14
-	msgbox MossdeepCity_Text_1E5396, 3
-	end
-
-MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D
-	msgbox MossdeepCity_Text_1E53A9, 3
-	end
-
-MossdeepCity_EventScript_1E4B26:: @ 81E4B26
-	msgbox MossdeepCity_Text_1E53F2, 3
-	end
-
-MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F
-	msgbox MossdeepCity_Text_1E541F, 3
-	end
-
-MossdeepCity_EventScript_1E4B38:: @ 81E4B38
-	setflag FLAG_VISITED_MOSSDEEP_CITY
-	setvar VAR_TEMP_1, 1
-	end
-
-MossdeepCity_EventScript_1E4B41:: @ 81E4B41
-	lockall
-	applymovement 14, MossdeepCity_Movement_1E4BAD
-	waitmovement 0
-	applymovement 10, MossdeepCity_Movement_1E4BB7
-	applymovement 11, MossdeepCity_Movement_1E4BB7
-	applymovement 12, MossdeepCity_Movement_1E4BB7
-	applymovement 13, MossdeepCity_Movement_1E4BB7
-	waitmovement 0
-	applymovement 14, MossdeepCity_Movement_1E4BBC
-	applymovement 10, MossdeepCity_Movement_1E4BCA
-	applymovement 11, MossdeepCity_Movement_1E4BDD
-	applymovement 12, MossdeepCity_Movement_1E4BEF
-	applymovement 13, MossdeepCity_Movement_1E4C00
-	waitmovement 0
-	removeobject 14
-	removeobject 10
-	removeobject 11
-	removeobject 12
-	removeobject 13
-	delay 30
-	setvar VAR_0x405D, 2
-	setflag FLAG_0x337
-	releaseall
-	end
-
-MossdeepCity_Movement_1E4BAD: @ 81E4BAD
-	step_14
-	step_03
-	step_14
-	step_14
-	step_14
-	step_14
-	step_02
-	step_14
-	step_14
-	step_end
-
-MossdeepCity_Movement_1E4BB7: @ 81E4BB7
-	step_03
-	step_14
-	step_14
-	step_14
-	step_end
-
-MossdeepCity_Movement_1E4BBC: @ 81E4BBC
-	step_down
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MossdeepCity_Movement_1E4BCA: @ 81E4BCA
-	step_14
-	step_13
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MossdeepCity_Movement_1E4BDD: @ 81E4BDD
-	step_14
-	step_13
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MossdeepCity_Movement_1E4BEF: @ 81E4BEF
-	step_14
-	step_13
-	step_down
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MossdeepCity_Movement_1E4C00: @ 81E4C00
-	step_14
-	step_13
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MossdeepCity_EventScript_1E4C10:: @ 81E4C10
-	lock
-	faceplayer
-	msgbox MossdeepCity_Text_1E5213, 4
-	applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_EventScript_1E4C26:: @ 81E4C26
-	lock
-	faceplayer
-	checkflag FLAG_0x114
-	goto_eq MossdeepCity_EventScript_1E4C68
-	msgbox MossdeepCity_Text_1E4CED, 5
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_EventScript_1E4C72
-	msgbox MossdeepCity_Text_1E4D5B, 4
-	giveitem_std ITEM_KINGS_ROCK
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_EventScript_272054
-	setflag FLAG_0x114
-	release
-	end
-
-MossdeepCity_EventScript_1E4C68:: @ 81E4C68
-	msgbox MossdeepCity_Text_1E4DB3, 4
-	release
-	end
-
-MossdeepCity_EventScript_1E4C72:: @ 81E4C72
-	msgbox MossdeepCity_Text_1E4DD7, 4
-	release
-	end
-
-MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C
-	msgbox MossdeepCity_Text_1E5581, 2
-	end
-
-MossdeepCity_EventScript_1E4C85:: @ 81E4C85
-	lock
-	faceplayer
-	msgbox MossdeepCity_Text_1E5453, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, MossdeepCity_EventScript_1E4CB0
-	compare VAR_FACING, 4
-	call_if 1, MossdeepCity_EventScript_1E4CC2
-	addvar VAR_0x40D1, 1
-	removeobject 16
-	release
-	end
-
-MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0
-	applymovement 255, MossdeepCity_Movement_1E4CD4
-	applymovement 16, MossdeepCity_Movement_1E4CD8
-	waitmovement 0
-	return
-
-MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2
-	applymovement 255, MossdeepCity_Movement_1E4CD4
-	applymovement 16, MossdeepCity_Movement_1E4CE2
-	waitmovement 0
-	return
-
-MossdeepCity_Movement_1E4CD4: @ 81E4CD4
-	step_14
-	step_14
-	step_27
-	step_end
-
-MossdeepCity_Movement_1E4CD8: @ 81E4CD8
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MossdeepCity_Movement_1E4CE2: @ 81E4CE2
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MossdeepCity_Text_1E4CED: @ 81E4CED
-	.string "I got this from STEVEN, but I don’t\n"
-	.string "know what it’s good for.\p"
-	.string "I think it’s called KING’S ROCK.\n"
-	.string "Do you want it?$"
-
-MossdeepCity_Text_1E4D5B: @ 81E4D5B
-	.string "Why would you want it?\n"
-	.string "You’re weird.\p"
-	.string "You can keep it, but keep it a secret\n"
-	.string "from STEVEN.$"
-
-MossdeepCity_Text_1E4DB3: @ 81E4DB3
-	.string "STEVEN’s house is right over there!$"
-
-MossdeepCity_Text_1E4DD7: @ 81E4DD7
-	.string "Yeah, you think so, too! What are you\n"
-	.string "supposed to do with some weird rock?$"
-
-MossdeepCity_Text_1E4E22: @ 81E4E22
-	.string "Around MOSSDEEP, you can see wild\n"
-	.string "WAILMER.\p"
-	.string "It’s called, uh…\n"
-	.string "What was it now…\p"
-	.string "WAI, WAI, WAI…\p"
-	.string "WAILMER watching!$"
-
-MossdeepCity_Text_1E4E90: @ 81E4E90
-	.string "The island’s SPACE CENTER has been\n"
-	.string "launching huge rockets.\p"
-	.string "There’s been some kind of an uproar\n"
-	.string "over a letter they received recently.$"
-
-MossdeepCity_Text_1E4F15: @ 81E4F15
-	.string "The island’s SPACE CENTER has been\n"
-	.string "launching huge rockets.$"
-
-MossdeepCity_Text_1E4F50: @ 81E4F50
-	.string "I heard from a SAILOR buddy that\n"
-	.string "TEAM AQUA set up shop in LILYCOVE.\p"
-	.string "I also heard that someone came along\n"
-	.string "and wiped the floor with them!\p"
-	.string "But MOSSDEEP here’s been targeted\n"
-	.string "by that TEAM MAGMA.\p"
-	.string "If you want to know what they’re up to,\n"
-	.string "go visit the SPACE CENTER.$"
-
-MossdeepCity_Text_1E5051: @ 81E5051
-	.string "I’m a SAILOR, so the sea’s obviously\n"
-	.string "more important to me.\p"
-	.string "But you know? When I get back on land\n"
-	.string "after a long voyage, I do feel relief!$"
-
-MossdeepCity_Text_1E50D9: @ 81E50D9
-	.string "Wouldn’t it be nice?\p"
-	.string "If the whole world was covered in\n"
-	.string "plants and flowers like this island?$"
-
-MossdeepCity_Text_1E5135: @ 81E5135
-	.string "All life needs the sea to live, even\n"
-	.string "though it makes its home on the land.\p"
-	.string "Life, having run its course, becomes\n"
-	.string "soil and returns to the land.\p"
-	.string "And the sea is always connected to\n"
-	.string "the land.\p"
-	.string "Yes, like the very shoreline here.$"
-
-MossdeepCity_Text_1E5213: @ 81E5213
-	.string "A voyage on a ship is fine.\p"
-	.string "But crossing the sea with POKéMON\n"
-	.string "using SURF…\p"
-	.string "Now that’s an exhilarating trip!\n"
-	.string "Wouldn’t you agree, youngster?$"
-
-MossdeepCity_Text_1E529D: @ 81E529D
-	.string "This rock has a special meaning to\n"
-	.string "the people at the SPACE CENTER.\p"
-	.string "They put it here as their wish for\n"
-	.string "their rockets to fly safely.\p"
-	.string "When you make a wish, what do you use?\n"
-	.string "Do you wish upon a star?\p"
-	.string "I use a wish tag to make it happen.\n"
-	.string "That’s what I do.$"
-
-MossdeepCity_Text_1E5396: @ 81E5396
-	.string "It’s a white rock.$"
-
-MossdeepCity_Text_1E53A9: @ 81E53A9
-	.string "MOSSDEEP CITY POKéMON GYM\n"
-	.string "LEADERS: LIZA & TATE\p"
-	.string "“The mystic combination!”$"
-
-MossdeepCity_Text_1E53F2: @ 81E53F2
-	.string "MOSSDEEP CITY\n"
-	.string "“Our slogan: Cherish POKéMON!”$"
-
-MossdeepCity_Text_1E541F: @ 81E541F
-	.string "MOSSDEEP SPACE CENTER\n"
-	.string "“The closest place to space.”$"
-
-MossdeepCity_Text_1E5453: @ 81E5453
-	.string "SCOTT: {PLAYER}{KUN}, feeling good?\n"
-	.string "I’m doing great!\p"
-	.string "I’d heard MOSSDEEP’s GYM LEADER is\n"
-	.string "pretty strong, so I decided to come\l"
-	.string "take a look-see for myself.\p"
-	.string "But there’s something wrong about\n"
-	.string "this town.\p"
-	.string "People are going on about a warning\n"
-	.string "letter and the SPACE CENTER…\p"
-	.string "I don’t think it concerns me in any\n"
-	.string "way, though.$"
-
-MossdeepCity_Text_1E5581: @ 81E5581
-	.string "Ahh… It feels great letting the waves\n"
-	.string "wash over my feet…\p"
-	.string "Speaking of the waves, you know that\n"
-	.string "island city SOOTOPOLIS?\p"
-	.string "I think the GYM there had a new\n"
-	.string "LEADER come in.\p"
-	.string "People tell me the new LEADER once\n"
-	.string "mentored WALLACE.$"
-
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
deleted file mode 100644
index 972d5f4e8..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
-	step_14
-	step_14
-	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_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
deleted file mode 100644
index 7707690fb..000000000
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-MossdeepCity_House2_MapScripts:: @ 82220DE
-	.byte 0
-
-MossdeepCity_House2_EventScript_2220DF:: @ 82220DF
-	msgbox MossdeepCity_House2_Text_222146, 2
-	end
-
-MossdeepCity_House2_EventScript_2220E8:: @ 82220E8
-	msgbox MossdeepCity_House2_Text_2221A6, 2
-	end
-
-MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox MossdeepCity_House2_Text_22222E, 4
-	waitmoncry
-	closemessage
-	setflag FLAG_0x0E0
-	clearflag FLAG_0x3A5
-	compare VAR_FACING, 2
-	call_if 1, MossdeepCity_House2_EventScript_222124
-	compare VAR_FACING, 3
-	call_if 1, MossdeepCity_House2_EventScript_22212F
-	removeobject 3
-	release
-	end
-
-MossdeepCity_House2_EventScript_222124:: @ 8222124
-	applymovement 3, MossdeepCity_House2_Movement_22213A
-	waitmovement 0
-	return
-
-MossdeepCity_House2_EventScript_22212F:: @ 822212F
-	applymovement 3, MossdeepCity_House2_Movement_222141
-	waitmovement 0
-	return
-
-MossdeepCity_House2_Movement_22213A: @ 822213A
-	step_18
-	step_15
-	step_15
-	step_17
-	step_15
-	step_13
-	step_end
-
-MossdeepCity_House2_Movement_222141: @ 8222141
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
-
-MossdeepCity_House2_Text_222146: @ 8222146
-	.string "My little sister exchanges MAIL with\n"
-	.string "her boyfriend in FORTREE.\p"
-	.string "I don’t envy her one bit at all.$"
-
-MossdeepCity_House2_Text_2221A6: @ 82221A6
-	.string "Even though I can’t see my friend in\n"
-	.string "FORTREE, my POKéMON carries MAIL\l"
-	.string "back and forth for us.\p"
-	.string "I’m not lonesome, even though we’re\n"
-	.string "apart.$"
-
-MossdeepCity_House2_Text_22222E: @ 822222E
-	.string "WINGULL: Pihyoh!$"
-
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
deleted file mode 100644
index 8fc55295f..000000000
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ /dev/null
@@ -1,439 +0,0 @@
-MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
-	map_script 1, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2
-	map_script 3, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C
-	.byte 0
-
-MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
-	setobjectxyperm 3, 1, 9
-	setobjectmovementtype 3, 10
-	setobjectxyperm 5, 0, 8
-	setobjectmovementtype 5, 10
-	setobjectxyperm 4, 1, 6
-	setobjectmovementtype 4, 10
-	setobjectxyperm 1, 3, 4
-	setobjectmovementtype 1, 10
-	setobjectmovementtype 2, 10
-	compare VAR_0x409E, 1
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA
-	compare VAR_0x409E, 2
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2
-	compare VAR_0x409E, 3
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA
-	setobjectxyperm 9, 12, 2
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_222FB2:: @ 8222FB2
-	setobjectxyperm 9, 13, 3
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA
-	setobjectxyperm 9, 14, 2
-	end
-
-MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
-	compare VAR_0x405D, 2
-	goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
-	setmetatile 2, 5, 996, 1
-	return
-
-MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
-	lock
-	faceplayer
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
-	dodailyevents
-	specialvar VAR_RESULT, GetWeekCount
-	buffernumberstring 0, VAR_RESULT
-	compare VAR_RESULT, 0
-	call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012
-	compare VAR_RESULT, 1
-	call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B
-	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, 4
-	return
-
-MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, 4
-	return
-
-MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
-	dodailyevents
-	specialvar VAR_RESULT, GetWeekCount
-	buffernumberstring 0, VAR_RESULT
-	compare VAR_RESULT, 0
-	call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051
-	compare VAR_RESULT, 1
-	call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A
-	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223305, 4
-	return
-
-MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A
-	msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, 4
-	return
-
-MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
-	lock
-	faceplayer
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, 4
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E
-	lock
-	faceplayer
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA
-	checkflag FLAG_0x0C0
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4
-	giveitem_std ITEM_SUN_STONE
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
-	setflag FLAG_0x0C0
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA
-	checkflag FLAG_0x0C0
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4
-	giveitem_std ITEM_SUN_STONE
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054
-	setflag FLAG_0x0C0
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E
-	compare VAR_0x405D, 2
-	goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154
-	goto MossdeepCity_SpaceCenter_1F_EventScript_22315E
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168
-	lock
-	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F
-	compare VAR_0x405D, 2
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4
-	compare VAR_0x405D, 2
-	goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F
-	goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F
-	msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9
-	lock
-	faceplayer
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223849, 4
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF
-	lockall
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, 4
-	releaseall
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA
-	trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999
-	msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, 6
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1
-	trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, 6
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208
-	trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, 6
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
-	lock
-	faceplayer
-	checkflag FLAG_0x0BF
-	goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, 4
-	trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2
-	setflag FLAG_0x0BF
-	moveobjectoffscreen 9
-	switch VAR_FACING
-	case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278
-	case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289
-	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2
-	waitmovement 0
-	setvar VAR_0x409E, 2
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E
-	msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, 4
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278
-	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A
-	waitmovement 0
-	setvar VAR_0x409E, 1
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289
-	applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E
-	waitmovement 0
-	setvar VAR_0x409E, 3
-	release
-	end
-
-MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A
-	step_40
-	step_left
-	step_41
-	step_end
-
-MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E
-	step_40
-	step_right
-	step_41
-	step_end
-
-MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2
-	step_02
-	step_40
-	step_right
-	step_41
-	step_end
-
-MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7
-	.string "The rocket’s launch is imminent!$"
-
-MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8
-	.string "The rocket launched safely!\n"
-	.string "That’s successful launch no. {STR_VAR_1}!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305
-	.string "I know that things are a little\n"
-	.string "haywire right now, but…\p"
-	.string "The rocket’s launch is imminent!$"
-
-MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E
-	.string "I know that things are a little\n"
-	.string "haywire right now, but…\p"
-	.string "The rocket launched safely!\n"
-	.string "That’s successful launch no. {STR_VAR_1}!$"
-
-MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3
-	.string "A rocket launch demands perfection.\n"
-	.string "Not even a 1% margin of error is allowed.\p"
-	.string "Even if it’s 99% okay, the whole thing\n"
-	.string "is useless if 1% happens to be no good.\p"
-	.string "Despite that, we never stop trying.\n"
-	.string "Why? It’s a dream that never ends.$"
-
-MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7
-	.string "Those MAGMA thugs have their sights\n"
-	.string "set on our SPACE CENTER.\p"
-	.string "But we can’t allow anything that minor\n"
-	.string "to interfere with our rocket launch!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540
-	.string "I was taking a stroll down the beach\n"
-	.string "when I found this.\p"
-	.string "It’s not anything I need, so you can\n"
-	.string "have it.$"
-
-MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6
-	.string "The HOENN region has been famous for \n"
-	.string "its meteor showers for a long time.$"
-
-MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0
-	.string "TEAM MAGMA can’t be allowed to steal\n"
-	.string "the rocket fuel.\p"
-	.string "Oh, by the way, you can have this stone\n"
-	.string "I found on the beach.$"
-
-MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664
-	.string "With TEAM MAGMA around, I guess\n"
-	.string "strolls on the beach aren’t safe.$"
-
-MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6
-	.string "Some people claim that POKéMON came\n"
-	.string "from space. Could it be true?$"
-
-MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8
-	.string "TEAM AQUA should take care of\n"
-	.string "TEAM MAGMA!\p"
-	.string "But if they did that, TEAM AQUA will\n"
-	.string "become bold and brazen, won’t they?$"
-
-MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B
-	.string "A giant chunk of metal bursts through\n"
-	.string "the skies and flies into space…\p"
-	.string "It boggles my mind!$"
-
-MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5
-	.string "A giant chunk of metal bursts through\n"
-	.string "the skies and flies into space…\p"
-	.string "But TEAM MAGMA wants to spoil\n"
-	.string "that dream of mine!\p"
-	.string "I’m not having any of that!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849
-	.string "STEVEN: {PLAYER}{KUN}, have you read that\n"
-	.string "proclamation already?\p"
-	.string "TEAM MAGMA is coming after the rocket\n"
-	.string "fuel on this island.\p"
-	.string "I don’t know what they’d need it for,\n"
-	.string "but they can’t be allowed to take it.\p"
-	.string "I’ll keep an eye on things for\n"
-	.string "a while longer.\p"
-	.string "In the meantime, why don’t you go\n"
-	.string "check out the town?$"
-
-MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C
-	.string "As promised, we’ve come for\n"
-	.string "the rocket fuel!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999
-	.string "Ran out of fuel…$"
-
-MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA
-	.string "Don’t think you’re on a roll just\n"
-	.string "because you’ve beaten me!$"
-
-MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6
-	.string "We gave you fair warning!\n"
-	.string "There’s nothing sneaky about us!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21
-	.string "Grrr…\n"
-	.string "We should’ve used sneaky treachery…$"
-
-MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B
-	.string "Okay, I get it already! The next time,\n"
-	.string "we’ll come unannounced.$"
-
-MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A
-	.string "The rocket fuel the SPACE CENTER has\n"
-	.string "in storage--that’s what we’re after.\p"
-	.string "We mean to take every last bit of it!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA
-	.string "Please, can you spare some fuel?\n"
-	.string "Even a chintzy cup will do!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223B37: @ 8223B37
-	.string "What are we going to do with\n"
-	.string "the rocket fuel?\p"
-	.string "How would I know?\n"
-	.string "Ask our leader upstairs!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223B90: @ 8223B90
-	.string "Our leader said no one, but no one,\n"
-	.string "gets past me!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223BC2: @ 8223BC2
-	.string "Ack! Ack! Aaack!$"
-
-MossdeepCity_SpaceCenter_1F_Text_223BD3: @ 8223BD3
-	.string "Please, tell our leader that\n"
-	.string "I never abandoned my post.\l"
-	.string "That I stayed to the bitter end…$"
-
-MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C
-	.string "This is…\n"
-	.string "An intent-to-steal notice?\p"
-	.string "“To the staff of the SPACE CENTER:\n"
-	.string "How are you? We are doing fine.\p"
-	.string "“We will soon visit you to take your\n"
-	.string "rocket fuel.\p"
-	.string "“Please don’t try to stop us.\n"
-	.string "We will take the fuel no matter what.\p"
-	.string "“Let there be more land!\n"
-	.string "                                          TEAM MAGMA”$"
-
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
deleted file mode 100644
index cee99c4d5..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
-	step_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
-	step_40
-	step_left
-	step_41
-	step_end
-
-MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85
-	step_40
-	step_down
-	step_41
-	step_end
-
-MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89
-	step_40
-	step_right
-	step_41
-	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
-	step_40
-	step_16
-	step_16
-	step_41
-	step_14
-	step_14
-	slow_step_down
-	slow_step_down
-	step_end
-
-MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF
-	step_02
-	step_40
-	step_18
-	step_18
-	step_41
-	step_14
-	step_14
-	slow_step_left
-	slow_step_left
-	step_00
-	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/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
deleted file mode 100644
index fb2665e8b..000000000
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ /dev/null
@@ -1,219 +0,0 @@
-MossdeepCity_StevensHouse_MapScripts:: @ 8222784
-	map_script 1, MossdeepCity_StevensHouse_MapScript1_222794
-	map_script 3, MossdeepCity_StevensHouse_MapScript1_2227A8
-	map_script 2, MossdeepCity_StevensHouse_MapScript2_2227C0
-	.byte 0
-
-MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 0, MossdeepCity_StevensHouse_EventScript_22279E
-	end
-
-MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
-	setmetatile 6, 4, 753, 1
-	return
-
-MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
-	compare VAR_0x40C6, 2
-	call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4
-	end
-
-MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
-	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 7
-	return
-
-MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
-	map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA
-	.2byte 0
-
-MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
-	lockall
-	applymovement 1, MossdeepCity_StevensHouse_Movement_2725A4
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, MossdeepCity_StevensHouse_Movement_272598
-	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_27259A
-	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_222833
-	waitmovement 0
-	msgbox MossdeepCity_StevensHouse_Text_222936, 4
-	giveitem_std ITEM_HM08
-	setflag FLAG_0x07B
-	setflag FLAG_0x12E
-	msgbox MossdeepCity_StevensHouse_Text_222A0E, 4
-	closemessage
-	delay 20
-	applymovement 1, MossdeepCity_StevensHouse_Movement_22283B
-	waitmovement 0
-	setflag FLAG_0x314
-	setflag FLAG_0x3AD
-	setvar VAR_0x40C6, 2
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_Movement_222833: @ 8222833
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
-
-MossdeepCity_StevensHouse_Movement_22283B: @ 822283B
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841
-	lockall
-	msgbox MossdeepCity_StevensHouse_Text_222B9E, 5
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_StevensHouse_EventScript_22285B
-	goto MossdeepCity_StevensHouse_EventScript_222865
-	end
-
-MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B
-	msgbox MossdeepCity_StevensHouse_Text_222C2A, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
-	setvar VAR_TEMP_1, 398
-	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_StevensHouse_EventScript_222895
-	compare VAR_RESULT, 1
-	goto_eq MossdeepCity_StevensHouse_EventScript_2228BD
-	goto MossdeepCity_StevensHouse_EventScript_273811
-	end
-
-MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
-	call MossdeepCity_StevensHouse_EventScript_2228EB
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_StevensHouse_EventScript_222901
-	call MossdeepCity_StevensHouse_EventScript_27378B
-	call MossdeepCity_StevensHouse_EventScript_2723DD
-	goto MossdeepCity_StevensHouse_EventScript_222901
-	end
-
-MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
-	call MossdeepCity_StevensHouse_EventScript_2228EB
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq MossdeepCity_StevensHouse_EventScript_2228E0
-	call MossdeepCity_StevensHouse_EventScript_273797
-	goto MossdeepCity_StevensHouse_EventScript_2228E0
-	end
-
-MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0
-	call MossdeepCity_StevensHouse_EventScript_2737A0
-	goto MossdeepCity_StevensHouse_EventScript_222901
-	end
-
-MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB
-	bufferspeciesname 1, SPECIES_BELDUM
-	removeobject 2
-	playfanfare MUS_FANFA4
-	message MossdeepCity_StevensHouse_Text_222BED
-	waitmessage
-	waitfanfare
-	bufferspeciesname 0, SPECIES_BELDUM
-	return
-
-MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901
-	setflag FLAG_0x3C8
-	setflag FLAG_0x12A
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909
-	msgbox MossdeepCity_StevensHouse_Text_222D97, 3
-	end
-
-MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912
-	msgbox MossdeepCity_StevensHouse_Text_222B11, 2
-	end
-
-MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B
-	lockall
-	msgbox MossdeepCity_StevensHouse_Text_222C4E, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926
-	giveitem_std ITEM_HM08, 1, 1
-	setflag FLAG_0x07B
-	end
-
-MossdeepCity_StevensHouse_Text_222936: @ 8222936
-	.string "STEVEN: {PLAYER}{KUN}…\p"
-	.string "As you can see, there’s not much here,\n"
-	.string "but this is my home.\p"
-	.string "Thank you for all that you’ve done.\p"
-	.string "This is my token of appreciation.\n"
-	.string "It’s the HIDDEN MACHINE DIVE.\p"
-	.string "No need to be shy--you’ve earned\n"
-	.string "this HM.$"
-
-MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E
-	.string "STEVEN: While you’re using SURF, you\n"
-	.string "should notice dark patches of water.\p"
-	.string "Use DIVE if you come to deep water\n"
-	.string "like it. You’ll drop to the seafloor.\p"
-	.string "When you want to come back up, use\n"
-	.string "DIVE again.\p"
-	.string "In some places, it won’t be possible\n"
-	.string "for you to surface, though.$"
-
-MossdeepCity_StevensHouse_Text_222B11: @ 8222B11
-	.string "STEVEN: Apparently, there’s an\n"
-	.string "underwater cavern between\l"
-	.string "MOSSDEEP and SOOTOPOLIS.\p"
-	.string "You know, the one that CAPT. STERN\n"
-	.string "found in his submarine.$"
-
-MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E
-	.string "{PLAYER} checked the POKé BALL.\p"
-	.string "It contained the POKéMON\n"
-	.string "BELDUM.\p"
-	.string "Take the POKé BALL?$"
-
-MossdeepCity_StevensHouse_Text_222BED: @ 8222BED
-	.string "{PLAYER} obtained a BELDUM.$"
-
-MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
-	.string "There is no space for another POKéMON.$"
-
-MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A
-	.string "{PLAYER} left the POKé BALL where\n"
-	.string "it was.$"
-
-MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E
-	.string "It’s a letter.\p"
-	.string "… … … … … …\p"
-	.string "To {PLAYER}{KUN}…\p"
-	.string "I’ve decided to do a little soul-\n"
-	.string "searching and train on the road.\p"
-	.string "I don’t plan to return home for some\n"
-	.string "time.\p"
-	.string "I have a favor to ask of you.\p"
-	.string "I want you to take the POKé BALL on\n"
-	.string "the desk.\p"
-	.string "Inside it is a BELDUM, my favorite\n"
-	.string "POKéMON.\p"
-	.string "I’m counting on you.\p"
-	.string "May our paths cross someday.\p"
-	.string "STEVEN STONE$"
-
-MossdeepCity_StevensHouse_Text_222D97: @ 8222D97
-	.string "It’s a collection of rare rocks and\n"
-	.string "stones assembled by STEVEN.$"
-
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
deleted file mode 100644
index b4825579c..000000000
--- a/data/scripts/maps/MtChimney.inc
+++ /dev/null
@@ -1,869 +0,0 @@
-MtChimney_MapScripts:: @ 822EDC1
-	map_script 5, MtChimney_MapScript1_22EDD2
-	map_script 3, MtChimney_MapScript1_22EDCC
-	.byte 0
-
-MtChimney_MapScript1_22EDCC: @ 822EDCC
-	setvar VAR_0x40BD, 1
-	end
-
-MtChimney_MapScript1_22EDD2: @ 822EDD2
-	setstepcallback 1
-	end
-
-MtChimney_EventScript_22EDD5:: @ 822EDD5
-	lock
-	faceplayer
-	checkflag FLAG_0x0DB
-	call_if 0, MtChimney_EventScript_22EDF9
-	checkflag FLAG_0x0DB
-	call_if 1, MtChimney_EventScript_22EE02
-	closemessage
-	applymovement 1, MtChimney_Movement_2725A2
-	waitmovement 0
-	setflag FLAG_0x0DB
-	release
-	end
-
-MtChimney_EventScript_22EDF9:: @ 822EDF9
-	msgbox MtChimney_Text_22FAD2, 4
-	return
-
-MtChimney_EventScript_22EE02:: @ 822EE02
-	msgbox MtChimney_Text_22FBC7, 4
-	return
-
-MtChimney_EventScript_22EE0B:: @ 822EE0B
-	lockall
-	playbgm MUS_MGM0, 0
-	msgbox MtChimney_Text_22F26A, 4
-	applymovement 2, MtChimney_Movement_27259E
-	waitmovement 0
-	playse SE_PIN
-	applymovement 2, MtChimney_Movement_272598
-	waitmovement 0
-	applymovement 2, MtChimney_Movement_27259A
-	waitmovement 0
-	msgbox MtChimney_Text_22F32E, 4
-	trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF
-	msgbox MtChimney_Text_22F5F7, 4
-	closemessage
-	delay 30
-	fadescreen 1
-	removeobject 2
-	removeobject 29
-	removeobject 3
-	removeobject 22
-	setflag FLAG_0x39F
-	fadescreen 0
-	setobjectxyperm 1, 10, 12
-	addobject 1
-	compare VAR_FACING, 4
-	call_if 1, MtChimney_EventScript_22EEC7
-	compare VAR_FACING, 2
-	call_if 1, MtChimney_EventScript_22EED2
-	applymovement 255, MtChimney_Movement_2725A4
-	waitmovement 0
-	msgbox MtChimney_Text_22FC3D, 4
-	closemessage
-	compare VAR_FACING, 4
-	call_if 1, MtChimney_EventScript_22EEDD
-	compare VAR_FACING, 2
-	call_if 1, MtChimney_EventScript_22EEE8
-	removeobject 1
-	setflag FLAG_0x39E
-	setflag FLAG_0x08B
-	clearflag FLAG_0x3A0
-	setflag FLAG_0x3AE
-	clearflag FLAG_0x3E2
-	releaseall
-	end
-
-MtChimney_EventScript_22EEC7:: @ 822EEC7
-	applymovement 1, MtChimney_Movement_22EF83
-	waitmovement 0
-	return
-
-MtChimney_EventScript_22EED2:: @ 822EED2
-	applymovement 1, MtChimney_Movement_22EF94
-	waitmovement 0
-	return
-
-MtChimney_EventScript_22EEDD:: @ 822EEDD
-	applymovement 1, MtChimney_Movement_22EF8B
-	waitmovement 0
-	return
-
-MtChimney_EventScript_22EEE8:: @ 822EEE8
-	applymovement 1, MtChimney_Movement_22EF9C
-	waitmovement 0
-	return
-
-MtChimney_EventScript_22EEF3:: @ 822EEF3
-	lock
-	faceplayer
-	showmoneybox 0, 0, 0
-	msgbox MtChimney_Text_22FE04, 5
-	compare VAR_RESULT, 0
-	goto_eq MtChimney_EventScript_22EF69
-	checkmoney 0xc8, 0
-	compare VAR_RESULT, 0
-	goto_eq MtChimney_EventScript_22EF76
-	msgbox MtChimney_Text_22FE4D, 4
-	checkitemspace ITEM_LAVA_COOKIE, 1
-	compare VAR_RESULT, 1
-	call_if 1, MtChimney_EventScript_22EF5E
-	giveitem_std ITEM_LAVA_COOKIE
-	compare VAR_RESULT, 0
-	goto_eq MtChimney_EventScript_22EF51
-	hidemoneybox
-	nop
-	nop
-	release
-	end
-
-MtChimney_EventScript_22EF51:: @ 822EF51
-	msgbox gUnknown_08272AD0, 4
-	hidemoneybox
-	nop
-	nop
-	release
-	end
-
-MtChimney_EventScript_22EF5E:: @ 822EF5E
-	takemoney 0xc8, 0
-	updatemoneybox 0, 0
-	nop
-	return
-
-MtChimney_EventScript_22EF69:: @ 822EF69
-	msgbox MtChimney_Text_22FE9B, 4
-	hidemoneybox
-	nop
-	nop
-	release
-	end
-
-MtChimney_EventScript_22EF76:: @ 822EF76
-	msgbox MtChimney_Text_22FE5E, 4
-	hidemoneybox
-	nop
-	nop
-	release
-	end
-
-MtChimney_Movement_22EF83: @ 822EF83
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_end
-
-MtChimney_Movement_22EF8B: @ 822EF8B
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22EF94: @ 822EF94
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
-
-MtChimney_Movement_22EF9C: @ 822EF9C
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22EFA6: @ 822EFA6
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-MtChimney_Movement_22EFB8: @ 822EFB8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-MtChimney_Movement_22EFC1: @ 822EFC1
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22EFD0: @ 822EFD0
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-MtChimney_Movement_22EFE9: @ 822EFE9
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-MtChimney_Movement_22EFF4: @ 822EFF4
-	step_14
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22F004: @ 822F004
-	step_14
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-MtChimney_Movement_22F015: @ 822F015
-	step_14
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
-
-MtChimney_Movement_22F01D: @ 822F01D
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22F02B: @ 822F02B
-	step_down
-	step_end
-
-MtChimney_Movement_22F02D: @ 822F02D
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22F035: @ 822F035
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22F03F: @ 822F03F
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_22F04A: @ 822F04A
-	step_40
-	step_17
-	step_41
-	step_03
-	step_end
-
-MtChimney_Movement_22F04F: @ 822F04F
-	step_left
-	step_28
-	step_14
-	step_end
-
-MtChimney_EventScript_22F053:: @ 822F053
-	msgbox MtChimney_Text_22FD1F, 3
-	end
-
-MtChimney_EventScript_22F05C:: @ 822F05C
-	msgbox MtChimney_Text_22FD5B, 3
-	end
-
-MtChimney_EventScript_22F065:: @ 822F065
-	msgbox MtChimney_Text_22FDA1, 3
-	end
-
-MtChimney_EventScript_22F06E:: @ 822F06E
-	trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C
-	msgbox MtChimney_Text_22F76D, 6
-	end
-
-MtChimney_EventScript_22F085:: @ 822F085
-	trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A
-	msgbox MtChimney_Text_22F859, 6
-	end
-
-MtChimney_EventScript_22F09C:: @ 822F09C
-	msgbox MtChimney_Text_22F978, 3
-	end
-
-MtChimney_EventScript_22F0A5:: @ 822F0A5
-	msgbox MtChimney_Text_22F9B2, 3
-	end
-
-MtChimney_EventScript_22F0AE:: @ 822F0AE
-	msgbox MtChimney_Text_22F9D1, 3
-	end
-
-MtChimney_EventScript_22F0B7:: @ 822F0B7
-	msgbox MtChimney_Text_22FA2F, 3
-	end
-
-MtChimney_EventScript_22F0C0:: @ 822F0C0
-	msgbox MtChimney_Text_22FA8B, 3
-	end
-
-MtChimney_EventScript_22F0C9:: @ 822F0C9
-	msgbox MtChimney_Text_22FAA5, 3
-	end
-
-MtChimney_EventScript_22F0D2:: @ 822F0D2
-	msgbox MtChimney_Text_22FACB, 3
-	end
-
-MtChimney_EventScript_22F0DB:: @ 822F0DB
-	msgbox MtChimney_Text_22FDFC, 3
-	end
-
-MtChimney_EventScript_22F0E4:: @ 822F0E4
-	lockall
-	checkflag FLAG_0x08B
-	goto_if 0, MtChimney_EventScript_22F137
-	checkflag FLAG_0x073
-	goto_eq MtChimney_EventScript_22F12D
-	msgbox MtChimney_Text_22FF12, 5
-	compare VAR_RESULT, 0
-	goto_eq MtChimney_EventScript_22F123
-	msgbox MtChimney_Text_22FF66, 4
-	giveitem_std ITEM_METEORITE
-	setflag FLAG_0x073
-	releaseall
-	end
-
-MtChimney_EventScript_22F123:: @ 822F123
-	msgbox MtChimney_Text_22FF9C, 4
-	releaseall
-	end
-
-MtChimney_EventScript_22F12D:: @ 822F12D
-	msgbox MtChimney_Text_22FFC0, 4
-	releaseall
-	end
-
-MtChimney_EventScript_22F137:: @ 822F137
-	msgbox MtChimney_Text_22FEAA, 4
-	releaseall
-	end
-
-MtChimney_EventScript_22F141:: @ 822F141
-	msgbox MtChimney_Text_22FFFA, 3
-	end
-
-MtChimney_EventScript_22F14A:: @ 822F14A
-	trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq MtChimney_EventScript_22F195
-	msgbox MtChimney_Text_2300A2, 4
-	release
-	end
-
-MtChimney_EventScript_22F176:: @ 822F176
-	special sub_80B4808
-	waitmovement 0
-	msgbox MtChimney_Text_2300E3, 4
-	setvar VAR_0x8004, 313
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 313
-	callstd 8
-	release
-	end
-
-MtChimney_EventScript_22F195:: @ 822F195
-	trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB
-	msgbox MtChimney_Text_2301E7, 6
-	end
-
-MtChimney_EventScript_22F1AC:: @ 822F1AC
-	trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D
-	msgbox MtChimney_Text_230292, 6
-	end
-
-MtChimney_EventScript_22F1C3:: @ 822F1C3
-	trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304
-	msgbox MtChimney_Text_23033A, 6
-	end
-
-MtChimney_EventScript_22F1DA:: @ 822F1DA
-	trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436
-	msgbox MtChimney_Text_230463, 6
-	end
-
-MtChimney_EventScript_22F1F1:: @ 822F1F1
-	trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921
-	msgbox MtChimney_Text_22F93A, 6
-	end
-
-MtChimney_EventScript_22F208:: @ 822F208
-	trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq MtChimney_EventScript_22F253
-	msgbox MtChimney_Text_230519, 4
-	release
-	end
-
-MtChimney_EventScript_22F234:: @ 822F234
-	special sub_80B4808
-	waitmovement 0
-	msgbox MtChimney_Text_230557, 4
-	setvar VAR_0x8004, 1
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 1
-	callstd 8
-	release
-	end
-
-MtChimney_EventScript_22F253:: @ 822F253
-	trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3
-	msgbox MtChimney_Text_230614, 6
-	end
-
-MtChimney_Text_22F26A: @ 822F26A
-	.string "The power contained in the METEORITE…\p"
-	.string "By amplifying its power with this\n"
-	.string "machine, MT. CHIMNEY’s volcanic\l"
-	.string "activity will instantly intensify…\p"
-	.string "Its energy will grow deep inside\n"
-	.string "the crater and…\l"
-	.string "Fufufu…$"
-
-MtChimney_Text_22F32E: @ 822F32E
-	.string "MAXIE: Hm?\n"
-	.string "Who are you?\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "I’d heard ARCHIE bemoaning a child\n"
-	.string "who’s been meddling in TEAM AQUA’s\l"
-	.string "affairs.\p"
-	.string "It must be you he meant.\p"
-	.string "Humph! So you’re thinking of\n"
-	.string "interfering with us, TEAM MAGMA?\p"
-	.string "Now you listen.\n"
-	.string "Long ago, living things used the\l"
-	.string "land to live and grow.\p"
-	.string "That is why land is all important!\n"
-	.string "It is the cradle of all!\p"
-	.string "That is why TEAM MAGMA is dedicated\n"
-	.string "to the expansion of the land mass.\p"
-	.string "It is for further advancement of\n"
-	.string "humankind and POKéMON!\p"
-	.string "And for that, we need the power of\n"
-	.string "what sleeps within this mountain…\p"
-	.string "Oh! There was no need for you to\n"
-	.string "learn that much.\p"
-	.string "But, no matter!\n"
-	.string "I’ll teach you the consequences of\l"
-	.string "meddling in our grand design!$"
-
-MtChimney_Text_22F5CF: @ 822F5CF
-	.string "What?!\p"
-	.string "I, MAXIE, was caught off guard?!$"
-
-MtChimney_Text_22F5F7: @ 822F5F7
-	.string "MAXIE: But, enough.\n"
-	.string "I will back off this time.\p"
-	.string "But don’t think that this is the last\n"
-	.string "you’ve seen of TEAM MAGMA.\p"
-	.string "Fufufu…\p"
-	.string "Even without the METEORITE, if we\n"
-	.string "obtain that ORB… Fufufu…$"
-
-MtChimney_Text_22F6AA: @ 822F6AA
-	.string "Hehehe!\p"
-	.string "So you’ve come all the way here!\p"
-	.string "But you’re too late!\n"
-	.string "I’ve already delivered the METEORITE\l"
-	.string "from METEOR FALLS to the BOSS!$"
-
-MtChimney_Text_22F72C: @ 822F72C
-	.string "Hehehe…\p"
-	.string "Even though I’ve lost, if our leader\n"
-	.string "awakens that thing…$"
-
-MtChimney_Text_22F76D: @ 822F76D
-	.string "BOSS, hurry!\n"
-	.string "Give it the METEORITE’s energy!\p"
-	.string "Hehehe…$"
-
-MtChimney_Text_22F7A2: @ 822F7A2
-	.string "We of TEAM MAGMA are working hard for\n"
-	.string "everyone’s sake.\p"
-	.string "Like, if that thing’s power made more\n"
-	.string "land, there’d be more places to live.\p"
-	.string "Everyone’d be happy!$"
-
-MtChimney_Text_22F83A: @ 822F83A
-	.string "Hunh?\n"
-	.string "What do you mean I lost?$"
-
-MtChimney_Text_22F859: @ 822F859
-	.string "Our BOSS says, “It will make everyone\n"
-	.string "happy.”\p"
-	.string "But why does everyone keep getting\n"
-	.string "in our way?$"
-
-MtChimney_Text_22F8B6: @ 822F8B6
-	.string "If there were more land, I’d be able\n"
-	.string "to get a big house of my own!\p"
-	.string "I’m going to build it on hardened lava!$"
-
-MtChimney_Text_22F921: @ 822F921
-	.string "My dream of a big house…$"
-
-MtChimney_Text_22F93A: @ 822F93A
-	.string "A kid like you, you ought to be\n"
-	.string "splashing about in the waves!$"
-
-MtChimney_Text_22F978: @ 822F978
-	.string "That annoying TEAM AQUA…\n"
-	.string "They always mess with our plans!$"
-
-MtChimney_Text_22F9B2: @ 822F9B2
-	.string "METEORITES pack amazing power!$"
-
-MtChimney_Text_22F9D1: @ 822F9D1
-	.string "You’d better not mess with us!\p"
-	.string "We’re trying to awaken that thing\n"
-	.string "for the benefit of everyone!$"
-
-MtChimney_Text_22FA2F: @ 822FA2F
-	.string "We’re TEAM MAGMA!\p"
-	.string "They’re TEAM AQUA!\p"
-	.string "It totally annoys me that they’d\n"
-	.string "use a name like ours!$"
-
-MtChimney_Text_22FA8B: @ 822FA8B
-	.string "Yeah!\n"
-	.string "Douse them in fire!$"
-
-MtChimney_Text_22FAA5: @ 822FAA5
-	.string "We’re going to keep making more land!$"
-
-MtChimney_Text_22FACB: @ 822FACB
-	.string "Bufoh!$"
-
-MtChimney_Text_22FAD2: @ 822FAD2
-	.string "ARCHIE: Grr, {PLAYER}!\n"
-	.string "I should’ve guessed you’d show up!\p"
-	.string "See for yourself what the fanatics\n"
-	.string "of TEAM MAGMA are up to!\p"
-	.string "They’re trying to inject the stolen\n"
-	.string "METEORITE’s power into the volcano!\p"
-	.string "Doing something like that will cause\n"
-	.string "the volcano’s eruption!$"
-
-MtChimney_Text_22FBC7: @ 822FBC7
-	.string "ARCHIE: Grrr…\p"
-	.string "I want to stop that MAXIE,\n"
-	.string "but I can’t!\p"
-	.string "Not when I have my hands full battling\n"
-	.string "three opponents at once!$"
-
-MtChimney_Text_22FC3D: @ 822FC3D
-	.string "ARCHIE: {PLAYER}!\n"
-	.string "Thank you!\p"
-	.string "With your help, we thwarted TEAM\n"
-	.string "MAGMA’s destructive plan!\p"
-	.string "But… You…\n"
-	.string "Whose side are you on?\p"
-	.string "Ah, it doesn’t matter.\p"
-	.string "We will remain vigilant and keep up\n"
-	.string "our pursuit of TEAM MAGMA.\p"
-	.string "{PLAYER}, we shall meet again!$"
-
-MtChimney_Text_22FD1F: @ 822FD1F
-	.string "Darn… TEAM MAGMA outnumbers us!\n"
-	.string "We can’t keep up with them!$"
-
-MtChimney_Text_22FD5B: @ 822FD5B
-	.string "If they expand the land, there’ll be\n"
-	.string "less habitats for WATER POKéMON!$"
-
-MtChimney_Text_22FDA1: @ 822FDA1
-	.string "We’re TEAM AQUA!\p"
-	.string "They’re TEAM MAGMA!\p"
-	.string "It burns me up that they’d use such\n"
-	.string "a confusing name!$"
-
-MtChimney_Text_22FDFC: @ 822FDFC
-	.string "Bushaa!$"
-
-MtChimney_Text_22FE04: @ 822FE04
-	.string "LAVA COOKIES are MT. CHIMNEY’s local\n"
-	.string "specialty.\p"
-	.string "Try one. It’s just ¥200.$"
-
-MtChimney_Text_22FE4D: @ 822FE4D
-	.string "Thank you, dear!$"
-
-MtChimney_Text_22FE5E: @ 822FE5E
-	.string "Oh, dear. You can’t buy a thing if\n"
-	.string "you’ve not got the money.$"
-
-MtChimney_Text_22FE9B: @ 822FE9B
-	.string "Oh, fine then.$"
-
-MtChimney_Text_22FEAA: @ 822FEAA
-	.string "A METEORITE is fitted on a mysterious\n"
-	.string "machine…\p"
-	.string "The machine seems to be storing\n"
-	.string "energy in the METEORITE.$"
-
-MtChimney_Text_22FF12: @ 822FF12
-	.string "A METEORITE is fitted on a mysterious\n"
-	.string "machine…\p"
-	.string "Do you want to remove the METEORITE?$"
-
-MtChimney_Text_22FF66: @ 822FF66
-	.string "{PLAYER} removed the METEORITE from\n"
-	.string "the mysterious machine.$"
-
-MtChimney_Text_22FF9C: @ 822FF9C
-	.string "{PLAYER} left the METEORITE where\n"
-	.string "it was.$"
-
-MtChimney_Text_22FFC0: @ 822FFC0
-	.string "This mysterious machine…\n"
-	.string "It makes no response whatsoever.$"
-
-MtChimney_Text_22FFFA: @ 822FFFA
-	.string "{0x7A} JAGGED PATH\n"
-	.string "LAVARIDGE TOWN AHEAD$"
-
-MtChimney_Text_23001D: @ 823001D
-	.string "I’ve been to the hot springs and\n"
-	.string "refreshed my tired bones.\l"
-	.string "Right now I’m feeling strong!$"
-
-MtChimney_Text_230076: @ 8230076
-	.string "Oh, my goodness.\n"
-	.string "Now, aren’t you something!$"
-
-MtChimney_Text_2300A2: @ 82300A2
-	.string "Well, well, I’ve lost. I can’t call\n"
-	.string "myself an EXPERT now, can I?$"
-
-MtChimney_Text_2300E3: @ 82300E3
-	.string "Thank you, child. It was fun, as if\n"
-	.string "I were battling my own grandchild.\p"
-	.string "Please, come see me again for\n"
-	.string "a rematch.$"
-
-MtChimney_Text_230153: @ 8230153
-	.string "If you can mesh your heart with those\n"
-	.string "of your POKéMON, why, you should be\l"
-	.string "able to achieve great things.$"
-
-MtChimney_Text_2301BB: @ 82301BB
-	.string "Oh, my goodness.\n"
-	.string "Now, aren’t you something!$"
-
-MtChimney_Text_2301E7: @ 82301E7
-	.string "Perhaps your heart has become one\n"
-	.string "with the hearts of your POKéMON.$"
-
-MtChimney_Text_23022A: @ 823022A
-	.string "I’ve got the fire in me, baby.\n"
-	.string "I can’t stand it! I have to battle!$"
-
-MtChimney_Text_23026D: @ 823026D
-	.string "Ooh, that was a scorching-hot match!$"
-
-MtChimney_Text_230292: @ 8230292
-	.string "The heat of MT. CHIMNEY warms\n"
-	.string "me up, baby!$"
-
-MtChimney_Text_2302BD: @ 82302BD
-	.string "I’ve finally made it to MT. CHIMNEY.\n"
-	.string "I want to make my POKéMON battle!$"
-
-MtChimney_Text_230304: @ 8230304
-	.string "The way you battle…\n"
-	.string "It’s like a MT. CHIMNEY eruption!$"
-
-MtChimney_Text_23033A: @ 823033A
-	.string "Like I said, I’ve finally made it to\n"
-	.string "MT. CHIMNEY. It would be a shame if\l"
-	.string "I only do a little sightseeing…\p"
-	.string "I want to get in some battles and buy\n"
-	.string "COOKIES as souvenirs.$"
-
-MtChimney_Text_2303DF: @ 82303DF
-	.string "Since I bathed in the hot springs,\n"
-	.string "I’ve been feeling great!\l"
-	.string "I’m sure I’m going to win!$"
-
-MtChimney_Text_230436: @ 8230436
-	.string "Yowch!\n"
-	.string "I’m getting a chill out of the water.$"
-
-MtChimney_Text_230463: @ 8230463
-	.string "I’ll have to take another dip in the\n"
-	.string "hot springs. Want to join me?\p"
-	.string "Just joking!$"
-
-MtChimney_Text_2304B3: @ 82304B3
-	.string "This is one fine mountain! Plenty of\n"
-	.string "hot people around for company!$"
-
-MtChimney_Text_2304F7: @ 82304F7
-	.string "Oh, you’re a real firebrand, too!$"
-
-MtChimney_Text_230519: @ 8230519
-	.string "I think I need a dip in LAVARIDGE\n"
-	.string "HOT SPRING with the locals!$"
-
-MtChimney_Text_230557: @ 8230557
-	.string "I like little fireballs like you.\n"
-	.string "Let me register you in my POKéNAV.$"
-
-MtChimney_Text_23059C: @ 823059C
-	.string "I’m happily surrounded by hot people\n"
-	.string "around these parts. I won’t lose!$"
-
-MtChimney_Text_2305E3: @ 82305E3
-	.string "Gosh, you’re still the same\n"
-	.string "firebrand as before!$"
-
-MtChimney_Text_230614: @ 8230614
-	.string "Actually, it really is hot here.\n"
-	.string "I’m overdressed for these parts.$"
-
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
deleted file mode 100644
index 1dd9c2725..000000000
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ /dev/null
@@ -1,98 +0,0 @@
-MtChimney_CableCarStation_MapScripts:: @ 822ABFA
-	map_script 3, MtChimney_CableCarStation_MapScript1_22AC05
-	map_script 2, MtChimney_CableCarStation_MapScript2_22AC1D
-	.byte 0
-
-MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
-	compare VAR_0x40A3, 1
-	call_if 1, MtChimney_CableCarStation_EventScript_22AC11
-	end
-
-MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
-	setobjectxyperm 1, 5, 4
-	setobjectmovementtype 1, 10
-	return
-
-MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
-	map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27
-	.2byte 0
-
-MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
-	lockall
-	applymovement 255, MtChimney_CableCarStation_Movement_22ACB4
-	applymovement 1, MtChimney_CableCarStation_Movement_22ACAA
-	waitmovement 0
-	setvar VAR_0x40A3, 0
-	setobjectxyperm 1, 6, 7
-	setobjectmovementtype 1, 8
-	releaseall
-	end
-
-MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B
-	lock
-	faceplayer
-	msgbox MtChimney_CableCarStation_Text_22ACB9, 5
-	compare VAR_RESULT, 1
-	goto_eq MtChimney_CableCarStation_EventScript_22AC6C
-	compare VAR_RESULT, 0
-	goto_eq MtChimney_CableCarStation_EventScript_22AC9B
-	end
-
-MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
-	msgbox MtChimney_CableCarStation_Text_22ACF8, 4
-	closemessage
-	applymovement 1, MtChimney_CableCarStation_Movement_22ACA5
-	applymovement 255, MtChimney_CableCarStation_Movement_22ACAF
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x40A3, 2
-	incrementgamestat 48
-	special CableCarWarp
-	special sub_814FC9C
-	waitstate
-	release
-	end
-
-MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B
-	msgbox MtChimney_CableCarStation_Text_22AD0E, 4
-	release
-	end
-
-MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5
-	step_up
-	step_up
-	step_left
-	step_28
-	step_end
-
-MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA
-	step_14
-	step_right
-	step_down
-	step_down
-	step_end
-
-MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF
-	step_up
-	step_up
-	step_up
-	step_14
-	step_end
-
-MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4
-	step_down
-	step_down
-	step_down
-	step_14
-	step_end
-
-MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9
-	.string "The CABLE CAR is ready to go down.\n"
-	.string "Would you like to be on it?$"
-
-MtChimney_CableCarStation_Text_22ACF8: @ 822ACF8
-	.string "Please step this way.$"
-
-MtChimney_CableCarStation_Text_22AD0E: @ 822AD0E
-	.string "Please ride with us another time.$"
-
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/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
deleted file mode 100644
index fed63f0e0..000000000
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ /dev/null
@@ -1,640 +0,0 @@
-MtPyre_Summit_MapScripts:: @ 8231FF7
-	map_script 3, MtPyre_Summit_MapScript1_231FFD
-	.byte 0
-
-MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
-	compare VAR_0x40B9, 2
-	call_if 1, MtPyre_Summit_EventScript_232009
-	end
-
-MtPyre_Summit_EventScript_232009:: @ 8232009
-	setobjectxyperm 8, 23, 6
-	setobjectxyperm 2, 22, 6
-	end
-
-MtPyre_Summit_EventScript_232018:: @ 8232018
-	lockall
-	setvar VAR_0x8008, 0
-	goto MtPyre_Summit_EventScript_23203C
-	end
-
-MtPyre_Summit_EventScript_232024:: @ 8232024
-	lockall
-	setvar VAR_0x8008, 1
-	goto MtPyre_Summit_EventScript_23203C
-	end
-
-MtPyre_Summit_EventScript_232030:: @ 8232030
-	lockall
-	setvar VAR_0x8008, 2
-	goto MtPyre_Summit_EventScript_23203C
-	end
-
-MtPyre_Summit_EventScript_23203C:: @ 823203C
-	playbgm MUS_AQA_0, 0
-	applymovement 255, MtPyre_Summit_Movement_2725B2
-	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725AA
-	waitmovement 0
-	delay 50
-	compare VAR_0x8008, 0
-	call_if 1, MtPyre_Summit_EventScript_2320E0
-	compare VAR_0x8008, 1
-	call_if 1, MtPyre_Summit_EventScript_2320EB
-	compare VAR_0x8008, 2
-	call_if 1, MtPyre_Summit_EventScript_2320EC
-	msgbox MtPyre_Summit_Text_23281A, 4
-	closemessage
-	fadescreen 1
-	removeobject 2
-	removeobject 4
-	removeobject 5
-	removeobject 6
-	removeobject 7
-	setflag FLAG_0x394
-	setflag FLAG_0x395
-	fadedefaultbgm
-	fadescreen 0
-	delay 20
-	setvar VAR_0x40B9, 1
-	compare VAR_0x8008, 0
-	call_if 1, MtPyre_Summit_EventScript_2320F7
-	compare VAR_0x8008, 1
-	call_if 1, MtPyre_Summit_EventScript_23210C
-	compare VAR_0x8008, 2
-	call_if 1, MtPyre_Summit_EventScript_232117
-	msgbox MtPyre_Summit_Text_23290E, 4
-	giveitem_std ITEM_MAGMA_EMBLEM
-	setflag FLAG_0x0D4
-	setflag FLAG_0x34F
-	releaseall
-	end
-
-MtPyre_Summit_EventScript_2320E0:: @ 82320E0
-	applymovement 2, MtPyre_Summit_Movement_232136
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_2320EB:: @ 82320EB
-	return
-
-MtPyre_Summit_EventScript_2320EC:: @ 82320EC
-	applymovement 2, MtPyre_Summit_Movement_232139
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_2320F7:: @ 82320F7
-	applymovement 3, MtPyre_Summit_Movement_23212C
-	waitmovement 0
-	applymovement 255, MtPyre_Summit_Movement_2725A8
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_23210C:: @ 823210C
-	applymovement 3, MtPyre_Summit_Movement_232130
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_232117:: @ 8232117
-	applymovement 3, MtPyre_Summit_Movement_232132
-	waitmovement 0
-	applymovement 255, MtPyre_Summit_Movement_2725A4
-	waitmovement 0
-	return
-
-MtPyre_Summit_Movement_23212C: @ 823212C
-	step_down
-	step_down
-	step_27
-	step_end
-
-MtPyre_Summit_Movement_232130: @ 8232130
-	step_down
-	step_end
-
-MtPyre_Summit_Movement_232132: @ 8232132
-	step_down
-	step_down
-	step_28
-	step_end
-
-MtPyre_Summit_Movement_232136: @ 8232136
-	step_left
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_232139: @ 8232139
-	step_right
-	step_25
-	step_end
-
-MtPyre_Summit_EventScript_23213C:: @ 823213C
-	lock
-	faceplayer
-	checkflag FLAG_0x09E
-	goto_eq MtPyre_Summit_EventScript_232167
-	msgbox MtPyre_Summit_Text_232E0C, 5
-	compare VAR_RESULT, 1
-	call_if 1, MtPyre_Summit_EventScript_232187
-	compare VAR_RESULT, 0
-	call_if 1, MtPyre_Summit_EventScript_232190
-	release
-	end
-
-MtPyre_Summit_EventScript_232167:: @ 8232167
-	msgbox MtPyre_Summit_Text_2331A6, 5
-	compare VAR_RESULT, 1
-	call_if 1, MtPyre_Summit_EventScript_232199
-	compare VAR_RESULT, 0
-	call_if 1, MtPyre_Summit_EventScript_232190
-	release
-	end
-
-MtPyre_Summit_EventScript_232187:: @ 8232187
-	msgbox MtPyre_Summit_Text_232F27, 4
-	return
-
-MtPyre_Summit_EventScript_232190:: @ 8232190
-	msgbox MtPyre_Summit_Text_233162, 4
-	return
-
-MtPyre_Summit_EventScript_232199:: @ 8232199
-	msgbox MtPyre_Summit_Text_23325D, 4
-	return
-
-MtPyre_Summit_EventScript_2321A2:: @ 82321A2
-	lock
-	faceplayer
-	checkflag FLAG_0x103
-	goto_eq MtPyre_Summit_EventScript_2321E2
-	compare VAR_0x40B9, 3
-	call_if 4, MtPyre_Summit_EventScript_2321CB
-	checkflag FLAG_0x081
-	goto_eq MtPyre_Summit_EventScript_2321D8
-	msgbox MtPyre_Summit_Text_232AD8, 4
-	release
-	end
-
-MtPyre_Summit_EventScript_2321CB:: @ 82321CB
-	msgbox MtPyre_Summit_Text_232CA6, 4
-	setflag FLAG_0x103
-	release
-	end
-
-MtPyre_Summit_EventScript_2321D8:: @ 82321D8
-	msgbox MtPyre_Summit_Text_232B4F, 4
-	release
-	end
-
-MtPyre_Summit_EventScript_2321E2:: @ 82321E2
-	msgbox MtPyre_Summit_Text_232D1E, 4
-	release
-	end
-
-MtPyre_Summit_EventScript_2321EC:: @ 82321EC
-	lockall
-	setvar VAR_0x8008, 0
-	goto MtPyre_Summit_EventScript_232210
-	end
-
-MtPyre_Summit_EventScript_2321F8:: @ 82321F8
-	lockall
-	setvar VAR_0x8008, 1
-	goto MtPyre_Summit_EventScript_232210
-	end
-
-MtPyre_Summit_EventScript_232204:: @ 8232204
-	lockall
-	setvar VAR_0x8008, 2
-	goto MtPyre_Summit_EventScript_232210
-	end
-
-MtPyre_Summit_EventScript_232210:: @ 8232210
-	applymovement 255, MtPyre_Summit_Movement_2725A6
-	waitmovement 0
-	delay 60
-	compare VAR_0x8008, 0
-	call_if 1, MtPyre_Summit_EventScript_2322C4
-	compare VAR_0x8008, 1
-	call_if 1, MtPyre_Summit_EventScript_2322DD
-	compare VAR_0x8008, 2
-	call_if 1, MtPyre_Summit_EventScript_2322F6
-	playse SE_PIN
-	applymovement 8, MtPyre_Summit_Movement_272598
-	waitmovement 0
-	applymovement 8, MtPyre_Summit_Movement_27259A
-	waitmovement 0
-	delay 30
-	compare VAR_0x8008, 0
-	call_if 1, MtPyre_Summit_EventScript_23230F
-	compare VAR_0x8008, 1
-	call_if 1, MtPyre_Summit_EventScript_232328
-	compare VAR_0x8008, 2
-	call_if 1, MtPyre_Summit_EventScript_232341
-	msgbox MtPyre_Summit_Text_233183, 4
-	closemessage
-	compare VAR_0x8008, 0
-	call_if 1, MtPyre_Summit_EventScript_23235A
-	compare VAR_0x8008, 1
-	call_if 1, MtPyre_Summit_EventScript_232376
-	compare VAR_0x8008, 2
-	call_if 1, MtPyre_Summit_EventScript_232392
-	delay 30
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
-	waitmovement 0
-	removeobject 2
-	removeobject 8
-	setvar VAR_0x40B9, 3
-	releaseall
-	end
-
-MtPyre_Summit_EventScript_2322C4:: @ 82322C4
-	applymovement 255, MtPyre_Summit_Movement_2323C4
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_2322DD:: @ 82322DD
-	applymovement 255, MtPyre_Summit_Movement_2323CB
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_2322F6:: @ 82322F6
-	applymovement 255, MtPyre_Summit_Movement_2323D2
-	applymovement 2, MtPyre_Summit_Movement_2323B6
-	applymovement 8, MtPyre_Summit_Movement_2323BD
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_23230F:: @ 823230F
-	applymovement 255, MtPyre_Summit_Movement_2323AE
-	applymovement 2, MtPyre_Summit_Movement_2323E7
-	applymovement 8, MtPyre_Summit_Movement_2323D8
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_232328:: @ 8232328
-	applymovement 255, MtPyre_Summit_Movement_2323B2
-	applymovement 2, MtPyre_Summit_Movement_2323E7
-	applymovement 8, MtPyre_Summit_Movement_2323DD
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_232341:: @ 8232341
-	applymovement 255, MtPyre_Summit_Movement_2323B2
-	applymovement 2, MtPyre_Summit_Movement_2323E7
-	applymovement 8, MtPyre_Summit_Movement_2323E2
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_23235A:: @ 823235A
-	applymovement 255, MtPyre_Summit_Movement_2323EA
-	applymovement 8, MtPyre_Summit_Movement_2323ED
-	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_232376:: @ 8232376
-	applymovement 255, MtPyre_Summit_Movement_2323EA
-	applymovement 8, MtPyre_Summit_Movement_2323F3
-	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_232392:: @ 8232392
-	applymovement 255, MtPyre_Summit_Movement_2323EA
-	applymovement 8, MtPyre_Summit_Movement_2323F8
-	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_2725A8
-	waitmovement 0
-	return
-
-MtPyre_Summit_Movement_2323AE: @ 82323AE
-	step_14
-	step_14
-	step_28
-	step_end
-
-MtPyre_Summit_Movement_2323B2: @ 82323B2
-	step_14
-	step_14
-	step_27
-	step_end
-
-MtPyre_Summit_Movement_2323B6: @ 82323B6
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtPyre_Summit_Movement_2323BD: @ 82323BD
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtPyre_Summit_Movement_2323C4: @ 82323C4
-	step_14
-	step_13
-	step_left
-	step_28
-	step_14
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_2323CB: @ 82323CB
-	step_14
-	step_13
-	step_right
-	step_27
-	step_14
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_2323D2: @ 82323D2
-	step_14
-	step_13
-	step_27
-	step_14
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_2323D8: @ 82323D8
-	step_up
-	step_up
-	step_up
-	step_left
-	step_end
-
-MtPyre_Summit_Movement_2323DD: @ 82323DD
-	step_up
-	step_up
-	step_up
-	step_28
-	step_end
-
-MtPyre_Summit_Movement_2323E2: @ 82323E2
-	step_up
-	step_up
-	step_up
-	step_28
-	step_end
-
-MtPyre_Summit_Movement_2323E7: @ 82323E7
-	step_14
-	step_26
-	step_end
-
-MtPyre_Summit_Movement_2323EA: @ 82323EA
-	step_14
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_2323ED: @ 82323ED
-	step_down
-	step_right
-	step_down
-	step_down
-	step_27
-	step_end
-
-MtPyre_Summit_Movement_2323F3: @ 82323F3
-	step_down
-	step_down
-	step_down
-	step_27
-	step_end
-
-MtPyre_Summit_Movement_2323F8: @ 82323F8
-	step_down
-	step_down
-	step_down
-	step_27
-	step_end
-
-MtPyre_Summit_EventScript_2323FD:: @ 82323FD
-	trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
-	msgbox MtPyre_Summit_Text_2324E0, 6
-	end
-
-MtPyre_Summit_EventScript_232414:: @ 8232414
-	trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
-	msgbox MtPyre_Summit_Text_2325E4, 6
-	end
-
-MtPyre_Summit_EventScript_23242B:: @ 823242B
-	trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
-	msgbox MtPyre_Summit_Text_2326B3, 6
-	end
-
-MtPyre_Summit_EventScript_232442:: @ 8232442
-	trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
-	msgbox MtPyre_Summit_Text_2327D8, 6
-	end
-
-MtPyre_Summit_Text_232459: @ 8232459
-	.string "No! Those TEAM MAGMA goons got\n"
-	.string "here ahead of us!\p"
-	.string "We can’t fall behind!$"
-
-MtPyre_Summit_Text_2324A0: @ 82324A0
-	.string "I thought you were one of the MAGMAS\n"
-	.string "who happened to come back…$"
-
-MtPyre_Summit_Text_2324E0: @ 82324E0
-	.string "Yeah, so you are strong…\n"
-	.string "But there’re a lot of us!$"
-
-MtPyre_Summit_Text_232513: @ 8232513
-	.string "Hah!\n"
-	.string "Too bad for you!\p"
-	.string "If you came earlier, you only would’ve\n"
-	.string "had to battle the wimpy TEAM MAGMA.\p"
-	.string "But since you arrived now, you have\n"
-	.string "to take on us toughies!$"
-
-MtPyre_Summit_Text_2325B0: @ 82325B0
-	.string "Urgh… I should’ve let you take on\n"
-	.string "TEAM MAGMA first…$"
-
-MtPyre_Summit_Text_2325E4: @ 82325E4
-	.string "You don’t know anything!\n"
-	.string "So why are you messing with us?$"
-
-MtPyre_Summit_Text_23261D: @ 823261D
-	.string "You…\n"
-	.string "We saw you at MT. CHIMNEY.\p"
-	.string "You don’t belong to either TEAM,\n"
-	.string "so why would you be here?$"
-
-MtPyre_Summit_Text_232678: @ 8232678
-	.string "If you’re going to mess with anyone,\n"
-	.string "let it be TEAM MAGMA…$"
-
-MtPyre_Summit_Text_2326B3: @ 82326B3
-	.string "Heh, it doesn’t matter!\n"
-	.string "We bought ourselves some time!\p"
-	.string "The BOSS should have snatched what\n"
-	.string "he was after!$"
-
-MtPyre_Summit_Text_23271B: @ 823271B
-	.string "Oh, I know!\n"
-	.string "You tried to join TEAM MAGMA,\l"
-	.string "but they wouldn’t have you!\p"
-	.string "Well, don’t think that we’ll let you\n"
-	.string "join our TEAM AQUA!$"
-
-MtPyre_Summit_Text_23279A: @ 823279A
-	.string "If you want to join TEAM AQUA that\n"
-	.string "badly, we can consider it…$"
-
-MtPyre_Summit_Text_2327D8: @ 82327D8
-	.string "We have a great combination going\n"
-	.string "with us members and our leader.$"
-
-MtPyre_Summit_Text_23281A: @ 823281A
-	.string "ARCHIE: TEAM MAGMA’s MAXIE got ahead\n"
-	.string "of us, but we also got what we wanted.\p"
-	.string "The RED ORB preserved at MT. PYRE…\n"
-	.string "I, ARCHIE, now have it in my possession!\p"
-	.string "Fufufu… Now we can bring our ultimate\n"
-	.string "objective to fruition!\p"
-	.string "Okay, TEAM!\n"
-	.string "We’re pulling out!$"
-
-MtPyre_Summit_Text_23290E: @ 823290E
-	.string "Oh, no…\n"
-	.string "This cannot happen…\p"
-	.string "Not only the BLUE ORB, but even\n"
-	.string "the RED ORB has been taken…\p"
-	.string "The BLUE ORB and RED ORB must never\n"
-	.string "be separated. They belong together.\p"
-	.string "What are those men trying to do with\n"
-	.string "the two ORBS?\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "Oh, yes. Was it TEAM MAGMA who came\n"
-	.string "and took the BLUE ORB first?\p"
-	.string "Well, in their haste, they left this\n"
-	.string "behind.\p"
-	.string "I couldn’t imagine what exactly it\n"
-	.string "could be.\p"
-	.string "I would like you to have it.\n"
-	.string "Perhaps it will be useful in some way.$"
-
-MtPyre_Summit_Text_232AD8: @ 8232AD8
-	.string "The BLUE ORB and RED ORB taken by\n"
-	.string "those sinister men…\p"
-	.string "They must never be apart…\n"
-	.string "I fear something terrible will happen…$"
-
-MtPyre_Summit_Text_232B4F: @ 8232B4F
-	.string "Oh, my goodness…\p"
-	.string "You say that both GROUDON and KYOGRE\n"
-	.string "have been awakened?\p"
-	.string "It is said that the BLUE ORB and\n"
-	.string "the RED ORB quelled the rage of\l"
-	.string "the two POKéMON…\p"
-	.string "It is also said that the true owner\n"
-	.string "of the ORBS still exists.\p"
-	.string "However, no one knows who, or what\n"
-	.string "exactly, the ORBS belong to.\p"
-	.string "It could be a human, or perhaps\n"
-	.string "a POKéMON, but no one knows.$"
-
-MtPyre_Summit_Text_232CA6: @ 8232CA6
-	.string "The two men who took the ORBS came\n"
-	.string "back to return them on their own.\p"
-	.string "Those men…\n"
-	.string "Perhaps they are not so evil after all…$"
-
-MtPyre_Summit_Text_232D1E: @ 8232D1E
-	.string "The embodiments of the land, sea,\n"
-	.string "and the sky…\p"
-	.string "That is said to be the identities of\n"
-	.string "the super-ancient POKéMON…\p"
-	.string "In the same way that we humans and\n"
-	.string "POKéMON have life, our world, too,\l"
-	.string "is alive…\p"
-	.string "The super-ancient POKéMON have\n"
-	.string "taught us that…$"
-
-MtPyre_Summit_Text_232E0C: @ 8232E0C
-	.string "MT. PYRE is where we calm the spirits\n"
-	.string "of POKéMON that have passed on…\p"
-	.string "This is a high place where one can\n"
-	.string "see all of HOENN…\p"
-	.string "The disembodied spirits of POKéMON\n"
-	.string "must find solace here…\p"
-	.string "Is it coincidence that you are here…\p"
-	.string "Will you hear out my tale? A tale long\n"
-	.string "told in the HOENN region?$"
-
-MtPyre_Summit_Text_232F27: @ 8232F27
-	.string "It happened long, long ago…\p"
-	.string "The world was wracked by a ferocious\n"
-	.string "clash between the POKéMON of the land\l"
-	.string "and the POKéMON of the sea…\p"
-	.string "The POKéMON of the land raised\n"
-	.string "mountains and created continents…\p"
-	.string "The POKéMON of the sea raised huge\n"
-	.string "waves and carved out oceans…\p"
-	.string "Their fierce duel raged without end.\p"
-	.string "The world was engulfed in massive\n"
-	.string "infernos and vicious storms.\p"
-	.string "The BLUE ORB and the RED ORB brought\n"
-	.string "an end to the calamity.\p"
-	.string "Light poured from the two ORBS and\n"
-	.string "becalmed the enraged adversaries.\p"
-	.string "The pair, made docile, dove deep into\n"
-	.string "the sea where eventually they\l"
-	.string "disappeared…$"
-
-MtPyre_Summit_Text_233162: @ 8233162
-	.string "I see…\n"
-	.string "Well, that, too, is fine…$"
-
-MtPyre_Summit_Text_233183: @ 8233183
-	.string "MAXIE: {PLAYER}…\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …$"
-
-MtPyre_Summit_Text_2331A6: @ 82331A6
-	.string "It is my role to pass on the legends\n"
-	.string "of HOENN to future generations.\p"
-	.string "And the crisis that just ended in\n"
-	.string "SOOTOPOLIS rewrote a legend…\p"
-	.string "Have you the time to hear the new\n"
-	.string "legend of HOENN?$"
-
-MtPyre_Summit_Text_23325D: @ 823325D
-	.string "It happened long, long ago…\p"
-	.string "The world was wracked by a ferocious\n"
-	.string "clash between the POKéMON of the land\l"
-	.string "and the POKéMON of the sea…\p"
-	.string "The POKéMON of the land raised\n"
-	.string "mountains and created continents…\p"
-	.string "The POKéMON of the sea raised huge\n"
-	.string "waves and carved out oceans…\p"
-	.string "Their fierce duel raged without end.\p"
-	.string "The world was engulfed in massive\n"
-	.string "fires and vicious storms.\p"
-	.string "It was then that the POKéMON of\n"
-	.string "the sky descended from a storm.\p"
-	.string "The POKéMON, shining a vivid green,\n"
-	.string "becalmed the two enraged POKéMON.\p"
-	.string "Then, its duty done, the green POKéMON\n"
-	.string "flew off into the wild blue yonder…$"
-
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/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc
deleted file mode 100644
index 6193a092e..000000000
--- a/data/scripts/maps/NavelRock_Top.inc
+++ /dev/null
@@ -1,127 +0,0 @@
-NavelRock_Top_MapScripts:: @ 8269113
-	map_script 3, NavelRock_Top_MapScript1_26911E
-	map_script 5, NavelRock_Top_MapScript1_269151
-	.byte 0
-
-NavelRock_Top_MapScript1_26911E: @ 826911E
-	checkflag FLAG_0x092
-	call_if 1, NavelRock_Top_EventScript_269131
-	checkflag FLAG_0x092
-	call_if 0, NavelRock_Top_EventScript_26913A
-	end
-
-NavelRock_Top_EventScript_269131:: @ 8269131
-	setvar VAR_TEMP_1, 1
-	setflag FLAG_0x321
-	return
-
-NavelRock_Top_EventScript_26913A:: @ 826913A
-	setvar VAR_TEMP_1, 1
-	checkflag FLAG_0x1DC
-	goto_eq NavelRock_Top_EventScript_27374E
-	setvar VAR_TEMP_1, 0
-	clearflag FLAG_0x321
-	return
-
-NavelRock_Top_MapScript1_269151: @ 8269151
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, NavelRock_Top_EventScript_26915B
-	end
-
-NavelRock_Top_EventScript_26915B:: @ 826915B
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, NavelRock_Top_EventScript_27374E
-	removeobject 1
-	return
-
-NavelRock_Top_EventScript_26916F:: @ 826916F
-	lockall
-	setvar VAR_TEMP_1, 1
-	special SpawnScriptFieldObject
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 35
-	special sub_813B80C
-	applymovement 1, NavelRock_Top_Movement_269243
-	applymovement 127, NavelRock_Top_Movement_269230
-	waitmovement 0
-	delay 50
-	setweather 0
-	doweather
-	waitse
-	playmoncry SPECIES_HO_OH, 2
-	delay 30
-	waitmoncry
-	delay 60
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 35
-	special sub_813B80C
-	applymovement 127, NavelRock_Top_Movement_269234
-	applymovement 1, NavelRock_Top_Movement_26923A
-	waitmovement 0
-	special RemoveScriptFieldObject
-	setvar VAR_0x8004, 250
-	setvar VAR_0x8005, 70
-	setvar VAR_0x8006, 0
-	special CreateObedientEnemyMon
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special BattleSetup_StartLegendaryBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	setvar VAR_LAST_TALKED, 1
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq NavelRock_Top_EventScript_269217
-	compare VAR_RESULT, 4
-	goto_eq NavelRock_Top_EventScript_269225
-	compare VAR_RESULT, 5
-	goto_eq NavelRock_Top_EventScript_269225
-	setflag FLAG_0x092
-	releaseall
-	end
-
-NavelRock_Top_EventScript_269217:: @ 8269217
-	setflag FLAG_0x1DC
-	setvar VAR_0x8004, 250
-	goto NavelRock_Top_EventScript_273776
-	end
-
-NavelRock_Top_EventScript_269225:: @ 8269225
-	setvar VAR_0x8004, 250
-	goto NavelRock_Top_EventScript_273776
-	end
-
-NavelRock_Top_Movement_269230: @ 8269230
-	step_up
-	step_up
-	step_up
-	step_end
-
-NavelRock_Top_Movement_269234: @ 8269234
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_end
-
-NavelRock_Top_Movement_26923A: @ 826923A
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_1d
-	step_14
-	step_14
-	step_end
-
-NavelRock_Top_Movement_269243: @ 8269243
-	step_14
-	step_14
-	step_1d
-	step_1d
-	step_1d
-	step_1d
-	step_end
-
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
deleted file mode 100644
index 3c075cad0..000000000
--- a/data/scripts/maps/OldaleTown.inc
+++ /dev/null
@@ -1,408 +0,0 @@
-OldaleTown_MapScripts:: @ 81E8EA2
-	map_script 3, OldaleTown_MapScript1_1E8EA8
-	.byte 0
-
-OldaleTown_MapScript1_1E8EA8: @ 81E8EA8
-	call OldaleTown_EventScript_271ED7
-	setflag FLAG_VISITED_OLDALE_TOWN
-	checkflag FLAG_0x074
-	call_if 0, OldaleTown_EventScript_1E8ED2
-	checkflag FLAG_0x084
-	call_if 0, OldaleTown_EventScript_1E8EDE
-	checkflag FLAG_0x074
-	call_if 1, OldaleTown_EventScript_1E8ECC
-	end
-
-OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
-	setvar VAR_0x4051, 1
-	return
-
-OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
-	setobjectxyperm 3, 1, 11
-	setobjectmovementtype 3, 9
-	return
-
-OldaleTown_EventScript_1E8EDE:: @ 81E8EDE
-	setobjectxyperm 2, 13, 14
-	setobjectmovementtype 2, 8
-	return
-
-OldaleTown_EventScript_1E8EEA:: @ 81E8EEA
-	msgbox OldaleTown_Text_1E94DA, 3
-	end
-
-OldaleTown_EventScript_1E8EF3:: @ 81E8EF3
-	msgbox OldaleTown_Text_1E918E, 2
-	end
-
-OldaleTown_EventScript_1E8EFC:: @ 81E8EFC
-	lock
-	faceplayer
-	checkflag FLAG_0x084
-	goto_eq OldaleTown_EventScript_1E8FB9
-	checkflag FLAG_0x001
-	goto_eq OldaleTown_EventScript_1E8FB9
-	setflag FLAG_0x001
-	playbgm MUS_TSURETEK, 0
-	msgbox OldaleTown_Text_1E91C0, 4
-	closemessage
-	switch VAR_FACING
-	case 1, OldaleTown_EventScript_1E8F47
-	case 2, OldaleTown_EventScript_1E8F5E
-	case 4, OldaleTown_EventScript_1E8F75
-	end
-
-OldaleTown_EventScript_1E8F47:: @ 81E8F47
-	applymovement 2, OldaleTown_Movement_1E8FD7
-	applymovement 255, OldaleTown_Movement_1E9001
-	waitmovement 0
-	goto OldaleTown_EventScript_1E8F8C
-	end
-
-OldaleTown_EventScript_1E8F5E:: @ 81E8F5E
-	applymovement 2, OldaleTown_Movement_1E8FE2
-	applymovement 255, OldaleTown_Movement_1E900B
-	waitmovement 0
-	goto OldaleTown_EventScript_1E8F8C
-	end
-
-OldaleTown_EventScript_1E8F75:: @ 81E8F75
-	applymovement 255, OldaleTown_Movement_1E8FF9
-	applymovement 2, OldaleTown_Movement_1E8FCE
-	waitmovement 0
-	goto OldaleTown_EventScript_1E8F8C
-	end
-
-OldaleTown_EventScript_1E8F8C:: @ 81E8F8C
-	msgbox OldaleTown_Text_1E91FD, 4
-	giveitem_std ITEM_POTION
-	compare VAR_RESULT, 0
-	goto_eq OldaleTown_EventScript_1E8FC3
-	msgbox OldaleTown_Text_1E92AF, 4
-	setflag FLAG_0x084
-	fadedefaultbgm
-	release
-	end
-
-OldaleTown_EventScript_1E8FB9:: @ 81E8FB9
-	msgbox OldaleTown_Text_1E92AF, 4
-	release
-	end
-
-OldaleTown_EventScript_1E8FC3:: @ 81E8FC3
-	msgbox gUnknown_08272AD0, 4
-	fadedefaultbgm
-	release
-	end
-
-OldaleTown_Movement_1E8FCE: @ 81E8FCE
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-OldaleTown_Movement_1E8FD7: @ 81E8FD7
-	step_left
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-OldaleTown_Movement_1E8FE2: @ 81E8FE2
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-OldaleTown_Movement_1E8FEB: @ 81E8FEB
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_25
-	step_end
-
-OldaleTown_Movement_1E8FF9: @ 81E8FF9
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-OldaleTown_Movement_1E9001: @ 81E9001
-	step_14
-	step_14
-	step_14
-	step_14
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-OldaleTown_Movement_1E900B: @ 81E900B
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-OldaleTown_Movement_1E9013: @ 81E9013
-	step_left
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-OldaleTown_EventScript_1E901F:: @ 81E901F
-	lock
-	faceplayer
-	checkflag FLAG_0x074
-	goto_eq OldaleTown_EventScript_1E9066
-	msgbox OldaleTown_Text_1E939A, 4
-	closemessage
-	applymovement 3, OldaleTown_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-OldaleTown_EventScript_1E903F:: @ 81E903F
-	lockall
-	applymovement 255, OldaleTown_Movement_1E9182
-	applymovement 3, OldaleTown_Movement_1E9185
-	waitmovement 0
-	msgbox OldaleTown_Text_1E9313, 4
-	closemessage
-	applymovement 3, OldaleTown_Movement_1E918B
-	waitmovement 0
-	releaseall
-	end
-
-OldaleTown_EventScript_1E9066:: @ 81E9066
-	msgbox OldaleTown_Text_1E93F8, 4
-	release
-	end
-
-OldaleTown_EventScript_1E9070:: @ 81E9070
-	lockall
-	applymovement 4, OldaleTown_Movement_27259E
-	waitmovement 0
-	setvar VAR_0x8009, 0
-	goto OldaleTown_EventScript_1E90E6
-	end
-
-OldaleTown_EventScript_1E9086:: @ 81E9086
-	lockall
-	applymovement 4, OldaleTown_Movement_1E9170
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_2725A8
-	waitmovement 0
-	setvar VAR_0x8009, 1
-	goto OldaleTown_EventScript_1E90E6
-	end
-
-OldaleTown_EventScript_1E90A6:: @ 81E90A6
-	lockall
-	applymovement 4, OldaleTown_Movement_1E9173
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_2725A8
-	waitmovement 0
-	setvar VAR_0x8009, 1
-	goto OldaleTown_EventScript_1E90E6
-	end
-
-OldaleTown_EventScript_1E90C6:: @ 81E90C6
-	lockall
-	applymovement 4, OldaleTown_Movement_1E9175
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_2725A8
-	waitmovement 0
-	setvar VAR_0x8009, 1
-	goto OldaleTown_EventScript_1E90E6
-	end
-
-OldaleTown_EventScript_1E90E6:: @ 81E90E6
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq OldaleTown_EventScript_1E90FE
-	compare VAR_RESULT, 1
-	goto_eq OldaleTown_EventScript_1E910C
-	end
-
-OldaleTown_EventScript_1E90FE:: @ 81E90FE
-	msgbox OldaleTown_Text_1E9462, 4
-	goto OldaleTown_EventScript_1E911A
-	end
-
-OldaleTown_EventScript_1E910C:: @ 81E910C
-	msgbox OldaleTown_Text_1E948A, 4
-	goto OldaleTown_EventScript_1E911A
-	end
-
-OldaleTown_EventScript_1E911A:: @ 81E911A
-	closemessage
-	compare VAR_0x8009, 0
-	call_if 1, OldaleTown_EventScript_1E9148
-	compare VAR_0x8009, 1
-	call_if 1, OldaleTown_EventScript_1E915E
-	applymovement 4, OldaleTown_Movement_1E9177
-	waitmovement 0
-	removeobject 4
-	setvar VAR_0x40C7, 2
-	setflag FLAG_0x3D3
-	releaseall
-	end
-
-OldaleTown_EventScript_1E9148:: @ 81E9148
-	compare VAR_FACING, 1
-	goto_if 5, OldaleTown_EventScript_1E915E
-	applymovement 4, OldaleTown_Movement_1E9177
-	waitmovement 0
-	return
-
-OldaleTown_EventScript_1E915E:: @ 81E915E
-	applymovement 255, OldaleTown_Movement_1E917E
-	applymovement 4, OldaleTown_Movement_1E9177
-	waitmovement 0
-	return
-
-OldaleTown_Movement_1E9170: @ 81E9170
-	step_left
-	step_left
-	step_end
-
-OldaleTown_Movement_1E9173: @ 81E9173
-	step_left
-	step_end
-
-OldaleTown_Movement_1E9175: @ 81E9175
-	step_02
-	step_end
-
-OldaleTown_Movement_1E9177: @ 81E9177
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-OldaleTown_Movement_1E917E: @ 81E917E
-	step_13
-	step_12
-	step_25
-	step_end
-
-OldaleTown_Movement_1E9182: @ 81E9182
-	step_13
-	step_right
-	step_end
-
-OldaleTown_Movement_1E9185: @ 81E9185
-	step_16
-	step_27
-	step_40
-	step_right
-	step_41
-	step_end
-
-OldaleTown_Movement_1E918B: @ 81E918B
-	step_down
-	step_left
-	step_end
-
-OldaleTown_Text_1E918E: @ 81E918E
-	.string "I want to take a rest, so I’m saving my\n"
-	.string "progress.$"
-
-OldaleTown_Text_1E91C0: @ 81E91C0
-	.string "Hi!\n"
-	.string "I work at a POKéMON MART.\p"
-	.string "Can I get you to come with me?$"
-
-OldaleTown_Text_1E91FD: @ 81E91FD
-	.string "This is a POKéMON MART.\n"
-	.string "Just look for our blue roof.\p"
-	.string "We sell a variety of goods including\n"
-	.string "POKé BALLS for catching POKéMON.\p"
-	.string "Here, I’d like you to have this as\n"
-	.string "a promotional item.$"
-
-OldaleTown_Text_1E92AF: @ 81E92AF
-	.string "A POTION can be used anytime, so it’s\n"
-	.string "even more useful than a POKéMON CENTER\l"
-	.string "in certain situations.$"
-
-OldaleTown_Text_1E9313: @ 81E9313
-	.string "Aaaaah! Wait!\n"
-	.string "Please don’t come in here.\p"
-	.string "I just discovered the footprints of\n"
-	.string "a rare POKéMON!\p"
-	.string "Wait until I finish sketching\n"
-	.string "them, okay?$"
-
-OldaleTown_Text_1E939A: @ 81E939A
-	.string "I just discovered the footprints of\n"
-	.string "a rare POKéMON!\p"
-	.string "Wait until I finish sketching\n"
-	.string "them, okay?$"
-
-OldaleTown_Text_1E93F8: @ 81E93F8
-	.string "I finished sketching the footprints of\n"
-	.string "a rare POKéMON.\p"
-	.string "But it turns out they were only my\n"
-	.string "own footprints…$"
-
-OldaleTown_Text_1E9462: @ 81E9462
-	.string "MAY: {PLAYER}{KUN}!\n"
-	.string "Over here!\l"
-	.string "Let’s hurry home!$"
-
-OldaleTown_Text_1E948A: @ 81E948A
-	.string "BRENDAN: I’m heading back to my dad’s\n"
-	.string "LAB now.\l"
-	.string "{PLAYER}, you should hustle back, too.$"
-
-OldaleTown_Text_1E94DA: @ 81E94DA
-	.string "OLDALE TOWN\n"
-	.string "“Where things start off scarce.”$"
-
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
deleted file mode 100644
index c297d61a7..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
-	step_13
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Movement_1DC418: @ 81DC418
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Movement_1DC41B: @ 81DC41B
-	step_13
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Movement_1DC42D: @ 81DC42D
-	step_up
-	step_54
-	step_end
-
-PetalburgCity_Movement_1DC430: @ 81DC430
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_28
-	step_end
-
-PetalburgCity_Movement_1DC451: @ 81DC451
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
-	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
-	step_14
-	step_14
-	step_14
-	step_end
-
-PetalburgCity_Movement_1DC615: @ 81DC615
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_1DC61A: @ 81DC61A
-	step_right
-	step_right
-	step_end
-
-PetalburgCity_Movement_1DC61D: @ 81DC61D
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
-
-PetalburgCity_Movement_1DC622: @ 81DC622
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
-
-PetalburgCity_Movement_1DC628: @ 81DC628
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_1DC633: @ 81DC633
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_1DC641: @ 81DC641
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_1DC64C: @ 81DC64C
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_1DC658: @ 81DC658
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_1DC665: @ 81DC665
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-PetalburgCity_Movement_1DC66F: @ 81DC66F
-	step_14
-	step_14
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Movement_1DC67C: @ 81DC67C
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-PetalburgCity_Movement_1DC686: @ 81DC686
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_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
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_1DC7DB: @ 81DC7DB
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_1DC7E0: @ 81DC7E0
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_1DC7EE: @ 81DC7EE
-	step_14
-	step_25
-	step_14
-	step_14
-	step_13
-	step_27
-	step_end
-
-PetalburgCity_Movement_1DC7F5: @ 81DC7F5
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_1DC802: @ 81DC802
-	step_14
-	step_25
-	step_14
-	step_13
-	step_27
-	step_end
-
-PetalburgCity_Movement_1DC808: @ 81DC808
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_1DC815: @ 81DC815
-	step_14
-	step_25
-	step_14
-	step_13
-	step_27
-	step_end
-
-PetalburgCity_Movement_1DC81B: @ 81DC81B
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_1DC828: @ 81DC828
-	step_14
-	step_26
-	step_14
-	step_13
-	step_27
-	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 2751e345e..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
-	step_down
-	step_down
-	step_down
-	step_14
-	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
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_26
-	step_13
-	step_1d
-	step_54
-	step_end
-
-PetalburgCity_Gym_Movement_205089: @ 8205089
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_26
-	step_13
-	step_1d
-	step_54
-	step_end
-
-PetalburgCity_Gym_Movement_205094: @ 8205094
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_26
-	step_13
-	step_1d
-	step_54
-	step_end
-
-PetalburgCity_Gym_Movement_2050A1: @ 82050A1
-	step_14
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050A9: @ 82050A9
-	step_14
-	step_down
-	step_down
-	step_left
-	step_down
-	step_down
-	step_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050B1: @ 82050B1
-	step_14
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
-
-PetalburgCity_Gym_Movement_2050BB: @ 82050BB
-	step_up
-	step_13
-	step_28
-	step_13
-	step_27
-	step_14
-	step_26
-	step_end
-
-PetalburgCity_Gym_Movement_2050C3: @ 82050C3
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_28
-	step_end
-
-PetalburgCity_Gym_Movement_2050CA: @ 82050CA
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Gym_Movement_2050D0: @ 82050D0
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_right
-	step_up
-	step_end
-
-PetalburgCity_Gym_Movement_2050D8: @ 82050D8
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_25
-	step_end
-
-PetalburgCity_Gym_Movement_2050E1: @ 82050E1
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_27
-	step_end
-
-PetalburgCity_Gym_Movement_2050EB: @ 82050EB
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Gym_Movement_2050F2: @ 82050F2
-	step_down
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
-
-PetalburgCity_Gym_Movement_2050FA: @ 82050FA
-	step_down
-	step_down
-	step_right
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
-
-PetalburgCity_Gym_Movement_205102: @ 8205102
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
-
-PetalburgCity_Gym_Movement_205109: @ 8205109
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-PetalburgCity_Gym_Movement_205111: @ 8205111
-	step_14
-	step_14
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-PetalburgCity_Gym_Movement_20511B: @ 820511B
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-PetalburgCity_Gym_Movement_205123: @ 8205123
-	step_25
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_right
-	step_down
-	step_13
-	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/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
deleted file mode 100644
index 907f07623..000000000
--- a/data/scripts/maps/PetalburgWoods.inc
+++ /dev/null
@@ -1,486 +0,0 @@
-PetalburgWoods_MapScripts:: @ 822DFD6
-	.byte 0
-
-PetalburgWoods_EventScript_22DFD7:: @ 822DFD7
-	lockall
-	call PetalburgWoods_EventScript_22E124
-	applymovement 4, PetalburgWoods_Movement_22E1CB
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E34F, 4
-	closemessage
-	playbgm MUS_AQA_0, 0
-	applymovement 3, PetalburgWoods_Movement_22E209
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E3AA, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_22E1F6
-	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_2725A6
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E428, 4
-	closemessage
-	applymovement 4, PetalburgWoods_Movement_22E1E4
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E457, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_22E20E
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E4A5, 4
-	trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542
-	applymovement 3, PetalburgWoods_Movement_22E1F9
-	waitmovement 0
-	call PetalburgWoods_EventScript_22E138
-	applymovement 255, PetalburgWoods_Movement_22E1E0
-	applymovement 4, PetalburgWoods_Movement_22E1C2
-	waitmovement 0
-	goto PetalburgWoods_EventScript_22E1A7
-	end
-
-PetalburgWoods_EventScript_22E079:: @ 822E079
-	lockall
-	call PetalburgWoods_EventScript_22E124
-	applymovement 4, PetalburgWoods_Movement_22E1D0
-	waitmovement 0
-	applymovement 255, PetalburgWoods_Movement_2725A4
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E34F, 4
-	closemessage
-	playbgm MUS_AQA_0, 0
-	applymovement 3, PetalburgWoods_Movement_22E209
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E3AA, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_22E205
-	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_2725A6
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E428, 4
-	closemessage
-	applymovement 4, PetalburgWoods_Movement_22E1EA
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E457, 4
-	applymovement 255, PetalburgWoods_Movement_2725A6
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E4A5, 4
-	trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542
-	applymovement 3, PetalburgWoods_Movement_22E1F9
-	waitmovement 0
-	call PetalburgWoods_EventScript_22E138
-	applymovement 255, PetalburgWoods_Movement_22E1E0
-	applymovement 4, PetalburgWoods_Movement_22E1D7
-	waitmovement 0
-	goto PetalburgWoods_EventScript_22E1A7
-	end
-
-PetalburgWoods_EventScript_22E124:: @ 822E124
-	applymovement 4, PetalburgWoods_Movement_22E1B1
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E332, 4
-	closemessage
-	return
-
-PetalburgWoods_EventScript_22E138:: @ 822E138
-	msgbox PetalburgWoods_Text_22E563, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_22E1FD
-	waitmovement 0
-	removeobject 3
-	applymovement 255, PetalburgWoods_Movement_2725AA
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E63D, 4
-	giveitem_std ITEM_GREAT_BALL
-	compare VAR_RESULT, 0
-	goto_eq PetalburgWoods_EventScript_22E17D
-	goto PetalburgWoods_EventScript_22E18B
-	end
-
-PetalburgWoods_EventScript_22E17D:: @ 822E17D
-	msgbox PetalburgWoods_Text_22E741, 4
-	goto PetalburgWoods_EventScript_22E18B
-	end
-
-PetalburgWoods_EventScript_22E18B:: @ 822E18B
-	msgbox PetalburgWoods_Text_22E6C7, 4
-	applymovement 4, PetalburgWoods_Movement_22E1EE
-	waitmovement 0
-	msgbox PetalburgWoods_Text_22E712, 4
-	closemessage
-	return
-
-PetalburgWoods_EventScript_22E1A7:: @ 822E1A7
-	removeobject 4
-	setvar VAR_0x4098, 1
-	releaseall
-	end
-
-PetalburgWoods_Movement_22E1B1: @ 822E1B1
-	step_01
-	step_14
-	step_12
-	step_03
-	step_14
-	step_13
-	step_02
-	step_14
-	step_13
-	step_00
-	step_14
-	step_03
-	step_14
-	step_13
-	step_01
-	step_14
-	step_end
-
-PetalburgWoods_Movement_22E1C2: @ 822E1C2
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-PetalburgWoods_Movement_22E1CB: @ 822E1CB
-	step_14
-	step_3e
-	step_down
-	step_down
-	step_end
-
-PetalburgWoods_Movement_22E1D0: @ 822E1D0
-	step_14
-	step_3e
-	step_down
-	step_down
-	step_down
-	step_28
-	step_end
-
-PetalburgWoods_Movement_22E1D7: @ 822E1D7
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-PetalburgWoods_Movement_22E1E0: @ 822E1E0
-	step_14
-	step_14
-	step_26
-	step_end
-
-PetalburgWoods_Movement_22E1E4: @ 822E1E4
-	step_18
-	step_15
-	step_15
-	step_17
-	step_26
-	step_end
-
-PetalburgWoods_Movement_22E1EA: @ 822E1EA
-	step_15
-	step_18
-	step_26
-	step_end
-
-PetalburgWoods_Movement_22E1EE: @ 822E1EE
-	step_25
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_01
-	step_end
-
-PetalburgWoods_Movement_22E1F6: @ 822E1F6
-	step_15
-	step_15
-	step_end
-
-PetalburgWoods_Movement_22E1F9: @ 822E1F9
-	step_40
-	step_up
-	step_41
-	step_end
-
-PetalburgWoods_Movement_22E1FD: @ 822E1FD
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_14
-	step_14
-	step_end
-
-PetalburgWoods_Movement_22E205: @ 822E205
-	step_15
-	step_15
-	step_15
-	step_end
-
-PetalburgWoods_Movement_22E209: @ 822E209
-	step_down
-	step_down
-	step_14
-	step_14
-	step_end
-
-PetalburgWoods_Movement_22E20E: @ 822E20E
-	step_down
-	step_end
-
-PetalburgWoods_EventScript_22E210:: @ 822E210
-	msgbox PetalburgWoods_Text_22EA0C, 2
-	end
-
-PetalburgWoods_EventScript_22E219:: @ 822E219
-	msgbox PetalburgWoods_Text_22EA8B, 2
-	end
-
-PetalburgWoods_EventScript_22E222:: @ 822E222
-	lock
-	faceplayer
-	checkflag FLAG_0x129
-	goto_eq PetalburgWoods_EventScript_22E251
-	msgbox PetalburgWoods_Text_22EAFE, 4
-	giveitem_std ITEM_MIRACLE_SEED
-	compare VAR_RESULT, 0
-	goto_eq PetalburgWoods_EventScript_272054
-	setflag FLAG_0x129
-	release
-	end
-
-PetalburgWoods_EventScript_22E251:: @ 822E251
-	msgbox PetalburgWoods_Text_22EB63, 4
-	release
-	end
-
-PetalburgWoods_EventScript_22E25B:: @ 822E25B
-	msgbox PetalburgWoods_Text_22EC10, 3
-	end
-
-PetalburgWoods_EventScript_22E264:: @ 822E264
-	msgbox PetalburgWoods_Text_22ED07, 3
-	end
-
-PetalburgWoods_EventScript_22E26D:: @ 822E26D
-	trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1
-	msgbox PetalburgWoods_Text_22E7EF, 6
-	end
-
-PetalburgWoods_EventScript_22E284:: @ 822E284
-	trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq PetalburgWoods_EventScript_22E31B
-	setvar VAR_0x8004, 621
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_eq PetalburgWoods_EventScript_22E2EF
-	msgbox PetalburgWoods_Text_22E889, 4
-	release
-	end
-
-PetalburgWoods_EventScript_22E2C5:: @ 822E2C5
-	special sub_80B4808
-	waitmovement 0
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq PetalburgWoods_EventScript_22E2D6
-	release
-	end
-
-PetalburgWoods_EventScript_22E2D6:: @ 822E2D6
-	msgbox PetalburgWoods_Text_22E8C3, 4
-	setvar VAR_0x8004, 621
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 621
-	callstd 8
-	release
-	end
-
-PetalburgWoods_EventScript_22E2EF:: @ 822E2EF
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq PetalburgWoods_EventScript_22E302
-	msgbox PetalburgWoods_Text_22E889, 4
-	release
-	end
-
-PetalburgWoods_EventScript_22E302:: @ 822E302
-	msgbox PetalburgWoods_Text_22E914, 4
-	setvar VAR_0x8004, 621
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 621
-	callstd 8
-	release
-	end
-
-PetalburgWoods_EventScript_22E31B:: @ 822E31B
-	trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998
-	msgbox PetalburgWoods_Text_22E9B6, 6
-	end
-
-PetalburgWoods_Text_22E332: @ 822E332
-	.string "Hmmm…\n"
-	.string "Not a one to be found…$"
-
-PetalburgWoods_Text_22E34F: @ 822E34F
-	.string "Hello, have you seen any POKéMON\n"
-	.string "called SHROOMISH around here?\p"
-	.string "I really love that POKéMON.$"
-
-PetalburgWoods_Text_22E3AA: @ 822E3AA
-	.string "I was going to ambush you, but you\n"
-	.string "had to dawdle in PETALBURG WOODS\l"
-	.string "forever, didn’t you?\p"
-	.string "I got sick of waiting, so here I am!$"
-
-PetalburgWoods_Text_22E428: @ 822E428
-	.string "You! DEVON RESEARCHER!\p"
-	.string "Hand over those papers!$"
-
-PetalburgWoods_Text_22E457: @ 822E457
-	.string "Aiyeeeh!\p"
-	.string "You’re a POKéMON TRAINER, aren’t you?\n"
-	.string "You’ve got to help me, please!$"
-
-PetalburgWoods_Text_22E4A5: @ 822E4A5
-	.string "Hunh? What do you think you’re doing?\n"
-	.string "What, you’re going to protect him?\p"
-	.string "No one who crosses TEAM AQUA\n"
-	.string "gets any mercy, not even a kid!\p"
-	.string "Come on and battle me!$"
-
-PetalburgWoods_Text_22E542: @ 822E542
-	.string "You’re kidding me! You’re tough!$"
-
-PetalburgWoods_Text_22E563: @ 822E563
-	.string "Grrr… You’ve got some nerve\n"
-	.string "meddling with TEAM AQUA!\l"
-	.string "Come on and battle me again!\p"
-	.string "I wish I could say that, but I’m out of\n"
-	.string "POKéMON…\p"
-	.string "And, hey, we of TEAM AQUA are also\n"
-	.string "after something in RUSTBORO.\p"
-	.string "I’ll let you go today!$"
-
-PetalburgWoods_Text_22E63D: @ 822E63D
-	.string "Whew…\n"
-	.string "That was awfully close!\p"
-	.string "Thanks to you, he didn’t rob me of\n"
-	.string "these important papers.\p"
-	.string "I know, I’ll give you a GREAT BALL as\n"
-	.string "my thanks!$"
-
-PetalburgWoods_Text_22E6C7: @ 822E6C7
-	.string "Didn’t that TEAM AQUA thug say\n"
-	.string "they were after something in\l"
-	.string "RUSTBORO, too?$"
-
-PetalburgWoods_Text_22E712: @ 822E712
-	.string "Uh-oh! It’s a crisis!\n"
-	.string "I can’t be wasting time!$"
-
-PetalburgWoods_Text_22E741: @ 822E741
-	.string "You’re loaded with items.\n"
-	.string "I can’t give you this GREAT BALL.$"
-
-PetalburgWoods_Text_22E77D: @ 822E77D
-	.string "I caught a whole bunch of POKéMON!\p"
-	.string "Go, go, go!\n"
-	.string "My BUG POKéMON team!$"
-
-PetalburgWoods_Text_22E7C1: @ 822E7C1
-	.string "I have all these POKéMON,\n"
-	.string "but I couldn’t win…$"
-
-PetalburgWoods_Text_22E7EF: @ 822E7EF
-	.string "I caught a bunch of POKéMON.\n"
-	.string "Now I’m out of POKé BALLS.$"
-
-PetalburgWoods_Text_22E827: @ 822E827
-	.string "If you take BUG POKéMON to school,\n"
-	.string "you get to be instantly popular!$"
-
-PetalburgWoods_Text_22E86B: @ 822E86B
-	.string "I can’t be popular if I lose.$"
-
-PetalburgWoods_Text_22E889: @ 822E889
-	.string "If you have a big BUG POKéMON,\n"
-	.string "people respect you for it.$"
-
-PetalburgWoods_Text_22E8C3: @ 822E8C3
-	.string "I want a rematch when my BUG\n"
-	.string "POKéMON grow up!\p"
-	.string "I’m registering you in my POKéNAV!$"
-
-PetalburgWoods_Text_22E914: @ 822E914
-	.string "I want a rematch when my BUG \n"
-	.string "POKéMON grow up!\p"
-	.string "I’m registering you in my POKéNAV!$"
-
-PetalburgWoods_Text_22E966: @ 822E966
-	.string "My BUG POKéMON have grown.\n"
-	.string "I’ll be popular again.$"
-
-PetalburgWoods_Text_22E998: @ 822E998
-	.string "I can’t be popular if I lose.$"
-
-PetalburgWoods_Text_22E9B6: @ 822E9B6
-	.string "You get to be popular if you have\n"
-	.string "strong POKéMON, right?\l"
-	.string "So, I’ve been training hard.$"
-
-PetalburgWoods_Text_22EA0C: @ 822EA0C
-	.string "Yo, there!\n"
-	.string "Your POKéMON doing okay?\p"
-	.string "If your POKéMON are weak and you want\n"
-	.string "to avoid battles, you should stay out\l"
-	.string "of tall grass.$"
-
-PetalburgWoods_Text_22EA8B: @ 822EA8B
-	.string "Sometimes, there are things on the\n"
-	.string "ground even if you can’t see them.\p"
-	.string "That’s why I always check where I’m\n"
-	.string "walking.$"
-
-PetalburgWoods_Text_22EAFE: @ 822EAFE
-	.string "Oh, neat!\n"
-	.string "That’s the BADGE from RUSTBORO GYM!\p"
-	.string "You must be a TRAINER.\n"
-	.string "You should try using this item.$"
-
-PetalburgWoods_Text_22EB63: @ 822EB63
-	.string "It’s a MIRACLE SEED.\n"
-	.string "If a POKéMON holds that item, its\l"
-	.string "GRASS-type moves become stronger.\p"
-	.string "Besides MIRACLE SEED, I think there are\n"
-	.string "other convenient items for POKéMON\l"
-	.string "to hold.$"
-
-PetalburgWoods_Text_22EC10: @ 822EC10
-	.string "TRAINER TIPS\p"
-	.string "Any POKéMON that appears even once\n"
-	.string "in a battle is awarded EXP Points.\p"
-	.string "To raise a weak POKéMON, put it at the\n"
-	.string "left of the team list.\p"
-	.string "As soon as a battle starts, switch it\n"
-	.string "out. It will earn EXP Points without\l"
-	.string "being exposed to any harm.$"
-
-PetalburgWoods_Text_22ED07: @ 822ED07
-	.string "TRAINER TIPS\p"
-	.string "In addition to Hit Points (HP), POKéMON\n"
-	.string "have Power Points (PP) that are used to\l"
-	.string "make moves during battle.\p"
-	.string "If a POKéMON runs out of PP, it must be\n"
-	.string "taken to a POKéMON CENTER.$"
-
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
deleted file mode 100644
index 4d4334aca..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
-	step_up
-	step_end
-
-Route101_Movement_1EBD92: @ 81EBD92
-	step_right
-	step_end
-
-Route101_Movement_1EBD94: @ 81EBD94
-	step_down
-	step_end
-
-Route101_Movement_1EBD96: @ 81EBD96
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_end
-
-Route101_Movement_1EBDB5: @ 81EBDB5
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
-
-Route101_Movement_1EBDBC: @ 81EBDBC
-	step_end
-
-Route101_Movement_1EBDBD: @ 81EBDBD
-	step_23
-	step_23
-	step_23
-	step_23
-	step_end
-
-Route101_Movement_1EBDC2: @ 81EBDC2
-	step_16
-	step_16
-	step_16
-	step_16
-	step_27
-	step_end
-
-Route101_Movement_1EBDC8: @ 81EBDC8
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_end
-
-Route101_Movement_1EBDE7: @ 81EBDE7
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_end
-
-Route101_Movement_1EBDEE: @ 81EBDEE
-	step_end
-
-Route101_Movement_1EBDEF: @ 81EBDEF
-	step_24
-	step_24
-	step_24
-	step_24
-	step_end
-
-Route101_Movement_1EBDF4: @ 81EBDF4
-	step_up
-	step_up
-	step_end
-
-Route101_Movement_1EBDF7: @ 81EBDF7
-	step_up
-	step_left
-	step_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
-	step_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/Route103.inc b/data/scripts/maps/Route103.inc
deleted file mode 100644
index d71ec729c..000000000
--- a/data/scripts/maps/Route103.inc
+++ /dev/null
@@ -1,368 +0,0 @@
-Route103_MapScripts:: @ 81EC38E
-	map_script 3, Route103_MapScript1_1EC399
-	map_script 1, Route103_MapScript1_1EC3A4
-	.byte 0
-
-Route103_MapScript1_1EC399: @ 81EC399
-	call Route103_EventScript_271ED7
-	call Route103_EventScript_2720AD
-	end
-
-Route103_MapScript1_1EC3A4: @ 81EC3A4
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, Route103_EventScript_1EC3AE
-	end
-
-Route103_EventScript_1EC3AE:: @ 81EC3AE
-	setmetatile 45, 5, 159, 1
-	setmetatile 45, 6, 167, 0
-	return
-
-Route103_EventScript_1EC3C1:: @ 81EC3C1
-	lockall
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq Route103_EventScript_1EC3DA
-	compare VAR_RESULT, 1
-	goto_eq Route103_EventScript_1EC434
-	end
-
-Route103_EventScript_1EC3DA:: @ 81EC3DA
-	msgbox Route103_Text_1EC7A6, 4
-	closemessage
-	playbgm MUS_GIRL_SUP, 1
-	applymovement 2, Route103_Movement_27259E
-	waitmovement 0
-	applymovement 2, Route103_Movement_272598
-	waitmovement 0
-	applymovement 2, Route103_Movement_27259A
-	waitmovement 0
-	msgbox Route103_Text_1EC7DE, 4
-	switch VAR_FIRST_POKE
-	case 0, Route103_EventScript_1EC48E
-	case 1, Route103_EventScript_1EC49E
-	case 2, Route103_EventScript_1EC4AE
-	end
-
-Route103_EventScript_1EC434:: @ 81EC434
-	msgbox Route103_Text_1EC989, 4
-	closemessage
-	playbgm MUS_BOY_SUP, 1
-	applymovement 2, Route103_Movement_27259E
-	waitmovement 0
-	applymovement 2, Route103_Movement_272598
-	waitmovement 0
-	applymovement 2, Route103_Movement_27259A
-	waitmovement 0
-	msgbox Route103_Text_1EC9CE, 4
-	switch VAR_FIRST_POKE
-	case 0, Route103_EventScript_1EC4BE
-	case 1, Route103_EventScript_1EC4CE
-	case 2, Route103_EventScript_1EC4DE
-	end
-
-Route103_EventScript_1EC48E:: @ 81EC48E
-	trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881
-	goto Route103_EventScript_1EC4EE
-	end
-
-Route103_EventScript_1EC49E:: @ 81EC49E
-	trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881
-	goto Route103_EventScript_1EC4EE
-	end
-
-Route103_EventScript_1EC4AE:: @ 81EC4AE
-	trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881
-	goto Route103_EventScript_1EC4EE
-	end
-
-Route103_EventScript_1EC4BE:: @ 81EC4BE
-	trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59
-	goto Route103_EventScript_1EC4FC
-	end
-
-Route103_EventScript_1EC4CE:: @ 81EC4CE
-	trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59
-	goto Route103_EventScript_1EC4FC
-	end
-
-Route103_EventScript_1EC4DE:: @ 81EC4DE
-	trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59
-	goto Route103_EventScript_1EC4FC
-	end
-
-Route103_EventScript_1EC4EE:: @ 81EC4EE
-	msgbox Route103_Text_1EC8AE, 4
-	goto Route103_EventScript_1EC50A
-	end
-
-Route103_EventScript_1EC4FC:: @ 81EC4FC
-	msgbox Route103_Text_1ECA79, 4
-	goto Route103_EventScript_1EC50A
-	end
-
-Route103_EventScript_1EC50A:: @ 81EC50A
-	closemessage
-	switch VAR_FACING
-	case 1, Route103_EventScript_1EC585
-	case 2, Route103_EventScript_1EC53D
-	case 3, Route103_EventScript_1EC561
-	case 4, Route103_EventScript_1EC561
-	end
-
-Route103_EventScript_1EC53D:: @ 81EC53D
-	applymovement 255, Route103_Movement_1EC5C8
-	applymovement 2, Route103_Movement_1EC5BE
-	waitmovement 0
-	playse SE_DANSA
-	applymovement 2, Route103_Movement_1EC5C1
-	waitmovement 0
-	goto Route103_EventScript_1EC5A2
-	end
-
-Route103_EventScript_1EC561:: @ 81EC561
-	applymovement 255, Route103_Movement_1EC5D6
-	applymovement 2, Route103_Movement_1EC5CE
-	waitmovement 0
-	playse SE_DANSA
-	applymovement 2, Route103_Movement_1EC5D0
-	waitmovement 0
-	goto Route103_EventScript_1EC5A2
-	end
-
-Route103_EventScript_1EC585:: @ 81EC585
-	applymovement 2, Route103_Movement_1EC5CE
-	waitmovement 0
-	playse SE_DANSA
-	applymovement 2, Route103_Movement_1EC5D0
-	waitmovement 0
-	goto Route103_EventScript_1EC5A2
-	end
-
-Route103_EventScript_1EC5A2:: @ 81EC5A2
-	removeobject 2
-	setvar VAR_0x4084, 4
-	clearflag FLAG_0x379
-	setflag FLAG_0x082
-	setvar VAR_0x40C7, 1
-	clearflag FLAG_0x3D3
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	releaseall
-	end
-
-Route103_Movement_1EC5BE: @ 81EC5BE
-	step_left
-	step_down
-	step_end
-
-Route103_Movement_1EC5C1: @ 81EC5C1
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route103_Movement_1EC5C8: @ 81EC5C8
-	step_14
-	step_12
-	step_27
-	step_14
-	step_25
-	step_end
-
-Route103_Movement_1EC5CE: @ 81EC5CE
-	step_down
-	step_end
-
-Route103_Movement_1EC5D0: @ 81EC5D0
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route103_Movement_1EC5D6: @ 81EC5D6
-	step_14
-	step_25
-	step_end
-
-Route103_EventScript_1EC5D9:: @ 81EC5D9
-	msgbox Route103_Text_1ECB73, 2
-	end
-
-Route103_EventScript_1EC5E2:: @ 81EC5E2
-	msgbox Route103_Text_1ECBB5, 2
-	end
-
-Route103_EventScript_1EC5EB:: @ 81EC5EB
-	msgbox Route103_Text_1ECC1A, 3
-	end
-
-Route103_EventScript_1EC5F4:: @ 81EC5F4
-	trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F
-	msgbox Route103_Text_2949B4, 6
-	end
-
-Route103_EventScript_1EC60B:: @ 81EC60B
-	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route103_EventScript_1EC653
-	msgbox Route103_Text_294A52, 6
-	end
-
-Route103_EventScript_1EC63A:: @ 81EC63A
-	msgbox Route103_Text_294B8A, 4
-	setvar VAR_0x8004, 481
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 481
-	callstd 8
-	release
-	end
-
-Route103_EventScript_1EC653:: @ 81EC653
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF
-	msgbox Route103_Text_294C93, 6
-	end
-
-Route103_EventScript_1EC66E:: @ 81EC66E
-	trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route103_EventScript_1EC6B6
-	msgbox Route103_Text_294B40, 6
-	end
-
-Route103_EventScript_1EC69D:: @ 81EC69D
-	msgbox Route103_Text_294B8A, 4
-	setvar VAR_0x8004, 481
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 481
-	callstd 8
-	release
-	end
-
-Route103_EventScript_1EC6B6:: @ 81EC6B6
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB
-	msgbox Route103_Text_294D89, 6
-	end
-
-Route103_EventScript_1EC6D1:: @ 81EC6D1
-	trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92
-	msgbox Route103_Text_294EBB, 6
-	end
-
-Route103_EventScript_1EC6E8:: @ 81EC6E8
-	trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route103_EventScript_1EC733
-	msgbox Route103_Text_294F42, 4
-	release
-	end
-
-Route103_EventScript_1EC714:: @ 81EC714
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route103_Text_294F7E, 4
-	setvar VAR_0x8004, 293
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 293
-	callstd 8
-	release
-	end
-
-Route103_EventScript_1EC733:: @ 81EC733
-	trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006
-	msgbox Route103_Text_29501E, 6
-	end
-
-Route103_EventScript_1EC74A:: @ 81EC74A
-	trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B
-	msgbox Route103_Text_295246, 6
-	end
-
-Route103_EventScript_1EC761:: @ 81EC761
-	trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6
-	msgbox Route103_Text_2951DE, 6
-	end
-
-Route103_EventScript_1EC778:: @ 81EC778
-	trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093
-	msgbox Route103_Text_2950AA, 6
-	end
-
-Route103_EventScript_1EC78F:: @ 81EC78F
-	trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146
-	msgbox Route103_Text_29514D, 6
-	end
-
-Route103_Text_1EC7A6: @ 81EC7A6
-	.string "MAY: Let’s see… The POKéMON found\n"
-	.string "on ROUTE 103 include…$"
-
-Route103_Text_1EC7DE: @ 81EC7DE
-	.string "Oh, hi, {PLAYER}{KUN}!\p"
-	.string "…Oh, I see, my dad gave you\n"
-	.string "a POKéMON as a gift.\p"
-	.string "Since we’re here, let’s have a quick\n"
-	.string "battle!\p"
-	.string "I’ll give you a taste of what being\n"
-	.string "a TRAINER is like.$"
-
-Route103_Text_1EC881: @ 81EC881
-	.string "Wow! That’s great!\n"
-	.string "{PLAYER}{KUN}, you’re pretty good!$"
-
-Route103_Text_1EC8AE: @ 81EC8AE
-	.string "MAY: I think I know why my dad has\n"
-	.string "an eye out for you now.\p"
-	.string "I mean, you just got that POKéMON,\n"
-	.string "but it already likes you.\p"
-	.string "You might be able to befriend any\n"
-	.string "kind of POKéMON easily.\p"
-	.string "Well, it’s time to head back to\n"
-	.string "the LAB.$"
-
-Route103_Text_1EC989: @ 81EC989
-	.string "BRENDAN: Okay, so it’s this one and\n"
-	.string "that one that live on ROUTE 103…$"
-
-Route103_Text_1EC9CE: @ 81EC9CE
-	.string "Hey, it’s {PLAYER}!\p"
-	.string "…Oh, yeah, Dad gave you a POKéMON.\p"
-	.string "Since we’re here, how about a little\n"
-	.string "battle?\p"
-	.string "I’ll teach you what being a TRAINER’s\n"
-	.string "about!$"
-
-Route103_Text_1ECA59: @ 81ECA59
-	.string "Huh, {PLAYER}, you’re not too shabby.$"
-
-Route103_Text_1ECA79: @ 81ECA79
-	.string "BRENDAN: I think I get it.\n"
-	.string "I think I know why my dad has his eye\l"
-	.string "out for you now.\p"
-	.string "Look, your POKéMON already likes you,\n"
-	.string "even though you just got it.\p"
-	.string "{PLAYER}, I get the feeling that you\n"
-	.string "could befriend any POKéMON with ease.\p"
-	.string "We should head back to the LAB.$"
-
-Route103_Text_1ECB73: @ 81ECB73
-	.string "My POKéMON is staggeringly tired…\n"
-	.string "I should have brought a POTION…$"
-
-Route103_Text_1ECBB5: @ 81ECBB5
-	.string "If you cross the sea from here,\n"
-	.string "it’ll be a shortcut to OLDALE TOWN.\p"
-	.string "Fufufu, that’s useful, isn’t it?$"
-
-Route103_Text_1ECC1A: @ 81ECC1A
-	.string "ROUTE 103\n"
-	.string "{0x7A} OLDALE TOWN$"
-
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
deleted file mode 100644
index 314b47e1d..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
-	slow_step_left
-	step_end
-
-Route104_Movement_1ECDCA: @ 81ECDCA
-	step_down
-	step_03
-	step_end
-
-Route104_Movement_1ECDCD: @ 81ECDCD
-	step_12
-	step_27
-	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
-	step_40
-	step_down
-	step_41
-	step_end
-
-Route104_Movement_1ECF8A: @ 81ECF8A
-	step_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
-	step_down
-	step_down
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_end
-
-Route104_Movement_1ED22A: @ 81ED22A
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_right
-	step_right
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_down
-	step_down
-	step_end
-
-Route104_Movement_1ED28C: @ 81ED28C
-	step_down
-	step_down
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_right
-	step_right
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_down
-	step_down
-	step_end
-
-Route104_Movement_1ED34F: @ 81ED34F
-	step_left
-	step_down
-	step_down
-	step_end
-
-Route104_Movement_1ED353: @ 81ED353
-	step_down
-	step_end
-
-Route104_Movement_1ED355: @ 81ED355
-	step_down
-	step_left
-	step_28
-	step_end
-
-Route104_Movement_1ED359: @ 81ED359
-	step_down
-	step_down
-	step_end
-
-Route104_Movement_1ED35C: @ 81ED35C
-	step_down
-	step_27
-	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 123f78db1..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
-	step_25
-	step_down
-	step_down
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_left
-	step_left
-	step_25
-	step_end
-
-Route109_Movement_1EE8FD: @ 81EE8FD
-	step_down
-	step_down
-	step_end
-
-Route109_Movement_1EE900: @ 81EE900
-	step_down
-	step_down
-	step_left
-	step_28
-	step_end
-
-Route109_Movement_1EE905: @ 81EE905
-	step_right
-	step_down
-	step_end
-
-Route109_Movement_1EE908: @ 81EE908
-	step_left
-	step_down
-	step_end
-
-Route109_Movement_1EE90B: @ 81EE90B
-	step_down
-	step_end
-
-Route109_Movement_1EE90D: @ 81EE90D
-	step_down
-	step_27
-	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.inc b/data/scripts/maps/Route110.inc
deleted file mode 100644
index 9d00303c9..000000000
--- a/data/scripts/maps/Route110.inc
+++ /dev/null
@@ -1,1030 +0,0 @@
-Route110_MapScripts:: @ 81EF269
-	map_script 5, Route110_MapScript1_1EF279
-	map_script 3, Route110_MapScript1_1EF27D
-	map_script 2, Route110_MapScript2_1EF297
-	.byte 0
-
-Route110_MapScript1_1EF279: @ 81EF279
-	special UpdateCyclingRoadState
-	end
-
-Route110_MapScript1_1EF27D: @ 81EF27D
-	call Route110_EventScript_271ED7
-	call Route110_EventScript_271EFB
-	compare VAR_0x40A9, 1
-	call_if 1, Route110_EventScript_1EF293
-	end
-
-Route110_EventScript_1EF293:: @ 81EF293
-	savebgm MUS_CYCLING
-	return
-
-Route110_MapScript2_1EF297: @ 81EF297
-	map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1
-	.2byte 0
-
-Route110_EventScript_1EF2A1:: @ 81EF2A1
-	special Special_BeginCyclingRoadChallenge
-	setvar VAR_0x40A9, 2
-	return
-
-Route110_EventScript_1EF2AA:: @ 81EF2AA
-	lock
-	faceplayer
-	msgbox Route110_Text_1EFB5D, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_1EF2C0:: @ 81EF2C0
-	lock
-	faceplayer
-	msgbox Route110_Text_1EFB93, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_1EF2D6:: @ 81EF2D6
-	lock
-	faceplayer
-	msgbox Route110_Text_1EFBCA, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_1EF2EC:: @ 81EF2EC
-	lock
-	faceplayer
-	msgbox Route110_Text_1EFC0D, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_1EF302:: @ 81EF302
-	msgbox Route110_Text_1EFFC3, 2
-	end
-
-Route110_EventScript_1EF30B:: @ 81EF30B
-	msgbox Route110_Text_1F0006, 2
-	end
-
-Route110_EventScript_1EF314:: @ 81EF314
-	msgbox Route110_Text_1F006A, 2
-	end
-
-Route110_EventScript_1EF31D:: @ 81EF31D
-	msgbox Route110_Text_1F0261, 2
-	end
-
-Route110_EventScript_1EF326:: @ 81EF326
-	msgbox Route110_Text_1F02CA, 2
-	end
-
-Route110_EventScript_1EF32F:: @ 81EF32F
-	msgbox Route110_Text_1F030E, 2
-	end
-
-Route110_EventScript_1EF338:: @ 81EF338
-	msgbox Route110_Text_1F0390, 2
-	end
-
-Route110_EventScript_1EF341:: @ 81EF341
-	msgbox Route110_Text_1F0812, 3
-	end
-
-Route110_EventScript_1EF34A:: @ 81EF34A
-	msgbox Route110_Text_1F082D, 3
-	end
-
-Route110_EventScript_1EF353:: @ 81EF353
-	msgbox Route110_Text_1F0842, 3
-	end
-
-Route110_EventScript_1EF35C:: @ 81EF35C
-	msgbox Route110_Text_1F08CD, 3
-	end
-
-Route110_EventScript_1EF365:: @ 81EF365
-	msgbox Route110_Text_1F08E3, 3
-	end
-
-Route110_EventScript_1EF36E:: @ 81EF36E
-	msgbox Route110_Text_1F08F3, 3
-	end
-
-Route110_EventScript_1EF377:: @ 81EF377
-	msgbox Route110_Text_1F090D, 3
-	end
-
-Route110_EventScript_1EF380:: @ 81EF380
-	msgbox Route110_Text_1F0992, 3
-	end
-
-Route110_EventScript_1EF389:: @ 81EF389
-	msgbox Route110_Text_1F09DB, 3
-	end
-
-Route110_EventScript_1EF392:: @ 81EF392
-	lockall
-	specialvar VAR_RESULT, GetRecordedCyclingRoadResults
-	compare VAR_RESULT, 0
-	goto_eq Route110_EventScript_1EF3AD
-	msgbox Route110_Text_1F0A1E, 4
-	releaseall
-	end
-
-Route110_EventScript_1EF3AD:: @ 81EF3AD
-	msgbox Route110_Text_1F0A5E, 4
-	releaseall
-	end
-
-Route110_EventScript_1EF3B7:: @ 81EF3B7
-	lock
-	faceplayer
-	specialvar VAR_RESULT, GetPlayerAvatarBike
-	compare VAR_RESULT, 1
-	goto_eq Route110_EventScript_1EF3E8
-	compare VAR_0x40A9, 0
-	goto_eq Route110_EventScript_1EF3DE
-	msgbox Route110_Text_1F06FB, 4
-	release
-	end
-
-Route110_EventScript_1EF3DE:: @ 81EF3DE
-	msgbox Route110_Text_1F0661, 4
-	release
-	end
-
-Route110_EventScript_1EF3E8:: @ 81EF3E8
-	msgbox Route110_Text_1F0755, 4
-	release
-	end
-
-Route110_EventScript_1EF3F2:: @ 81EF3F2
-	trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064
-	msgbox Route110_Text_29808A, 6
-	end
-
-Route110_EventScript_1EF409:: @ 81EF409
-	trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5
-	msgbox Route110_Text_2980F8, 6
-	end
-
-Route110_EventScript_1EF420:: @ 81EF420
-	trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route110_EventScript_1EF46B
-	msgbox Route110_Text_2981B3, 4
-	release
-	end
-
-Route110_EventScript_1EF44C:: @ 81EF44C
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route110_Text_298201, 4
-	setvar VAR_0x8004, 512
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 512
-	callstd 8
-	release
-	end
-
-Route110_EventScript_1EF46B:: @ 81EF46B
-	trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288
-	msgbox Route110_Text_2982A2, 6
-	end
-
-Route110_EventScript_1EF482:: @ 81EF482
-	trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5
-	msgbox Route110_Text_298303, 6
-	end
-
-Route110_EventScript_1EF499:: @ 81EF499
-	trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77
-	msgbox Route110_Text_297B8F, 6
-	end
-
-Route110_EventScript_1EF4B0:: @ 81EF4B0
-	trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F
-	msgbox Route110_Text_297C1F, 6
-	end
-
-Route110_EventScript_1EF4C7:: @ 81EF4C7
-	trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route110_EventScript_1EF512
-	msgbox Route110_Text_297CB4, 4
-	release
-	end
-
-Route110_EventScript_1EF4F3:: @ 81EF4F3
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route110_Text_297CFE, 4
-	setvar VAR_0x8004, 353
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 353
-	callstd 8
-	release
-	end
-
-Route110_EventScript_1EF512:: @ 81EF512
-	trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E
-	msgbox Route110_Text_297DB0, 6
-	end
-
-Route110_EventScript_1EF529:: @ 81EF529
-	trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0
-	msgbox Route110_Text_297FF1, 6
-	end
-
-Route110_EventScript_1EF540:: @ 81EF540
-	trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route110_EventScript_1EF58B
-	msgbox Route110_Text_297E88, 4
-	release
-	end
-
-Route110_EventScript_1EF56C:: @ 81EF56C
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route110_Text_297ECD, 4
-	setvar VAR_0x8004, 358
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 358
-	callstd 8
-	release
-	end
-
-Route110_EventScript_1EF58B:: @ 81EF58B
-	trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37
-	msgbox Route110_Text_297F58, 6
-	end
-
-Route110_EventScript_1EF5A2:: @ 81EF5A2
-	trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route110_EventScript_1EF5ED
-	msgbox Route110_Text_2983A2, 4
-	release
-	end
-
-Route110_EventScript_1EF5CE:: @ 81EF5CE
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route110_Text_2983EE, 4
-	setvar VAR_0x8004, 302
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 302
-	callstd 8
-	release
-	end
-
-Route110_EventScript_1EF5ED:: @ 81EF5ED
-	trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF
-	msgbox Route110_Text_2984C8, 6
-	end
-
-Route110_EventScript_1EF604:: @ 81EF604
-	trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559
-	msgbox Route110_Text_298579, 6
-	end
-
-Route110_EventScript_1EF61B:: @ 81EF61B
-	end
-
-Route110_EventScript_1EF61C:: @ 81EF61C
-	trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735
-	msgbox Route110_Text_298755, 6
-	end
-
-Route110_EventScript_1EF633:: @ 81EF633
-	trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686
-	msgbox Route110_Text_2986A9, 6
-	end
-
-Route110_EventScript_1EF64A:: @ 81EF64A
-	trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9
-	msgbox Route110_Text_298612, 6
-	end
-
-Route110_EventScript_1EF661:: @ 81EF661
-	lockall
-	applymovement 21, Route110_Movement_2725A8
-	waitmovement 0
-	call Route110_EventScript_1EF673
-	releaseall
-	end
-
-Route110_EventScript_1EF673:: @ 81EF673
-	special FinishCyclingRoadChallenge
-	msgbox Route110_Text_1F03FF, 4
-	switch VAR_RESULT
-	case 10, Route110_EventScript_1EF6FD
-	case 9, Route110_EventScript_1EF70B
-	case 8, Route110_EventScript_1EF70B
-	case 7, Route110_EventScript_1EF70B
-	case 6, Route110_EventScript_1EF719
-	case 5, Route110_EventScript_1EF719
-	case 4, Route110_EventScript_1EF719
-	case 3, Route110_EventScript_1EF727
-	case 2, Route110_EventScript_1EF727
-	case 1, Route110_EventScript_1EF727
-	case 0, Route110_EventScript_1EF735
-	end
-
-Route110_EventScript_1EF6FD:: @ 81EF6FD
-	msgbox Route110_Text_1F0431, 4
-	goto Route110_EventScript_1EF743
-	end
-
-Route110_EventScript_1EF70B:: @ 81EF70B
-	msgbox Route110_Text_1F04A4, 4
-	goto Route110_EventScript_1EF743
-	end
-
-Route110_EventScript_1EF719:: @ 81EF719
-	msgbox Route110_Text_1F0500, 4
-	goto Route110_EventScript_1EF743
-	end
-
-Route110_EventScript_1EF727:: @ 81EF727
-	msgbox Route110_Text_1F0567, 4
-	goto Route110_EventScript_1EF743
-	end
-
-Route110_EventScript_1EF735:: @ 81EF735
-	msgbox Route110_Text_1F05CE, 4
-	goto Route110_EventScript_1EF743
-	end
-
-Route110_EventScript_1EF743:: @ 81EF743
-	setvar VAR_0x40A9, 3
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	return
-
-Route110_EventScript_1EF74D:: @ 81EF74D
-	setvar VAR_0x8008, 1
-	goto Route110_EventScript_1EF76E
-	end
-
-Route110_EventScript_1EF758:: @ 81EF758
-	setvar VAR_0x8008, 2
-	goto Route110_EventScript_1EF76E
-	end
-
-Route110_EventScript_1EF763:: @ 81EF763
-	setvar VAR_0x8008, 3
-	goto Route110_EventScript_1EF76E
-	end
-
-Route110_EventScript_1EF76E:: @ 81EF76E
-	lockall
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, Route110_EventScript_1EF7E1
-	compare VAR_RESULT, 1
-	call_if 1, Route110_EventScript_1EF7E6
-	applymovement 28, Route110_Movement_2725AA
-	waitmovement 0
-	applymovement 28, Route110_Movement_272598
-	waitmovement 0
-	applymovement 28, Route110_Movement_27259A
-	waitmovement 0
-	delay 30
-	compare VAR_0x8008, 1
-	call_if 1, Route110_EventScript_1EF94E
-	compare VAR_0x8008, 2
-	call_if 1, Route110_EventScript_1EF959
-	compare VAR_0x8008, 3
-	call_if 1, Route110_EventScript_1EF964
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq Route110_EventScript_1EF7EB
-	compare VAR_RESULT, 1
-	goto_eq Route110_EventScript_1EF865
-	releaseall
-	end
-
-Route110_EventScript_1EF7E1:: @ 81EF7E1
-	playbgm MUS_GIRL_SUP, 1
-	return
-
-Route110_EventScript_1EF7E6:: @ 81EF7E6
-	playbgm MUS_BOY_SUP, 1
-	return
-
-Route110_EventScript_1EF7EB:: @ 81EF7EB
-	msgbox Route110_Text_1EFC48, 4
-	switch VAR_FIRST_POKE
-	case 0, Route110_EventScript_1EF81A
-	case 1, Route110_EventScript_1EF82A
-	case 2, Route110_EventScript_1EF83A
-	end
-
-Route110_EventScript_1EF81A:: @ 81EF81A
-	trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB
-	goto Route110_EventScript_1EF84A
-	end
-
-Route110_EventScript_1EF82A:: @ 81EF82A
-	trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB
-	goto Route110_EventScript_1EF84A
-	end
-
-Route110_EventScript_1EF83A:: @ 81EF83A
-	trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB
-	goto Route110_EventScript_1EF84A
-	end
-
-Route110_EventScript_1EF84A:: @ 81EF84A
-	msgbox Route110_Text_1EFCF1, 4
-	call Route110_EventScript_1EF8DF
-	msgbox Route110_Text_1EFD58, 4
-	goto Route110_EventScript_1EF8EC
-	end
-
-Route110_EventScript_1EF865:: @ 81EF865
-	msgbox Route110_Text_1EFE3F, 4
-	switch VAR_FIRST_POKE
-	case 0, Route110_EventScript_1EF894
-	case 1, Route110_EventScript_1EF8A4
-	case 2, Route110_EventScript_1EF8B4
-	end
-
-Route110_EventScript_1EF894:: @ 81EF894
-	trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4
-	goto Route110_EventScript_1EF8C4
-	end
-
-Route110_EventScript_1EF8A4:: @ 81EF8A4
-	trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4
-	goto Route110_EventScript_1EF8C4
-	end
-
-Route110_EventScript_1EF8B4:: @ 81EF8B4
-	trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4
-	goto Route110_EventScript_1EF8C4
-	end
-
-Route110_EventScript_1EF8C4:: @ 81EF8C4
-	msgbox Route110_Text_1EFECD, 4
-	call Route110_EventScript_1EF8DF
-	msgbox Route110_Text_1EFF1C, 4
-	goto Route110_EventScript_1EF8EC
-	end
-
-Route110_EventScript_1EF8DF:: @ 81EF8DF
-	giveitem_std ITEM_ITEMFINDER
-	return
-
-Route110_EventScript_1EF8EC:: @ 81EF8EC
-	closemessage
-	compare VAR_0x8008, 1
-	call_if 1, Route110_EventScript_1EF990
-	compare VAR_0x8008, 2
-	call_if 1, Route110_EventScript_1EF998
-	compare VAR_0x8008, 3
-	call_if 1, Route110_EventScript_1EF9A0
-	setobjectmovementtype 28, 10
-	setobjectmovementtype 29, 10
-	removeobject 28
-	addobject 29
-	delay 45
-	compare VAR_0x8008, 1
-	call_if 1, Route110_EventScript_1EF96F
-	compare VAR_0x8008, 2
-	call_if 1, Route110_EventScript_1EF97A
-	compare VAR_0x8008, 3
-	call_if 1, Route110_EventScript_1EF985
-	removeobject 29
-	setvar VAR_0x4069, 1
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	releaseall
-	end
-
-Route110_EventScript_1EF94E:: @ 81EF94E
-	applymovement 28, Route110_Movement_1EF9A8
-	waitmovement 0
-	return
-
-Route110_EventScript_1EF959:: @ 81EF959
-	applymovement 28, Route110_Movement_1EF9AC
-	waitmovement 0
-	return
-
-Route110_EventScript_1EF964:: @ 81EF964
-	applymovement 28, Route110_Movement_1EF9AE
-	waitmovement 0
-	return
-
-Route110_EventScript_1EF96F:: @ 81EF96F
-	applymovement 29, Route110_Movement_1EF9B2
-	waitmovement 0
-	return
-
-Route110_EventScript_1EF97A:: @ 81EF97A
-	applymovement 29, Route110_Movement_1EF9BA
-	waitmovement 0
-	return
-
-Route110_EventScript_1EF985:: @ 81EF985
-	applymovement 29, Route110_Movement_1EF9C3
-	waitmovement 0
-	return
-
-Route110_EventScript_1EF990:: @ 81EF990
-	setobjectxyperm 29, 33, 55
-	return
-
-Route110_EventScript_1EF998:: @ 81EF998
-	setobjectxyperm 29, 34, 55
-	return
-
-Route110_EventScript_1EF9A0:: @ 81EF9A0
-	setobjectxyperm 29, 35, 55
-	return
-
-Route110_Movement_1EF9A8: @ 81EF9A8
-	step_down
-	step_left
-	step_25
-	step_end
-
-Route110_Movement_1EF9AC: @ 81EF9AC
-	step_down
-	step_end
-
-Route110_Movement_1EF9AE: @ 81EF9AE
-	step_down
-	step_right
-	step_25
-	step_end
-
-Route110_Movement_1EF9B2: @ 81EF9B2
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route110_Movement_1EF9BA: @ 81EF9BA
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_15
-	step_end
-
-Route110_Movement_1EF9C3: @ 81EF9C3
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route110_EventScript_1EF9CB:: @ 81EF9CB
-	lockall
-	setvar VAR_0x8008, 1
-	goto Route110_EventScript_1EF9F7
-
-Route110_EventScript_1EF9D6:: @ 81EF9D6
-	lockall
-	setvar VAR_0x8008, 2
-	goto Route110_EventScript_1EF9F7
-
-Route110_EventScript_1EF9E1:: @ 81EF9E1
-	lockall
-	setvar VAR_0x8008, 3
-	goto Route110_EventScript_1EF9F7
-
-Route110_EventScript_1EF9EC:: @ 81EF9EC
-	lockall
-	setvar VAR_0x8008, 4
-	goto Route110_EventScript_1EF9F7
-
-Route110_EventScript_1EF9F7:: @ 81EF9F7
-	addobject 36
-	applymovement 36, Route110_Movement_1EFB30
-	waitmovement 0
-	playse SE_PIN
-	applymovement 36, Route110_Movement_272598
-	waitmovement 0
-	applymovement 36, Route110_Movement_27259A
-	waitmovement 0
-	compare VAR_0x8008, 1
-	call_if 1, Route110_EventScript_1EFAD8
-	compare VAR_0x8008, 2
-	call_if 1, Route110_EventScript_1EFAE3
-	compare VAR_0x8008, 3
-	call_if 1, Route110_EventScript_1EFAEE
-	compare VAR_0x8008, 4
-	call_if 1, Route110_EventScript_1EFAF9
-	msgbox Route110_Text_1F0AB5, 4
-	closemessage
-	delay 20
-	applymovement 36, Route110_Movement_2725A4
-	waitmovement 0
-	delay 10
-	applymovement 36, Route110_Movement_2725A8
-	waitmovement 0
-	delay 20
-	applymovement 36, Route110_Movement_2725AA
-	waitmovement 0
-	delay 30
-	msgbox Route110_Text_1F0AFF, 4
-	closemessage
-	delay 30
-	playfanfare MUS_ME_TORE_EYE
-	msgbox Route110_Text_1F0C0C, 4
-	waitfanfare
-	closemessage
-	delay 30
-	setflag FLAG_0x119
-	msgbox Route110_Text_1F0C33, 4
-	closemessage
-	compare VAR_0x8008, 1
-	call_if 1, Route110_EventScript_1EFB04
-	compare VAR_0x8008, 2
-	call_if 1, Route110_EventScript_1EFB0F
-	compare VAR_0x8008, 3
-	call_if 1, Route110_EventScript_1EFB1A
-	compare VAR_0x8008, 4
-	call_if 1, Route110_EventScript_1EFB25
-	removeobject 36
-	setvar VAR_0x40DA, 2
-	releaseall
-	end
-
-Route110_EventScript_1EFAD8:: @ 81EFAD8
-	applymovement 36, Route110_Movement_1EFB34
-	waitmovement 0
-	return
-
-Route110_EventScript_1EFAE3:: @ 81EFAE3
-	applymovement 36, Route110_Movement_1EFB39
-	waitmovement 0
-	return
-
-Route110_EventScript_1EFAEE:: @ 81EFAEE
-	applymovement 36, Route110_Movement_1EFB3D
-	waitmovement 0
-	return
-
-Route110_EventScript_1EFAF9:: @ 81EFAF9
-	applymovement 36, Route110_Movement_1EFB40
-	waitmovement 0
-	return
-
-Route110_EventScript_1EFB04:: @ 81EFB04
-	applymovement 36, Route110_Movement_1EFB44
-	waitmovement 0
-	return
-
-Route110_EventScript_1EFB0F:: @ 81EFB0F
-	applymovement 36, Route110_Movement_1EFB4B
-	waitmovement 0
-	return
-
-Route110_EventScript_1EFB1A:: @ 81EFB1A
-	applymovement 36, Route110_Movement_1EFB51
-	waitmovement 0
-	return
-
-Route110_EventScript_1EFB25:: @ 81EFB25
-	applymovement 36, Route110_Movement_1EFB57
-	waitmovement 0
-	return
-
-Route110_Movement_1EFB30: @ 81EFB30
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route110_Movement_1EFB34: @ 81EFB34
-	step_down
-	step_left
-	step_left
-	step_down
-	step_end
-
-Route110_Movement_1EFB39: @ 81EFB39
-	step_down
-	step_left
-	step_down
-	step_end
-
-Route110_Movement_1EFB3D: @ 81EFB3D
-	step_down
-	step_down
-	step_end
-
-Route110_Movement_1EFB40: @ 81EFB40
-	step_down
-	step_right
-	step_down
-	step_end
-
-Route110_Movement_1EFB44: @ 81EFB44
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route110_Movement_1EFB4B: @ 81EFB4B
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route110_Movement_1EFB51: @ 81EFB51
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route110_Movement_1EFB57: @ 81EFB57
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route110_Text_1EFB5D: @ 81EFB5D
-	.string "TEAM AQUA’s activities…\n"
-	.string "We can’t talk about them yet.$"
-
-Route110_Text_1EFB93: @ 81EFB93
-	.string "I want to get going to SLATEPORT and\n"
-	.string "kick up a ruckus!$"
-
-Route110_Text_1EFBCA: @ 81EFBCA
-	.string "This is my first job after joining\n"
-	.string "TEAM AQUA. It’s a little scary.$"
-
-Route110_Text_1EFC0D: @ 81EFC0D
-	.string "TEAM AQUA’s actions should bring\n"
-	.string "smiles to people’s faces!$"
-
-Route110_Text_1EFC48: @ 81EFC48
-	.string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p"
-	.string "While I was searching for other\n"
-	.string "POKéMON, my POKéMON grew stronger.\p"
-	.string "So…\n"
-	.string "How about a little battle?$"
-
-Route110_Text_1EFCCB: @ 81EFCCB
-	.string "Yikes!\n"
-	.string "You’re better than I expected!$"
-
-Route110_Text_1EFCF1: @ 81EFCF1
-	.string "MAY: {PLAYER}{KUN}, you’ve been busy\n"
-	.string "training, too, haven’t you?\p"
-	.string "I think you deserve a reward!\n"
-	.string "This is from me!$"
-
-Route110_Text_1EFD58: @ 81EFD58
-	.string "MAY: That’s an ITEMFINDER.\p"
-	.string "Try it out. If there is an item that’s\n"
-	.string "not visible, it emits a sound.\p"
-	.string "Okay, {PLAYER}{KUN}, let’s meet again!\p"
-	.string "I know it’s a little silly coming from\n"
-	.string "me, but I think you should train a lot\l"
-	.string "harder for the next time.$"
-
-Route110_Text_1EFE3F: @ 81EFE3F
-	.string "BRENDAN: Hey, {PLAYER}.\n"
-	.string "So this is where you were.\l"
-	.string "How’s it going?\p"
-	.string "Have you been raising your POKéMON?\n"
-	.string "I’ll check for you.$"
-
-Route110_Text_1EFEB4: @ 81EFEB4
-	.string "Hmm…\n"
-	.string "You’re pretty good.$"
-
-Route110_Text_1EFECD: @ 81EFECD
-	.string "BRENDAN: {PLAYER}, you’ve trained\n"
-	.string "without me noticing…\p"
-	.string "Good enough!\n"
-	.string "Here, take this.$"
-
-Route110_Text_1EFF1C: @ 81EFF1C
-	.string "BRENDAN: That’s an ITEMFINDER.\p"
-	.string "Use it to root around for items that\n"
-	.string "aren’t visible.\p"
-	.string "If it senses something, it emits\n"
-	.string "a sound.\p"
-	.string "Anyway, I’m off to look for new\n"
-	.string "POKéMON.$"
-
-Route110_Text_1EFFC3: @ 81EFFC3
-	.string "Wouldn’t it be great to ride a BIKE\n"
-	.string "at full speed on CYCLING ROAD?$"
-
-Route110_Text_1F0006: @ 81F0006
-	.string "How do you like the way my raven-\n"
-	.string "colored hair streams behind me?\p"
-	.string "I grew my hair out just for that.$"
-
-Route110_Text_1F006A: @ 81F006A
-	.string "Oh, hey, you got that BIKE from RYDEL!\p"
-	.string "Oh, it’s glaringly obvious.\n"
-	.string "It says right on your bike…\p"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p"
-	.string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL…\n"
-	.string "That name’s everywhere.\p"
-	.string "You should ride it around all over\n"
-	.string "the place--it’s good advertising!$"
-
-Route110_Text_1F0261: @ 81F0261
-	.string "The two roads, one above, one below…\p"
-	.string "A road each for people and POKéMON.\n"
-	.string "Perhaps that is right and fair.$"
-
-Route110_Text_1F02CA: @ 81F02CA
-	.string "I don’t have a BIKE, so I’ll take\n"
-	.string "a leisurely walk on the low road.$"
-
-Route110_Text_1F030E: @ 81F030E
-	.string "Learning techniques will make BIKE\n"
-	.string "riding even more fun.\p"
-	.string "There are some places that you can\n"
-	.string "reach only by using a BIKE technique.$"
-
-Route110_Text_1F0390: @ 81F0390
-	.string "Which should I choose?\p"
-	.string "Make a beeline for MAUVILLE on\n"
-	.string "CYCLING ROAD, or take the low road\l"
-	.string "and look for POKéMON?$"
-
-Route110_Text_1F03FF: @ 81F03FF
-	.string "Number of collisions:\n"
-	.string "… … {STR_VAR_1}!\p"
-	.string "Total time:\n"
-	.string "… … {STR_VAR_2}!$"
-
-Route110_Text_1F0431: @ 81F0431
-	.string "Bravo! Splendid showing!\p"
-	.string "Your love of cycling comes from deep\n"
-	.string "within your heart.\l"
-	.string "You’ve shaken me to my very soul!$"
-
-Route110_Text_1F04A4: @ 81F04A4
-	.string "Your technique is remarkable.\p"
-	.string "I suggest you speed up a bit while\n"
-	.string "still avoiding collisions.$"
-
-Route110_Text_1F0500: @ 81F0500
-	.string "I would consider you a work in\n"
-	.string "progress.\p"
-	.string "Still, I hope you don’t forget the\n"
-	.string "sheer pleasure of cycling.$"
-
-Route110_Text_1F0567: @ 81F0567
-	.string "My word… Your cycling skills border\n"
-	.string "on terrifying.\p"
-	.string "Most certainly, you need much more\n"
-	.string "practice riding.$"
-
-Route110_Text_1F05CE: @ 81F05CE
-	.string "…I am aghast…\p"
-	.string "You’re perhaps not cut out for this\n"
-	.string "unfortunate cycling business.\p"
-	.string "You ought to give serious thought to\n"
-	.string "returning that BIKE to RYDEL.$"
-
-Route110_Text_1F0661: @ 81F0661
-	.string "This is CYCLING ROAD.\p"
-	.string "If you were to ride from MAUVILLE to\n"
-	.string "SLATEPORT on a MACH BIKE, you would\l"
-	.string "be rated for the number of collisions\l"
-	.string "and your total time.$"
-
-Route110_Text_1F06FB: @ 81F06FB
-	.string "Regardless of the results, I count on\n"
-	.string "seeing more challenges from you.\l"
-	.string "Always aim higher!$"
-
-Route110_Text_1F0755: @ 81F0755
-	.string "On this CYCLING ROAD, those riding\n"
-	.string "MACH BIKES are rated for their number\l"
-	.string "of collisions and their total times.\p"
-	.string "ACRO BIKES do not qualify for rating.\n"
-	.string "They are easy to turn, so it’s not fair.$"
-
-Route110_Text_1F0812: @ 81F0812
-	.string "ROUTE 110\n"
-	.string "{0x7A} SLATEPORT CITY$"
-
-Route110_Text_1F082D: @ 81F082D
-	.string "SEASIDE CYCLING ROAD$"
-
-Route110_Text_1F0842: @ 81F0842
-	.string "“TEAM AQUA was here!”\p"
-	.string "Someone painted that onto this sign,\n"
-	.string "but then someone else painted over it.\p"
-	.string "“TEAM MAGMA rules!” is what it\n"
-	.string "says now.$"
-
-Route110_Text_1F08CD: @ 81F08CD
-	.string "ROUTE 110\n"
-	.string "{0x7B} ROUTE 103$"
-
-Route110_Text_1F08E3: @ 81F08E3
-	.string "SEASIDE PARKING$"
-
-Route110_Text_1F08F3: @ 81F08F3
-	.string "ROUTE 110\n"
-	.string "{0x79} MAUVILLE CITY$"
-
-Route110_Text_1F090D: @ 81F090D
-	.string "TRAINER TIPS\p"
-	.string "The foe can be made helpless by\n"
-	.string "paralyzing it or causing it to sleep.\p"
-	.string "It is an important technique for\n"
-	.string "POKéMON battles.$"
-
-Route110_Text_1F0992: @ 81F0992
-	.string "TRAINER TIPS\p"
-	.string "The items in the BAG can be reorganized\n"
-	.string "by pressing SELECT.$"
-
-Route110_Text_1F09DB: @ 81F09DB
-	.string "“Three steps {0x7C} and two steps {0x79}\n"
-	.string "to reach the wondrous TRICK HOUSE.”$"
-
-Route110_Text_1F0A1E: @ 81F0A1E
-	.string "THE BEST RECORD TO DATE…\p"
-	.string "No. of collisions: {STR_VAR_1}\p"
-	.string "Elapsed time: {STR_VAR_2}$"
-
-Route110_Text_1F0A5E: @ 81F0A5E
-	.string "THE BEST RECORD TO DATE…\p"
-	.string "No one seems to have taken the\n"
-	.string "challenge. There is no record…$"
-
-Route110_Text_1F0AB5: @ 81F0AB5
-	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
-	.string "Imagine seeing you here!\p"
-	.string "And where might my {RIVAL} be?$"
-
-Route110_Text_1F0AFF: @ 81F0AFF
-	.string "Oh, I see!\n"
-	.string "You two are running separately.\l"
-	.string "Well, that’s fine.\p"
-	.string "Oh, yes, I heard that your POKéNAV\n"
-	.string "had the MATCH CALL system installed.\p"
-	.string "Well, then, I should register you in\n"
-	.string "my POKéNAV as well.\p"
-	.string "That way, even when we’re apart,\n"
-	.string "I can rate your POKéDEX anytime.\p"
-	.string "… … … … … …$"
-
-Route110_Text_1F0C0C: @ 81F0C0C
-	.string "Registered PROF. BIRCH\n"
-	.string "in the POKéNAV.$"
-
-Route110_Text_1F0C33: @ 81F0C33
-	.string "PROF. BIRCH: {PLAYER}{KUN}…\p"
-	.string "Please keep an eye out for my {RIVAL}.\n"
-	.string "… … … … … …\p"
-	.string "Well, I had better get going.\n"
-	.string "See you again, {PLAYER}{KUN}!$"
-
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
deleted file mode 100644
index 5087d304c..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
-	step_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 97e7452ec..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
-	step_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 b8db4697b..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
-	step_down
-	step_end
-
-Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B
-	step_48
-	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 4bf7eb10a..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
-	step_01
-	step_12
-	step_02
-	step_12
-	step_00
-	step_12
-	step_03
-	step_12
-	step_end
-
-Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F
-Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
-	step_01
-	step_52
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	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
-	step_54
-	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 cd14f0060..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
-	step_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C
-	step_left
-	step_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-
-Movement_26D618: @ 826D618
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E
-	step_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620
-	step_right
-	step_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route110_TrickHouseEntrance_Movement_26D632: @ 826D632
-Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_00
-	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 37d77d095..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
-	step_94
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	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
-	step_up
-	step_end
-
-Route111_Movement_1F0FAA: @ 81F0FAA
-	step_down
-	step_end
-
-Route111_Movement_1F0FAC: @ 81F0FAC
-	step_left
-	step_end
-
-Route111_Movement_1F0FAE: @ 81F0FAE
-	step_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
-	step_26
-	step_up
-	step_end
-
-Route111_Movement_1F114D: @ 81F114D
-	step_down
-	step_end
-
-Route111_Movement_1F114F: @ 81F114F
-	step_14
-	step_14
-	step_14
-	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 72c003d99..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
-	step_up
-	step_up
-	step_right
-	step_27
-	step_end
-
-Route112_CableCarStation_Movement_22AB76: @ 822AB76
-	step_14
-	step_left
-	step_down
-	step_down
-	step_end
-
-Route112_CableCarStation_Movement_22AB7B: @ 822AB7B
-	step_up
-	step_up
-	step_up
-	step_14
-	step_end
-
-Route112_CableCarStation_Movement_22AB80: @ 822AB80
-	step_down
-	step_down
-	step_down
-	step_14
-	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/Route116.inc b/data/scripts/maps/Route116.inc
deleted file mode 100644
index a8d73397c..000000000
--- a/data/scripts/maps/Route116.inc
+++ /dev/null
@@ -1,511 +0,0 @@
-Route116_MapScripts:: @ 81F2C0C
-	map_script 3, Route116_MapScript1_1F2C1C
-	map_script 1, Route116_MapScript1_1F2C4F
-	map_script 2, Route116_MapScript2_1F2C66
-	.byte 0
-
-Route116_MapScript1_1F2C1C: @ 81F2C1C
-	checkflag FLAG_0x08F
-	call_if 1, Route116_EventScript_1F2C47
-	compare VAR_0x4039, 1
-	call_if 1, Route116_EventScript_273D13
-	compare VAR_0x4037, 5
-	call_if 1, Route116_EventScript_273D1B
-	compare VAR_0x4037, 6
-	call_if 1, Route116_EventScript_273D1B
-	end
-
-Route116_EventScript_1F2C47:: @ 81F2C47
-	setobjectxyperm 21, 38, 10
-	return
-
-Route116_MapScript1_1F2C4F: @ 81F2C4F
-	compare VAR_0x4037, 5
-	call_if 1, Route116_EventScript_27395F
-	compare VAR_0x4037, 6
-	call_if 1, Route116_EventScript_273972
-	end
-
-Route116_MapScript2_1F2C66: @ 81F2C66
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
-	.2byte 0
-
-Route116_EventScript_1F2C70:: @ 81F2C70
-	lock
-	faceplayer
-	checkflag FLAG_0x08F
-	goto_eq Route116_EventScript_1F2C8E
-	checkflag FLAG_0x08E
-	goto_eq Route116_EventScript_1F2C98
-	msgbox Route116_Text_1F3140, 4
-	release
-	end
-
-Route116_EventScript_1F2C8E:: @ 81F2C8E
-	msgbox Route116_Text_1F32C1, 4
-	release
-	end
-
-Route116_EventScript_1F2C98:: @ 81F2C98
-	msgbox Route116_Text_1F3166, 4
-	release
-	end
-
-Route116_EventScript_1F2CA2:: @ 81F2CA2
-	lock
-	faceplayer
-	checkflag FLAG_0x11F
-	goto_eq Route116_EventScript_1F2D2B
-	msgbox Route116_Text_1F3317, 4
-	goto Route116_EventScript_1F2CBB
-	end
-
-Route116_EventScript_1F2CBB:: @ 81F2CBB
-	setflag FLAG_0x11F
-	giveitem_std ITEM_REPEAT_BALL
-	compare VAR_RESULT, 0
-	goto_eq Route116_EventScript_1F2D39
-	msgbox Route116_Text_1F3521, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, Route116_EventScript_1F2D15
-	compare VAR_FACING, 1
-	call_if 1, Route116_EventScript_1F2D15
-	compare VAR_FACING, 3
-	call_if 1, Route116_EventScript_1F2D15
-	compare VAR_FACING, 4
-	call_if 1, Route116_EventScript_1F2D20
-	removeobject VAR_LAST_TALKED
-	clearflag FLAG_0x3B5
-	setflag FLAG_0x100
-	release
-	end
-
-Route116_EventScript_1F2D15:: @ 81F2D15
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43
-	waitmovement 0
-	return
-
-Route116_EventScript_1F2D20:: @ 81F2D20
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C
-	waitmovement 0
-	return
-
-Route116_EventScript_1F2D2B:: @ 81F2D2B
-	msgbox Route116_Text_1F35CE, 4
-	goto Route116_EventScript_1F2CBB
-	end
-
-Route116_EventScript_1F2D39:: @ 81F2D39
-	msgbox Route116_Text_1F3593, 4
-	release
-	end
-
-Route116_Movement_1F2D43: @ 81F2D43
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_Movement_1F2D4C: @ 81F2D4C
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_EventScript_1F2D57:: @ 81F2D57
-	msgbox Route116_Text_1F379D, 3
-	end
-
-Route116_EventScript_1F2D60:: @ 81F2D60
-	msgbox Route116_Text_1F37B7, 3
-	end
-
-Route116_EventScript_1F2D69:: @ 81F2D69
-	msgbox Route116_Text_1F380F, 3
-	end
-
-Route116_EventScript_1F2D72:: @ 81F2D72
-	msgbox Route116_Text_1F3825, 3
-	end
-
-Route116_EventScript_1F2D7B:: @ 81F2D7B
-	msgbox Route116_Text_1F38D4, 3
-	end
-
-Route116_EventScript_1F2D84:: @ 81F2D84
-	lock
-	faceplayer
-	msgbox Route116_Text_1F309D, 4
-	setvar VAR_0x406F, 2
-	release
-	end
-
-Route116_EventScript_1F2D95:: @ 81F2D95
-	lockall
-	applymovement 11, Route116_Movement_2725A8
-	applymovement 255, Route116_Movement_2725A4
-	waitmovement 0
-	msgbox Route116_Text_1F309D, 4
-	setvar VAR_0x406F, 2
-	releaseall
-	end
-
-Route116_EventScript_1F2DB6:: @ 81F2DB6
-	lock
-	faceplayer
-	checkitem ITEM_BLACK_GLASSES, 1
-	compare VAR_RESULT, 1
-	goto_eq Route116_EventScript_1F2DF1
-	specialvar VAR_RESULT, sub_8139634
-	compare VAR_RESULT, 1
-	goto_eq Route116_EventScript_1F2DE2
-	msgbox Route116_Text_1F3657, 4
-	release
-	end
-
-Route116_EventScript_1F2DE2:: @ 81F2DE2
-	msgbox Route116_Text_1F3718, 4
-	closemessage
-	goto Route116_EventScript_1F2E2A
-	end
-
-Route116_EventScript_1F2DF1:: @ 81F2DF1
-	msgbox Route116_Text_1F3657, 4
-	msgbox Route116_Text_1F3688, 4
-	specialvar VAR_RESULT, sub_8139634
-	compare VAR_RESULT, 1
-	goto_eq Route116_EventScript_1F2E1B
-	msgbox Route116_Text_1F375E, 4
-	release
-	end
-
-Route116_EventScript_1F2E1B:: @ 81F2E1B
-	msgbox Route116_Text_1F36B4, 4
-	closemessage
-	goto Route116_EventScript_1F2E2A
-	end
-
-Route116_EventScript_1F2E2A:: @ 81F2E2A
-	delay 20
-	compare VAR_FACING, 2
-	call_if 1, Route116_EventScript_1F2E5E
-	compare VAR_FACING, 1
-	call_if 1, Route116_EventScript_1F2E5E
-	compare VAR_FACING, 3
-	call_if 1, Route116_EventScript_1F2E5E
-	compare VAR_FACING, 4
-	call_if 1, Route116_EventScript_1F2E69
-	removeobject VAR_LAST_TALKED
-	release
-	end
-
-Route116_EventScript_1F2E5E:: @ 81F2E5E
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74
-	waitmovement 0
-	return
-
-Route116_EventScript_1F2E69:: @ 81F2E69
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E
-	waitmovement 0
-	return
-
-Route116_Movement_1F2E74: @ 81F2E74
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_Movement_1F2E7E: @ 81F2E7E
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_EventScript_1F2E89:: @ 81F2E89
-	trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A
-	msgbox Route116_Text_29BBC6, 6
-	end
-
-Route116_EventScript_1F2EA0:: @ 81F2EA0
-	trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25
-	msgbox Route116_Text_29BC42, 6
-	end
-
-Route116_EventScript_1F2EB7:: @ 81F2EB7
-	trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route116_EventScript_1F2F4E
-	setvar VAR_0x8004, 273
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_eq Route116_EventScript_1F2F22
-	msgbox Route116_Text_29BD92, 4
-	release
-	end
-
-Route116_EventScript_1F2EF8:: @ 81F2EF8
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route116_EventScript_1F2F03
-	release
-	end
-
-Route116_EventScript_1F2F03:: @ 81F2F03
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route116_Text_29BE71, 4
-	setvar VAR_0x8004, 273
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 273
-	callstd 8
-	release
-	end
-
-Route116_EventScript_1F2F22:: @ 81F2F22
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route116_EventScript_1F2F35
-	msgbox Route116_Text_29BD92, 4
-	release
-	end
-
-Route116_EventScript_1F2F35:: @ 81F2F35
-	msgbox Route116_Text_29BDEF, 4
-	setvar VAR_0x8004, 273
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 273
-	callstd 8
-	release
-	end
-
-Route116_EventScript_1F2F4E:: @ 81F2F4E
-	trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C
-	msgbox Route116_Text_29BF68, 6
-	end
-
-Route116_EventScript_1F2F65:: @ 81F2F65
-	trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F
-	msgbox Route116_Text_29BB31, 6
-	end
-
-Route116_EventScript_1F2F7C:: @ 81F2F7C
-	trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3
-	msgbox Route116_Text_29BCCC, 6
-	end
-
-Route116_EventScript_1F2F93:: @ 81F2F93
-	trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route116_EventScript_1F302A
-	setvar VAR_0x8004, 280
-	specialvar VAR_RESULT, sub_813B4E0
-	compare VAR_RESULT, 0
-	goto_eq Route116_EventScript_1F2FFE
-	msgbox Route116_Text_29C010, 4
-	release
-	end
-
-Route116_EventScript_1F2FD4:: @ 81F2FD4
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route116_EventScript_1F2FDF
-	release
-	end
-
-Route116_EventScript_1F2FDF:: @ 81F2FDF
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route116_Text_29C096, 4
-	setvar VAR_0x8004, 280
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 280
-	callstd 8
-	release
-	end
-
-Route116_EventScript_1F2FFE:: @ 81F2FFE
-	checkflag FLAG_HAS_MATCH_CALL
-	goto_eq Route116_EventScript_1F3011
-	msgbox Route116_Text_29C010, 4
-	release
-	end
-
-Route116_EventScript_1F3011:: @ 81F3011
-	msgbox Route116_Text_29C052, 4
-	setvar VAR_0x8004, 280
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 280
-	callstd 8
-	release
-	end
-
-Route116_EventScript_1F302A:: @ 81F302A
-	trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F
-	msgbox Route116_Text_29C13B, 6
-	end
-
-Route116_EventScript_1F3041:: @ 81F3041
-	trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8
-	msgbox Route116_Text_29C1EA, 6
-	end
-
-Route116_EventScript_1F3058:: @ 81F3058
-	trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2
-	msgbox Route116_Text_29C2DD, 6
-	end
-
-Route116_EventScript_1F306F:: @ 81F306F
-	trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365
-	msgbox Route116_Text_29C380, 6
-	end
-
-Route116_EventScript_1F3086:: @ 81F3086
-	trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7
-	msgbox Route116_Text_29C418, 6
-	end
-
-Route116_Text_1F309D: @ 81F309D
-	.string "Ohhh, what am I to do?\p"
-	.string "We were on our walk, PEEKO and I, when\n"
-	.string "we were jumped by an odd thug…\p"
-	.string "The scoundrel made off with my\n"
-	.string "darling PEEKO!\p"
-	.string "Wrrrooooooaaaar! PEEKO!$"
-
-Route116_Text_1F3140: @ 81F3140
-	.string "Nnn… Roar!\p"
-	.string "I want to dig that tunnel!$"
-
-Route116_Text_1F3166: @ 81F3166
-	.string "Nnn… Roar!\n"
-	.string "What’s going on?\p"
-	.string "I was digging the tunnel without any\n"
-	.string "tools when some goon ordered me out!\p"
-	.string "That tunnel’s filled with POKéMON\n"
-	.string "that react badly to loud noises.\l"
-	.string "They could cause an uproar.\p"
-	.string "That’s why we stopped using heavy\n"
-	.string "equipment for tunneling…\p"
-	.string "I’m worried that the goon will do\n"
-	.string "something stupid and startle the\l"
-	.string "POKéMON into an uproar.$"
-
-Route116_Text_1F32C1: @ 81F32C1
-	.string "Nnn… Roar!\p"
-	.string "That goofy goon hightailed it out of\n"
-	.string "the tunnel! I can go back to digging!$"
-
-Route116_Text_1F3317: @ 81F3317
-	.string "Oh! It’s you!\p"
-	.string "You’re that person who not only helped\n"
-	.string "me in PETALBURG WOODS, but also got\l"
-	.string "back my stolen package and then even\l"
-	.string "graciously delivered it to SLATEPORT!\p"
-	.string "CAPT. STERN informed us that the\n"
-	.string "package arrived, too!\p"
-	.string "I thank you very, very much!\p"
-	.string "Why, if I were a rain cloud, I would\n"
-	.string "shower you with gratitude and hail\l"
-	.string "you as a hero!\p"
-	.string "For you, the most wonderful TRAINER,\n"
-	.string "I bear good news!\p"
-	.string "Recently, our company developed\n"
-	.string "a new kind of POKé BALL.\p"
-	.string "As a token of our appreciation, this\n"
-	.string "is our gift to our wonderful TRAINER!$"
-
-Route116_Text_1F3521: @ 81F3521
-	.string "Our new POKé BALL will be available\n"
-	.string "at the POKéMON MART in RUSTBORO.\p"
-	.string "Please do try it out!\n"
-	.string "Thank you and bye-bye!$"
-
-Route116_Text_1F3593: @ 81F3593
-	.string "Your BAG is jam-packed.\n"
-	.string "I can’t give you this REPEAT BALL.$"
-
-Route116_Text_1F35CE: @ 81F35CE
-	.string "As a token of our appreciation for\n"
-	.string "your delivering our package, I have\l"
-	.string "a gift of a new kind of POKé BALL\l"
-	.string "for our most wonderful TRAINER!$"
-
-Route116_Text_1F3657: @ 81F3657
-	.string "I dropped my glasses…\n"
-	.string "Can you help me find them?$"
-
-Route116_Text_1F3688: @ 81F3688
-	.string "Those glasses!\n"
-	.string "May I see them for a second?$"
-
-Route116_Text_1F36B4: @ 81F36B4
-	.string "Hmm…\n"
-	.string "These are BLACKGLASSES.\l"
-	.string "They’re not what I’m looking for…\p"
-	.string "Maybe my glasses aren’t around\n"
-	.string "here…$"
-
-Route116_Text_1F3718: @ 81F3718
-	.string "Hmm…\n"
-	.string "I can’t find my glasses anywhere…\l"
-	.string "Maybe they’re not around here…$"
-
-Route116_Text_1F375E: @ 81F375E
-	.string "Hmm…\n"
-	.string "These are BLACKGLASSES.\l"
-	.string "They’re not what I’m looking for…$"
-
-Route116_Text_1F379D: @ 81F379D
-	.string "ROUTE 116\n"
-	.string "{0x7B} RUSTBORO CITY$"
-
-Route116_Text_1F37B7: @ 81F37B7
-	.string "RUSTURF TUNNEL\n"
-	.string "“Linking RUSTBORO and VERDANTURF\p"
-	.string "“The tunnel project has been\n"
-	.string "canceled.”$"
-
-Route116_Text_1F380F: @ 81F380F
-	.string "TUNNELER’S REST HOUSE$"
-
-Route116_Text_1F3825: @ 81F3825
-	.string "TRAINER TIPS\p"
-	.string "If you want to stop a POKéMON from\n"
-	.string "evolving, press the B Button while it\l"
-	.string "is trying to evolve.\l"
-	.string "The startled POKéMON will stop.\p"
-	.string "This is called an evolution cancel.$"
-
-Route116_Text_1F38D4: @ 81F38D4
-	.string "TRAINER TIPS\p"
-	.string "Your BAG has several POCKETS.\p"
-	.string "Items you obtain are automatically\n"
-	.string "placed in the appropriate POCKETS.\p"
-	.string "No TRAINER can afford to be without\n"
-	.string "a BAG of their own.$"
-
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
deleted file mode 100644
index 27a2539e1..000000000
--- a/data/scripts/maps/Route118.inc
+++ /dev/null
@@ -1,318 +0,0 @@
-Route118_MapScripts:: @ 81F3DBC
-	map_script 3, Route118_MapScript1_1F3DCC
-	map_script 1, Route118_MapScript1_1F3DF3
-	map_script 2, Route118_MapScript2_1F3E0A
-	.byte 0
-
-Route118_MapScript1_1F3DCC: @ 81F3DCC
-	call Route118_EventScript_28CCC7
-	compare VAR_0x4039, 1
-	call_if 1, Route118_EventScript_273D13
-	compare VAR_0x4037, 7
-	call_if 1, Route118_EventScript_273D1B
-	compare VAR_0x4037, 8
-	call_if 1, Route118_EventScript_273D1B
-	end
-
-Route118_MapScript1_1F3DF3: @ 81F3DF3
-	compare VAR_0x4037, 7
-	call_if 1, Route118_EventScript_273985
-	compare VAR_0x4037, 8
-	call_if 1, Route118_EventScript_273998
-	end
-
-Route118_MapScript2_1F3E0A: @ 81F3E0A
-	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
-	.2byte 0
-
-Route118_EventScript_1F3E14:: @ 81F3E14
-	lock
-	faceplayer
-	checkflag FLAG_0x0E3
-	goto_eq Route118_EventScript_1F3E69
-	msgbox Route118_Text_1F427B, 5
-	compare VAR_RESULT, 1
-	goto_eq Route118_EventScript_1F3E3E
-	compare VAR_RESULT, 0
-	goto_eq Route118_EventScript_1F3E5F
-	end
-
-Route118_EventScript_1F3E3E:: @ 81F3E3E
-	msgbox Route118_Text_1F42AF, 4
-	giveitem_std ITEM_GOOD_ROD
-	setflag FLAG_0x0E3
-	msgbox Route118_Text_1F42E7, 4
-	release
-	end
-
-Route118_EventScript_1F3E5F:: @ 81F3E5F
-	msgbox Route118_Text_1F4319, 4
-	release
-	end
-
-Route118_EventScript_1F3E69:: @ 81F3E69
-	msgbox Route118_Text_1F4331, 4
-	release
-	end
-
-Route118_EventScript_1F3E73:: @ 81F3E73
-	msgbox Route118_Text_1F4367, 2
-	end
-
-Route118_EventScript_1F3E7C:: @ 81F3E7C
-	msgbox Route118_Text_1F43F4, 3
-	end
-
-Route118_EventScript_1F3E85:: @ 81F3E85
-	msgbox Route118_Text_1F440E, 3
-	end
-
-Route118_EventScript_1F3E8E:: @ 81F3E8E
-	lockall
-	setvar VAR_0x8008, 0
-	applymovement 255, Route118_Movement_2725B2
-	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F61
-	waitmovement 0
-	goto Route118_EventScript_1F3EE4
-	end
-
-Route118_EventScript_1F3EAE:: @ 81F3EAE
-	lockall
-	setvar VAR_0x8008, 1
-	applymovement 255, Route118_Movement_2725B2
-	waitmovement 0
-	goto Route118_EventScript_1F3EE4
-	end
-
-Route118_EventScript_1F3EC4:: @ 81F3EC4
-	lockall
-	setvar VAR_0x8008, 2
-	applymovement 255, Route118_Movement_2725B2
-	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F63
-	waitmovement 0
-	goto Route118_EventScript_1F3EE4
-	end
-
-Route118_EventScript_1F3EE4:: @ 81F3EE4
-	playse SE_DANSA
-	applymovement 19, Route118_Movement_1F3F65
-	waitmovement 0
-	delay 30
-	msgbox Route118_Text_1F40BE, 4
-	closemessage
-	compare VAR_0x8008, 0
-	call_if 1, Route118_EventScript_1F3F28
-	compare VAR_0x8008, 1
-	call_if 1, Route118_EventScript_1F3F3A
-	compare VAR_0x8008, 2
-	call_if 1, Route118_EventScript_1F3F4C
-	setvar VAR_0x4071, 1
-	removeobject 19
-	releaseall
-	end
-
-Route118_EventScript_1F3F28:: @ 81F3F28
-	applymovement 255, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F69
-	waitmovement 0
-	return
-
-Route118_EventScript_1F3F3A:: @ 81F3F3A
-	applymovement 255, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F74
-	waitmovement 0
-	return
-
-Route118_EventScript_1F3F4C:: @ 81F3F4C
-	applymovement 255, Route118_Movement_1F3F5E
-	applymovement 19, Route118_Movement_1F3F7E
-	waitmovement 0
-	return
-
-Route118_Movement_1F3F5E: @ 81F3F5E
-	step_14
-	step_28
-	step_end
-
-Route118_Movement_1F3F61: @ 81F3F61
-	step_left
-	step_end
-
-Route118_Movement_1F3F63: @ 81F3F63
-	step_right
-	step_end
-
-Route118_Movement_1F3F65: @ 81F3F65
-	fast_step_down
-	step_14
-	step_down
-	step_end
-
-Route118_Movement_1F3F69: @ 81F3F69
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route118_Movement_1F3F74: @ 81F3F74
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route118_Movement_1F3F7E: @ 81F3F7E
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route118_EventScript_1F3F87:: @ 81F3F87
-	trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route118_EventScript_1F3FD2
-	msgbox Route118_Text_29D2FA, 4
-	release
-	end
-
-Route118_EventScript_1F3FB3:: @ 81F3FB3
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route118_Text_29D343, 4
-	setvar VAR_0x8004, 37
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 37
-	callstd 8
-	release
-	end
-
-Route118_EventScript_1F3FD2:: @ 81F3FD2
-	trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA
-	msgbox Route118_Text_29D3D9, 6
-	end
-
-Route118_EventScript_1F3FE9:: @ 81F3FE9
-	trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C
-	msgbox Route118_Text_29D587, 6
-	end
-
-Route118_EventScript_1F4000:: @ 81F4000
-	trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C
-	msgbox Route118_Text_29D663, 6
-	end
-
-Route118_EventScript_1F4017:: @ 81F4017
-	trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route118_EventScript_1F4062
-	msgbox Route118_Text_29D6D8, 4
-	release
-	end
-
-Route118_EventScript_1F4043:: @ 81F4043
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route118_Text_29D74A, 4
-	setvar VAR_0x8004, 196
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 196
-	callstd 8
-	release
-	end
-
-Route118_EventScript_1F4062:: @ 81F4062
-	trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA
-	msgbox Route118_Text_29D7D5, 6
-	end
-
-Route118_EventScript_1F4079:: @ 81F4079
-	trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B
-	msgbox Route118_Text_29D46C, 6
-	end
-
-Route118_EventScript_1F4090:: @ 81F4090
-	trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4
-	msgbox Route118_Text_29D4DA, 6
-	end
-
-Route118_EventScript_1F40A7:: @ 81F40A7
-	trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C
-	msgbox Route118_Text_29D872, 6
-	end
-
-Route118_Text_1F40BE: @ 81F40BE
-	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
-	.string "It’s me, STEVEN!\n"
-	.string "We met in the cave near DEWFORD.\p"
-	.string "Have you met many kinds of POKéMON\n"
-	.string "since I last saw you?\p"
-	.string "There are many, many kinds of POKéMON\n"
-	.string "in this wide world of ours.\p"
-	.string "If you wanted to raise only your\n"
-	.string "favorites, that’s fine.\p"
-	.string "Perhaps you find it more fun to raise\n"
-	.string "all sorts of POKéMON.\p"
-	.string "As a TRAINER of POKéMON,\n"
-	.string "what do you think?\p"
-	.string "Of course, it’s not any of my business.\p"
-	.string "It would be nice if we were to meet\n"
-	.string "again somewhere.$"
-
-Route118_Text_1F427B: @ 81F427B
-	.string "Hmm!\n"
-	.string "A GOOD ROD is really good!\p"
-	.string "Wouldn’t you agree?$"
-
-Route118_Text_1F42AF: @ 81F42AF
-	.string "Hmm!\n"
-	.string "We’re of identical minds!\p"
-	.string "Hmm!\n"
-	.string "Take this GOOD ROD!$"
-
-Route118_Text_1F42E7: @ 81F42E7
-	.string "Wherever there’s water, try your luck\n"
-	.string "at fishing.$"
-
-Route118_Text_1F4319: @ 81F4319
-	.string "Don’t you like to fish?$"
-
-Route118_Text_1F4331: @ 81F4331
-	.string "Try catching all sorts of POKéMON\n"
-	.string "with your GOOD ROD.$"
-
-Route118_Text_1F4367: @ 81F4367
-	.string "Even if there isn’t a boat, you can\n"
-	.string "cross rivers and the sea if you have\l"
-	.string "a POKéMON that knows SURF.\p"
-	.string "POKéMON can be counted on to do so\n"
-	.string "much!$"
-
-Route118_Text_1F43F4: @ 81F43F4
-	.string "ROUTE 118\n"
-	.string "{0x7B} MAUVILLE CITY$"
-
-Route118_Text_1F440E: @ 81F440E
-	.string "ROUTE 118\n"
-	.string "{0x79} ROUTE 119$"
-
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
deleted file mode 100644
index 41e0fbbfe..000000000
--- a/data/scripts/maps/Route119.inc
+++ /dev/null
@@ -1,637 +0,0 @@
-Route119_MapScripts:: @ 81F4424
-	map_script 5, Route119_MapScript1_1F442F
-	map_script 3, Route119_MapScript1_1F444D
-	.byte 0
-
-Route119_MapScript1_1F442F: @ 81F442F
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, Route119_EventScript_1F4439
-	end
-
-Route119_EventScript_1F4439:: @ 81F4439
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, Route119_EventScript_27374E
-	removeobject VAR_LAST_TALKED
-	return
-
-Route119_MapScript1_1F444D: @ 81F444D
-	call Route119_EventScript_271ED7
-	call Route119_EventScript_271EFB
-	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if 1, Route119_EventScript_1F4466
-	special SetRoute119Weather
-	end
-
-Route119_EventScript_1F4466:: @ 81F4466
-	setflag FLAG_0x37D
-	clearflag FLAG_0x37C
-	setvar VAR_WEATHER_INSTITUTE_STATE, 2
-	return
-
-Route119_EventScript_1F4472:: @ 81F4472
-	setvar VAR_TEMP_1, 1
-	goto Route119_EventScript_1F4488
-	end
-
-Route119_EventScript_1F447D:: @ 81F447D
-	setvar VAR_TEMP_1, 2
-	goto Route119_EventScript_1F4488
-	end
-
-Route119_EventScript_1F4488:: @ 81F4488
-	lockall
-	addobject 25
-	checkplayergender
-	compare VAR_RESULT, 0
-	call_if 1, Route119_EventScript_1F4501
-	compare VAR_RESULT, 1
-	call_if 1, Route119_EventScript_1F4506
-	delay 65
-	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1F46C6
-	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1F46D1
-	applymovement 255, Route119_Movement_2725AA
-	waitmovement 0
-	delay 30
-	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1F4700
-	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1F470F
-	removeobject 25
-	addobject 16
-	delay 30
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq Route119_EventScript_1F450B
-	compare VAR_RESULT, 1
-	goto_eq Route119_EventScript_1F4585
-	releaseall
-	end
-
-Route119_EventScript_1F4501:: @ 81F4501
-	playbgm MUS_GIRL_SUP, 1
-	return
-
-Route119_EventScript_1F4506:: @ 81F4506
-	playbgm MUS_BOY_SUP, 1
-	return
-
-Route119_EventScript_1F450B:: @ 81F450B
-	msgbox Route119_Text_1F49FD, 4
-	switch VAR_FIRST_POKE
-	case 0, Route119_EventScript_1F453A
-	case 1, Route119_EventScript_1F454A
-	case 2, Route119_EventScript_1F455A
-	end
-
-Route119_EventScript_1F453A:: @ 81F453A
-	trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
-	end
-
-Route119_EventScript_1F454A:: @ 81F454A
-	trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
-	end
-
-Route119_EventScript_1F455A:: @ 81F455A
-	trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98
-	goto Route119_EventScript_1F456A
-	end
-
-Route119_EventScript_1F456A:: @ 81F456A
-	msgbox Route119_Text_1F4AF3, 4
-	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4B56, 4
-	goto Route119_EventScript_1F460F
-	end
-
-Route119_EventScript_1F4585:: @ 81F4585
-	msgbox Route119_Text_1F4C9A, 4
-	switch VAR_FIRST_POKE
-	case 0, Route119_EventScript_1F45B4
-	case 1, Route119_EventScript_1F45C4
-	case 2, Route119_EventScript_1F45D4
-	end
-
-Route119_EventScript_1F45B4:: @ 81F45B4
-	trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
-	end
-
-Route119_EventScript_1F45C4:: @ 81F45C4
-	trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
-	end
-
-Route119_EventScript_1F45D4:: @ 81F45D4
-	trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24
-	goto Route119_EventScript_1F45E4
-	end
-
-Route119_EventScript_1F45E4:: @ 81F45E4
-	msgbox Route119_Text_1F4D4B, 4
-	call Route119_EventScript_1F45FF
-	msgbox Route119_Text_1F4DB5, 4
-	goto Route119_EventScript_1F460F
-	end
-
-Route119_EventScript_1F45FF:: @ 81F45FF
-	giveitem_std ITEM_HM02
-	setflag FLAG_0x06E
-	return
-
-Route119_EventScript_1F460F:: @ 81F460F
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1F4700
-	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1F470F
-	removeobject 16
-	addobject 25
-	delay 30
-	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1F46DC
-	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1F46EE
-	removeobject 25
-	setvar VAR_0x4072, 1
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	delay 60
-	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1F46A0
-	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1F46A8
-	addobject 43
-	applymovement 43, Route119_Movement_1F4752
-	waitmovement 0
-	addvar VAR_0x40D1, 1
-	msgbox Route119_Text_1F4E60, 4
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if 1, Route119_EventScript_1F46B0
-	compare VAR_TEMP_1, 2
-	call_if 1, Route119_EventScript_1F46BB
-	removeobject 43
-	releaseall
-	end
-
-Route119_EventScript_1F46A0:: @ 81F46A0
-	setobjectxyperm 43, 27, 25
-	return
-
-Route119_EventScript_1F46A8:: @ 81F46A8
-	setobjectxyperm 43, 28, 25
-	return
-
-Route119_EventScript_1F46B0:: @ 81F46B0
-	applymovement 43, Route119_Movement_1F475A
-	waitmovement 0
-	return
-
-Route119_EventScript_1F46BB:: @ 81F46BB
-	applymovement 43, Route119_Movement_1F4763
-	waitmovement 0
-	return
-
-Route119_EventScript_1F46C6:: @ 81F46C6
-	applymovement 25, Route119_Movement_1F4728
-	waitmovement 0
-	return
-
-Route119_EventScript_1F46D1:: @ 81F46D1
-	applymovement 25, Route119_Movement_1F4732
-	waitmovement 0
-	return
-
-Route119_EventScript_1F46DC:: @ 81F46DC
-	applymovement 255, Route119_Movement_1F471E
-	applymovement 25, Route119_Movement_1F473D
-	waitmovement 0
-	return
-
-Route119_EventScript_1F46EE:: @ 81F46EE
-	applymovement 255, Route119_Movement_1F4723
-	applymovement 25, Route119_Movement_1F4747
-	waitmovement 0
-	return
-
-Route119_EventScript_1F4700:: @ 81F4700
-	setobjectxyperm 16, 25, 32
-	setobjectxyperm 25, 25, 32
-	return
-
-Route119_EventScript_1F470F:: @ 81F470F
-	setobjectxyperm 16, 26, 32
-	setobjectxyperm 25, 26, 32
-	return
-
-Route119_Movement_1F471E: @ 81F471E
-	step_14
-	step_28
-	step_13
-	step_26
-	step_end
-
-Route119_Movement_1F4723: @ 81F4723
-	step_14
-	step_27
-	step_13
-	step_26
-	step_end
-
-Route119_Movement_1F4728: @ 81F4728
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
-
-Route119_Movement_1F4732: @ 81F4732
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
-
-Route119_Movement_1F473D: @ 81F473D
-	step_18
-	step_16
-	step_16
-	step_16
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route119_Movement_1F4747: @ 81F4747
-	step_17
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route119_Movement_1F4752: @ 81F4752
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_end
-
-Route119_Movement_1F475A: @ 81F475A
-	step_up
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route119_Movement_1F4763: @ 81F4763
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route119_EventScript_1F476B:: @ 81F476B
-	msgbox Route119_Text_1F5261, 2
-	end
-
-Route119_EventScript_1F4774:: @ 81F4774
-	msgbox Route119_Text_1F530E, 3
-	end
-
-Route119_EventScript_1F477D:: @ 81F477D
-	msgbox Route119_Text_1F5327, 3
-	end
-
-Route119_EventScript_1F4786:: @ 81F4786
-	trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0
-	msgbox Route119_Text_29D902, 6
-	end
-
-Route119_EventScript_1F479D:: @ 81F479D
-	trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C
-	msgbox Route119_Text_29D993, 6
-	end
-
-Route119_EventScript_1F47B4:: @ 81F47B4
-	trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14
-	msgbox Route119_Text_29DA2C, 6
-	end
-
-Route119_EventScript_1F47CB:: @ 81F47CB
-	trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC
-	msgbox Route119_Text_29DADB, 6
-	end
-
-Route119_EventScript_1F47E2:: @ 81F47E2
-	trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66
-	msgbox Route119_Text_29DB7C, 6
-	end
-
-Route119_EventScript_1F47F9:: @ 81F47F9
-	trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20
-	msgbox Route119_Text_29DC2B, 6
-	end
-
-Route119_EventScript_1F4810:: @ 81F4810
-	trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route119_EventScript_1F485B
-	msgbox Route119_Text_29DCC6, 4
-	release
-	end
-
-Route119_EventScript_1F483C:: @ 81F483C
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route119_Text_29DD1C, 4
-	setvar VAR_0x8004, 552
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 552
-	callstd 8
-	release
-	end
-
-Route119_EventScript_1F485B:: @ 81F485B
-	trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5
-	msgbox Route119_Text_29DDBD, 6
-	end
-
-Route119_EventScript_1F4872:: @ 81F4872
-	trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route119_EventScript_1F48BD
-	msgbox Route119_Text_29DE88, 4
-	release
-	end
-
-Route119_EventScript_1F489E:: @ 81F489E
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route119_Text_29DEF7, 4
-	setvar VAR_0x8004, 559
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 559
-	callstd 8
-	release
-	end
-
-Route119_EventScript_1F48BD:: @ 81F48BD
-	trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92
-	msgbox Route119_Text_29DFAF, 6
-	end
-
-Route119_EventScript_1F48D4:: @ 81F48D4
-	trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063
-	msgbox Route119_Text_29E071, 6
-	end
-
-Route119_EventScript_1F48EB:: @ 81F48EB
-	trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1
-	msgbox Route119_Text_29E0F6, 6
-	end
-
-Route119_EventScript_1F4902:: @ 81F4902
-	trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D
-	msgbox Route119_Text_29E19D, 6
-	end
-
-Route119_EventScript_1F4919:: @ 81F4919
-	trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B
-	msgbox Route119_Text_29E245, 6
-	end
-
-Route119_EventScript_1F4930:: @ 81F4930
-	trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288
-	msgbox Route119_Text_29E2A3, 6
-	end
-
-Route119_EventScript_1F4947:: @ 81F4947
-	trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372
-	msgbox Route119_Text_29E3A2, 6
-	end
-
-Route119_EventScript_1F495E:: @ 81F495E
-	trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F
-	msgbox Route119_Text_29E492, 6
-	end
-
-Route119_EventScript_1F4975:: @ 81F4975
-	trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513
-	msgbox Route119_Text_29E532, 6
-	end
-
-Route119_EventScript_1F498C:: @ 81F498C
-	trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1
-	msgbox Route119_Text_29E5CB, 6
-	end
-
-Route119_EventScript_1F49A3:: @ 81F49A3
-	lock
-	faceplayer
-	msgbox Route119_Text_1F50EB, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route119_EventScript_1F49BA:: @ 81F49BA
-	lock
-	faceplayer
-	msgbox Route119_Text_1F5147, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-Route119_EventScript_1F49D1:: @ 81F49D1
-	msgbox Route119_Text_1F51A2, 2
-	end
-
-Route119_EventScript_1F49DA:: @ 81F49DA
-	msgbox Route119_Text_1F52B9, 2
-	end
-
-Route119_EventScript_1F49E3:: @ 81F49E3
-	msgbox Route119_Text_1F5339, 3
-	end
-
-Route119_EventScript_1F49EC:: @ 81F49EC
-	lockall
-	pokenavcall Route119_Text_1F4FBA
-	waitmessage
-	clearflag FLAG_0x08A
-	addvar VAR_0x40D1, 1
-	releaseall
-	end
-
-Route119_Text_1F49FD: @ 81F49FD
-	.string "MAY: {PLAYER}{KUN}!\n"
-	.string "Where were you? I was looking for you!\p"
-	.string "How much stronger have you gotten?\n"
-	.string "Let me check for you!\p"
-	.string "Ready with your POKéMON?\n"
-	.string "Of course you are! Go!$"
-
-Route119_Text_1F4A98: @ 81F4A98
-	.string "Achah!\n"
-	.string "{PLAYER}{KUN}, you’re strong!\p"
-	.string "I was worried that you might be\n"
-	.string "struggling with your training.$"
-
-Route119_Text_1F4AF3: @ 81F4AF3
-	.string "MAY: But I had absolutely nothing to\n"
-	.string "worry about! Keep it up!\p"
-	.string "And, here! I have a present for you.$"
-
-Route119_Text_1F4B56: @ 81F4B56
-	.string "MAY: Use FLY, and your POKéMON will\n"
-	.string "instantly carry you to any town you’ve\l"
-	.string "already visited.\p"
-	.string "But, to use FLY, you have to get\n"
-	.string "the GYM BADGE from FORTREE CITY.\l"
-	.string "That’s important, so don’t forget.\p"
-	.string "You should FLY home and visit\n"
-	.string "LITTLEROOT for a change.\p"
-	.string "I bet your mom’s worried about you,\n"
-	.string "{PLAYER}{KUN}.\p"
-	.string "Well, let’s meet again somewhere!$"
-
-Route119_Text_1F4C9A: @ 81F4C9A
-	.string "BRENDAN: {PLAYER}! So this is where\n"
-	.string "you’ve been looking for POKéMON?\p"
-	.string "Let me see how good you got.\n"
-	.string "I’ll test you!\p"
-	.string "Now!\n"
-	.string "It’s a battle, so battle!$"
-
-Route119_Text_1F4D24: @ 81F4D24
-	.string "Hmm…\n"
-	.string "You’ve gotten pretty darn decent.$"
-
-Route119_Text_1F4D4B: @ 81F4D4B
-	.string "BRENDAN: I’d say you’re good enough\n"
-	.string "to search for POKéMON anywhere.\p"
-	.string "Here, I’ll give you this.\n"
-	.string "Try it out.$"
-
-Route119_Text_1F4DB5: @ 81F4DB5
-	.string "BRENDAN: Use FLY, and your POKéMON\n"
-	.string "instantly carries you to any town\l"
-	.string "you’ve already visited.\p"
-	.string "But you need the FORTREE GYM BADGE \n"
-	.string "to do that.\p"
-	.string "Anyway, I have to move along.$"
-
-Route119_Text_1F4E60: @ 81F4E60
-	.string "SCOTT: Hahahah!\n"
-	.string "Way to go, {PLAYER}{KUN}!\p"
-	.string "I just passed by a TRAINER riding\n"
-	.string "a BIKE.\p"
-	.string "You just beat that TRAINER, didn’t you?\n"
-	.string "It was pretty obvious that you did.\p"
-	.string "The kid looked really upset with\n"
-	.string "a face all red from anger.\p"
-	.string "I sure seem to run into you often.\n"
-	.string "Are you off to FORTREE GYM next?\p"
-	.string "I expect that you’ll do well at the GYM.\n"
-	.string "Well, I’ll be seeing you!$"
-
-
-Route119_Text_1F4FBA: @ 81F4FBA
-	.string "… … … … … …\n"
-	.string "… … … … … Beep!\p"
-	.string "SCOTT: Hiya, {PLAYER}{KUN}, it’s me!\p"
-	.string "Just as I thought, you won at\n"
-	.string "the FORTREE GYM.\p"
-	.string "Your strength…\n"
-	.string "Perhaps you really are the TRAINER\l"
-	.string "that I’ve been searching for.\p"
-	.string "Remember, you have a fan in me.\n"
-	.string "I’ll be cheering from the sidelines.\l"
-	.string "Keep up the great work!\p"
-	.string "… … … … … …\n"
-	.string "… … … … … Click!$"
-
-Route119_Text_1F50EB: @ 81F50EB
-	.string "We’re standing lookout here.\p"
-	.string "Hey, you! Stay away from the WEATHER\n"
-	.string "INSTITUTE. It’s not safe.$"
-
-Route119_Text_1F5147: @ 81F5147
-	.string "Lookout duty is surprisingly boring.\p"
-	.string "Hey, you! Please don’t go near the\n"
-	.string "WEATHER INSTITUTE.$"
-
-Route119_Text_1F51A2: @ 81F51A2
-	.string "I thought you FLY by catching a whole\n"
-	.string "flock of BIRD POKéMON, and then\l"
-	.string "hanging on to them somehow.\p"
-	.string "But it turns out there’s an HM move\n"
-	.string "called FLY!\p"
-	.string "I wish I’d known about that a long\n"
-	.string "time ago…$"
-
-Route119_Text_1F5261: @ 81F5261
-	.string "Tch…\n"
-	.string "It’s a no-go…\p"
-	.string "The tall grass snares BIKE tires.\n"
-	.string "There’s no way you can cycle here.$"
-
-Route119_Text_1F52B9: @ 81F52B9
-	.string "Can your POKéMON use its SECRET POWER\n"
-	.string "on a big pile of grass and make a\l"
-	.string "SECRET BASE?$"
-
-Route119_Text_1F530E: @ 81F530E
-	.string "ROUTE 119\n"
-	.string "{0x7C} FORTREE CITY$"
-
-Route119_Text_1F5327: @ 81F5327
-	.string "WEATHER INSTITUTE$"
-
-Route119_Text_1F5339: @ 81F5339
-	.string "TRAINER TIPS\p"
-	.string "Up to sixteen decorations and\n"
-	.string "furniture items can be placed in\l"
-	.string "a SECRET BASE.\p"
-	.string "Pick your favorite items and create\n"
-	.string "your very own SECRET BASE exactly the\l"
-	.string "way you want.$"
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
deleted file mode 100644
index 0bd6c12f2..000000000
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ /dev/null
@@ -1,339 +0,0 @@
-Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
-	map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24
-	.byte 0
-
-Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
-	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44
-	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50
-	checkflag FLAG_SYS_GAME_CLEAR
-	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C
-	end
-
-Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44
-	setobjectxyperm 5, 1, 6
-	setobjectmovementtype 5, 10
-	return
-
-Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50
-	setobjectxyperm 5, 4, 6
-	setobjectmovementtype 5, 10
-	return
-
-Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C
-	setobjectxyperm 5, 2, 2
-	setobjectmovementtype 5, 7
-	return
-
-Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68
-	trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F
-	msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F
-	trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208
-	msgbox Route119_WeatherInstitute_2F_Text_27022B, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96
-	trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE
-	msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD
-	trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8
-	msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
-	msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4
-	closemessage
-	addobject 7
-	applymovement 7, Route119_WeatherInstitute_2F_Movement_270170
-	applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C
-	waitmovement 0
-	msgbox Route119_WeatherInstitute_2F_Text_270568, 4
-	closemessage
-	playse SE_PIN
-	applymovement 3, Route119_WeatherInstitute_2F_Movement_272598
-	waitmovement 0
-	applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A
-	waitmovement 0
-	msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4
-	closemessage
-	setvar VAR_WEATHER_INSTITUTE_STATE, 1
-	clearflag FLAG_0x37D
-	fadedefaultbgm
-	fadescreen 1
-	setflag FLAG_0x37A
-	setflag FLAG_0x3E0
-	removeobject 1
-	removeobject 2
-	removeobject 3
-	removeobject 8
-	removeobject 7
-	applymovement 255, Route119_WeatherInstitute_2F_Movement_270184
-	waitmovement 0
-	fadescreen 0
-	applymovement 5, Route119_WeatherInstitute_2F_Movement_270187
-	waitmovement 0
-	moveobjectoffscreen 5
-	goto Route119_WeatherInstitute_2F_EventScript_27004D
-	end
-
-Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
-	msgbox Route119_WeatherInstitute_2F_Text_270650, 4
-	setvar VAR_TEMP_1, 385
-	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
-	compare VAR_RESULT, 0
-	goto_eq Route119_WeatherInstitute_2F_EventScript_270085
-	compare VAR_RESULT, 1
-	goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD
-	goto Route119_WeatherInstitute_2F_EventScript_273811
-	end
-
-Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
-	call Route119_WeatherInstitute_2F_EventScript_2700DB
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA
-	call Route119_WeatherInstitute_2F_EventScript_27378B
-	call Route119_WeatherInstitute_2F_EventScript_2723DD
-	goto Route119_WeatherInstitute_2F_EventScript_2700EA
-	end
-
-Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
-	call Route119_WeatherInstitute_2F_EventScript_2700DB
-	msgbox gUnknown_08273374, 5
-	compare VAR_RESULT, 0
-	goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0
-	call Route119_WeatherInstitute_2F_EventScript_273797
-	goto Route119_WeatherInstitute_2F_EventScript_2700D0
-	end
-
-Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0
-	call Route119_WeatherInstitute_2F_EventScript_2737A0
-	goto Route119_WeatherInstitute_2F_EventScript_2700EA
-	end
-
-Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB
-	playfanfare MUS_FANFA4
-	message Route119_WeatherInstitute_2F_Text_2706E8
-	waitmessage
-	waitfanfare
-	bufferspeciesname 0, SPECIES_CASTFORM
-	return
-
-Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA
-	msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4
-	setflag FLAG_0x097
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq Route119_WeatherInstitute_2F_EventScript_27010A
-	msgbox Route119_WeatherInstitute_2F_Text_27077E, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A
-	setvar VAR_0x8004, 0
-	checkflag FLAG_0x1BE
-	call_if 1, Route119_WeatherInstitute_2F_EventScript_270160
-	checkflag FLAG_0x1BF
-	call_if 1, Route119_WeatherInstitute_2F_EventScript_270160
-	compare VAR_0x8004, 2
-	goto_eq Route119_WeatherInstitute_2F_EventScript_270166
-	checkflag FLAG_0x002
-	call_if 0, Route119_WeatherInstitute_2F_EventScript_270159
-	specialvar VAR_RESULT, sub_813B374
-	compare VAR_RESULT, 1
-	goto_eq Route119_WeatherInstitute_2F_EventScript_27014F
-	msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F
-	msgbox Route119_WeatherInstitute_2F_Text_270873, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159
-	special sub_813B2E4
-	setflag FLAG_0x002
-	return
-
-Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160
-	addvar VAR_0x8004, 1
-	return
-
-Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166
-	msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_Movement_270170: @ 8270170
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_end
-
-Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_2a
-	step_25
-	step_end
-
-Route119_WeatherInstitute_2F_Movement_270184: @ 8270184
-	step_31
-	step_27
-	step_end
-
-Route119_WeatherInstitute_2F_Movement_270187: @ 8270187
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B
-	lock
-	faceplayer
-	checkflag FLAG_0x097
-	goto_eq Route119_WeatherInstitute_2F_EventScript_2700F7
-	goto Route119_WeatherInstitute_2F_EventScript_27004D
-	end
-
-Route119_WeatherInstitute_2F_Text_27019C: @ 827019C
-	.string "The INSTITUTE created a type of\n"
-	.string "POKéMON that has something to do with\l"
-	.string "the weather. We’re here to take them!$"
-
-Route119_WeatherInstitute_2F_Text_270208: @ 8270208
-	.string "Our plan’s being spoiled by a kid?$"
-
-Route119_WeatherInstitute_2F_Text_27022B: @ 827022B
-	.string "If the POKéMON they made here can\n"
-	.string "control the weather freely, then we of\l"
-	.string "TEAM AQUA definitely need it!$"
-
-Route119_WeatherInstitute_2F_Text_270292: @ 8270292
-	.string "We’re TEAM AQUA!\n"
-	.string "We appear wherever anything rare is\l"
-	.string "found!$"
-
-Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE
-	.string "You got me!$"
-
-Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA
-	.string "You don’t have any idea what we of\n"
-	.string "TEAM AQUA are working towards!\l"
-	.string "You stay out of our way!$"
-
-Route119_WeatherInstitute_2F_Text_270335: @ 8270335
-	.string "Don’t tell me you’re looking for that\n"
-	.string "weather POKéMON, too?\p"
-	.string "That’s a no-no!\n"
-	.string "We were here to get it first!$"
-
-Route119_WeatherInstitute_2F_Text_27039F: @ 827039F
-	.string "Oh, will you look at my POKéMON?$"
-
-Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0
-	.string "Humph, so what?\n"
-	.string "What we want…\p"
-	.string "What we really want isn’t here…\n"
-	.string "Ihihihihi…$"
-
-Route119_WeatherInstitute_2F_Text_270409: @ 8270409
-	.string "Ahahahaha!\p"
-	.string "You’re going to meddle in TEAM AQUA’s\n"
-	.string "affairs?\p"
-	.string "You’re either absolutely fearless,\n"
-	.string "simply ignorant, or both!\p"
-	.string "You’re so cute, you’re disgusting!\n"
-	.string "I’ll put you down, kiddy!$"
-
-Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD
-	.string "Ahahahaha!\n"
-	.string "You’re disgustingly strong!$"
-
-Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4
-	.string "It’s bad enough to have TEAM MAGMA\n"
-	.string "blunder about, but now there’s you!\p"
-	.string "What makes you want to sniff around\n"
-	.string "in our business, anyway?$"
-
-Route119_WeatherInstitute_2F_Text_270568: @ 8270568
-	.string "We have a situation here!\p"
-	.string "A TEAM MAGMA mob just passed\n"
-	.string "the WEATHER INSTITUTE.\p"
-	.string "They appear to be headed for\n"
-	.string "MT. PYRE!$"
-
-Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD
-	.string "What?!\p"
-	.string "We can’t waste any more time here!\n"
-	.string "We have to hurry to MT. PYRE, too!\p"
-	.string "Ahahahaha!\n"
-	.string "TEAM MAGMA, just you wait!$"
-
-Route119_WeatherInstitute_2F_Text_270650: @ 8270650
-	.string "Thanks!\n"
-	.string "Thanks to you, we’re safe!\p"
-	.string "It might be an odd way of thanking you,\n"
-	.string "but take this POKéMON.$"
-
-Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2
-	.string "Hm? You don’t seem to have any room\n"
-	.string "for this POKéMON.$"
-
-Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8
-	.string "{PLAYER} received CASTFORM!$"
-
-Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE
-	.string "That POKéMON changes shape according\n"
-	.string "to the weather conditions.\p"
-	.string "There’re plenty of them in the\n"
-	.string "INSTITUTE--go ahead and take it.$"
-
-Route119_WeatherInstitute_2F_Text_27077E: @ 827077E
-	.string "I’ve been researching rain for many\n"
-	.string "years, but it’s ridiculous to think that\l"
-	.string "humans can freely change the weather.$"
-
-Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1
-	.string "I track weather patterns over\n"
-	.string "the HOENN region.\p"
-	.string "Presently, a drought has been recorded\n"
-	.string "in {STR_VAR_1}.\p"
-	.string "Could that mean, somewhere near\n"
-	.string "{STR_VAR_1}…$"
-
-Route119_WeatherInstitute_2F_Text_270873: @ 8270873
-	.string "I track weather patterns over\n"
-	.string "the HOENN region.\p"
-	.string "Presently, heavy rainfall has been\n"
-	.string "recorded over {STR_VAR_1}.\p"
-	.string "Could that mean, somewhere near\n"
-	.string "{STR_VAR_1}…$"
-
-Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC
-	.string "Abnormal weather conditions are\n"
-	.string "no longer being reported.\p"
-	.string "The occasional rainfall is a blessing,\n"
-	.string "really.$"
-
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
deleted file mode 100644
index 461823e47..000000000
--- a/data/scripts/maps/Route120.inc
+++ /dev/null
@@ -1,466 +0,0 @@
-Route120_MapScripts:: @ 81F53EC
-	map_script 5, Route120_MapScript1_1F53FC
-	map_script 3, Route120_MapScript1_1F54CD
-	map_script 1, Route120_MapScript1_1F5474
-	.byte 0
-
-Route120_MapScript1_1F53FC: @ 81F53FC
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, Route120_EventScript_1F5406
-	end
-
-Route120_EventScript_1F5406:: @ 81F5406
-	compare VAR_0x8009, 0
-	call_if 1, Route120_EventScript_1F5449
-	compare VAR_0x8009, 1
-	call_if 1, Route120_EventScript_1F5460
-	compare VAR_0x8009, 2
-	call_if 1, Route120_EventScript_1F5460
-	compare VAR_0x8009, 3
-	call_if 1, Route120_EventScript_1F5460
-	compare VAR_0x8009, 4
-	call_if 1, Route120_EventScript_1F5460
-	compare VAR_0x8009, 5
-	call_if 1, Route120_EventScript_1F5460
-	return
-
-Route120_EventScript_1F5449:: @ 81F5449
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, Route120_EventScript_27374E
-	removeobject 30
-	removeobject 36
-	return
-
-Route120_EventScript_1F5460:: @ 81F5460
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, Route120_EventScript_27374E
-	removeobject VAR_LAST_TALKED
-	return
-
-Route120_MapScript1_1F5474: @ 81F5474
-	checkflag FLAG_0x0E4
-	call_if 0, Route120_EventScript_1F5490
-	checkflag FLAG_0x11D
-	call_if 1, Route120_EventScript_1F54A3
-	checkflag FLAG_0x11D
-	call_if 0, Route120_EventScript_1F54C8
-	end
-
-Route120_EventScript_1F5490:: @ 81F5490
-	setmetatile 7, 54, 124, 1
-	setmetatile 7, 55, 145, 1
-	return
-
-Route120_EventScript_1F54A3:: @ 81F54A3
-	setmetatile 13, 15, 663, 0
-	setmetatile 12, 16, 671, 0
-	setmetatile 12, 17, 161, 0
-	setmetatile 13, 17, 161, 0
-	return
-
-Route120_EventScript_1F54C8:: @ 81F54C8
-	setobjectmovementtype 36, 10
-	return
-
-Route120_MapScript1_1F54CD: @ 81F54CD
-	call Route120_EventScript_28CCC7
-	call Route120_EventScript_1F54D8
-	end
-
-Route120_EventScript_1F54D8:: @ 81F54D8
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_1, 14
-	goto_if 3, Route120_EventScript_1F5503
-	compare VAR_TEMP_1, 60
-	goto_if 3, Route120_EventScript_1F5507
-	compare VAR_TEMP_1, 61
-	goto_if 4, Route120_EventScript_1F54FF
-	return
-
-Route120_EventScript_1F54FF:: @ 81F54FF
-	setweather 1
-	return
-
-Route120_EventScript_1F5503:: @ 81F5503
-	setweather 2
-	return
-
-Route120_EventScript_1F5507:: @ 81F5507
-	compare VAR_TEMP_0, 7
-	goto_if 3, Route120_EventScript_1F5523
-	compare VAR_TEMP_0, 19
-	goto_if 3, Route120_EventScript_1F5503
-	goto Route120_EventScript_1F5523
-	end
-
-Route120_EventScript_1F5523:: @ 81F5523
-	setweather 3
-	return
-
-Route120_EventScript_1F5527:: @ 81F5527
-	lock
-	faceplayer
-	dodailyevents
-	checkflag FLAG_0x92E
-	goto_eq Route120_EventScript_1F5625
-	msgbox Route120_Text_2A70C7, 5
-	compare VAR_RESULT, 1
-	call_if 1, Route120_EventScript_1F562F
-	compare VAR_RESULT, 0
-	call_if 1, Route120_EventScript_1F5638
-	specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit
-	switch VAR_RESULT
-	case 0, Route120_EventScript_1F55CA
-	case 5, Route120_EventScript_1F55CA
-	case 1, Route120_EventScript_1F55D5
-	case 6, Route120_EventScript_1F55D5
-	case 2, Route120_EventScript_1F55E0
-	case 7, Route120_EventScript_1F55E0
-	case 3, Route120_EventScript_1F55EB
-	case 8, Route120_EventScript_1F55EB
-	case 4, Route120_EventScript_1F55F6
-	case 9, Route120_EventScript_1F55F6
-	end
-
-Route120_EventScript_1F55CA:: @ 81F55CA
-	setvar VAR_0x8004, 143
-	goto Route120_EventScript_1F5601
-	end
-
-Route120_EventScript_1F55D5:: @ 81F55D5
-	setvar VAR_0x8004, 144
-	goto Route120_EventScript_1F5601
-	end
-
-Route120_EventScript_1F55E0:: @ 81F55E0
-	setvar VAR_0x8004, 145
-	goto Route120_EventScript_1F5601
-	end
-
-Route120_EventScript_1F55EB:: @ 81F55EB
-	setvar VAR_0x8004, 146
-	goto Route120_EventScript_1F5601
-	end
-
-Route120_EventScript_1F55F6:: @ 81F55F6
-	setvar VAR_0x8004, 147
-	goto Route120_EventScript_1F5601
-	end
-
-Route120_EventScript_1F5601:: @ 81F5601
-	giveitem_std VAR_0x8004
-	compare VAR_RESULT, 0
-	goto_eq Route120_EventScript_272054
-	setflag FLAG_0x92E
-	msgbox Route120_Text_2A71D5, 4
-	release
-	end
-
-Route120_EventScript_1F5625:: @ 81F5625
-	msgbox Route120_Text_2A7217, 4
-	release
-	end
-
-Route120_EventScript_1F562F:: @ 81F562F
-	msgbox Route120_Text_2A7147, 4
-	return
-
-Route120_EventScript_1F5638:: @ 81F5638
-	msgbox Route120_Text_2A7183, 4
-	return
-
-Route120_EventScript_1F5641:: @ 81F5641
-	lock
-	faceplayer
-	checkflag FLAG_0x122
-	goto_eq Route120_EventScript_1F5672
-	msgbox Route120_Text_1F5998, 5
-	compare VAR_RESULT, 0
-	goto_eq Route120_EventScript_1F5665
-	goto Route120_EventScript_1F568B
-	end
-
-Route120_EventScript_1F5665:: @ 81F5665
-	msgbox Route120_Text_1F5AAC, 4
-	setflag FLAG_0x122
-	release
-	end
-
-Route120_EventScript_1F5672:: @ 81F5672
-	msgbox Route120_Text_1F5ADE, 5
-	compare VAR_RESULT, 0
-	goto_eq Route120_EventScript_1F5665
-	goto Route120_EventScript_1F568B
-	end
-
-Route120_EventScript_1F568B:: @ 81F568B
-	msgbox Route120_Text_1F5B0F, 4
-	closemessage
-	compare VAR_FACING, 2
-	call_if 1, Route120_EventScript_1F57A3
-	compare VAR_FACING, 3
-	call_if 1, Route120_EventScript_1F57AE
-	applymovement 31, Route120_Movement_2725A4
-	waitmovement 0
-	delay 20
-	msgbox Route120_Text_1F5B43, 4
-	closemessage
-	applymovement 30, Route120_Movement_2725A8
-	waitmovement 0
-	applymovement 30, Route120_Movement_2723C7
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KECLEON, 2
-	delay 40
-	waitmoncry
-	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
-	setvar VAR_0x8009, 0
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	dowildbattle
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq Route120_EventScript_1F571C
-	compare VAR_RESULT, 4
-	goto_eq Route120_EventScript_1F571C
-	compare VAR_RESULT, 5
-	goto_eq Route120_EventScript_1F571C
-	goto Route120_EventScript_1F572C
-	end
-
-Route120_EventScript_1F571C:: @ 81F571C
-	fadescreenswapbuffers 1
-	removeobject 30
-	removeobject 36
-	fadescreenswapbuffers 0
-	goto Route120_EventScript_1F572C
-	end
-
-Route120_EventScript_1F572C:: @ 81F572C
-	applymovement 31, Route120_Movement_2725AA
-	applymovement 255, Route120_Movement_2725A6
-	waitmovement 0
-	msgbox Route120_Text_1F5BAF, 4
-	giveitem_std ITEM_DEVON_SCOPE
-	setflag FLAG_0x11D
-	msgbox Route120_Text_1F5C7B, 4
-	closemessage
-	applymovement 31, Route120_Movement_2725AA
-	waitmovement 0
-	delay 50
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	delay 15
-	removeobject 31
-	waitfieldeffect 30
-	setmetatile 13, 15, 663, 0
-	setmetatile 12, 16, 671, 0
-	setmetatile 12, 17, 161, 0
-	setmetatile 13, 17, 161, 0
-	special DrawWholeMapView
-	release
-	end
-
-Route120_EventScript_1F57A3:: @ 81F57A3
-	applymovement 255, Route120_Movement_2725A4
-	waitmovement 0
-	return
-
-Route120_EventScript_1F57AE:: @ 81F57AE
-	applymovement 255, Route120_Movement_1F57B9
-	waitmovement 0
-	return
-
-Route120_Movement_1F57B9: @ 81F57B9
-	step_down
-	step_left
-	step_end
-
-Route120_EventScript_1F57BC:: @ 81F57BC
-	msgbox Route120_Text_1F5D00, 2
-	end
-
-Route120_EventScript_1F57C5:: @ 81F57C5
-	msgbox Route120_Text_1F5DCB, 3
-	end
-
-Route120_EventScript_1F57CE:: @ 81F57CE
-	msgbox Route120_Text_1F5DE4, 3
-	end
-
-Route120_EventScript_1F57D7:: @ 81F57D7
-	trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665
-	msgbox Route120_Text_29E67A, 6
-	end
-
-Route120_EventScript_1F57EE:: @ 81F57EE
-	trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route120_EventScript_1F5839
-	msgbox Route120_Text_29E726, 4
-	release
-	end
-
-Route120_EventScript_1F581A:: @ 81F581A
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route120_Text_29E75D, 4
-	setvar VAR_0x8004, 406
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 406
-	callstd 8
-	release
-	end
-
-Route120_EventScript_1F5839:: @ 81F5839
-	trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1
-	msgbox Route120_Text_29E804, 6
-	end
-
-Route120_EventScript_1F5850:: @ 81F5850
-	trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884
-	msgbox Route120_Text_29E8C5, 6
-	end
-
-Route120_EventScript_1F5867:: @ 81F5867
-	trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980
-	msgbox Route120_Text_29E996, 6
-	end
-
-Route120_EventScript_1F587E:: @ 81F587E
-	trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route120_EventScript_1F58C9
-	msgbox Route120_Text_29EA08, 4
-	release
-	end
-
-Route120_EventScript_1F58AA:: @ 81F58AA
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route120_Text_29EA31, 4
-	setvar VAR_0x8004, 226
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 226
-	callstd 8
-	release
-	end
-
-Route120_EventScript_1F58C9:: @ 81F58C9
-	trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F
-	msgbox Route120_Text_29EAA9, 6
-	end
-
-Route120_EventScript_1F58E0:: @ 81F58E0
-	trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53
-	msgbox Route120_Text_29EB6E, 6
-	end
-
-Route120_EventScript_1F58F7:: @ 81F58F7
-	trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25
-	msgbox Route120_Text_29EC41, 6
-	end
-
-Route120_EventScript_1F590E:: @ 81F590E
-	trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF
-	msgbox Route120_Text_29ED19, 6
-	end
-
-Route120_EventScript_1F5925:: @ 81F5925
-	trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3
-	msgbox Route120_Text_29EDF7, 6
-	end
-
-Route120_EventScript_1F593C:: @ 81F593C
-	trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97
-	msgbox Route120_Text_29EED4, 6
-	end
-
-Route120_EventScript_1F5953:: @ 81F5953
-	trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63
-	msgbox Route120_Text_29EF89, 6
-	end
-
-Route120_EventScript_1F596A:: @ 81F596A
-	trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080
-	msgbox Route120_Text_29F0A1, 6
-	end
-
-Route120_EventScript_1F5981:: @ 81F5981
-	trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1
-	msgbox Route120_Text_29F002, 6
-	end
-
-Route120_Text_1F5998: @ 81F5998
-	.string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n"
-	.string "It’s been a while.\p"
-	.string "There’s something here that you can’t\n"
-	.string "see, right?\p"
-	.string "Now, if I were to use this device on\n"
-	.string "the invisible obstacle…\p"
-	.string "No, no. Rather than describing it,\n"
-	.string "I should just show you.\l"
-	.string "That would be more fun.\p"
-	.string "{PLAYER}{KUN}, are your POKéMON ready for\n"
-	.string "battle?$"
-
-Route120_Text_1F5AAC: @ 81F5AAC
-	.string "STEVEN: No?\p"
-	.string "I’ll wait here, so you can get ready.$"
-
-Route120_Text_1F5ADE: @ 81F5ADE
-	.string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n"
-	.string "ready for battle?$"
-
-Route120_Text_1F5B0F: @ 81F5B0F
-	.string "STEVEN: {PLAYER}{KUN}, show me your true\n"
-	.string "power as a TRAINER!$"
-
-Route120_Text_1F5B43: @ 81F5B43
-	.string "STEVEN used the DEVON SCOPE.\p"
-	.string "An invisible POKéMON became completely\n"
-	.string "visible!\p"
-	.string "The startled POKéMON attacked!$"
-
-Route120_Text_1F5BAF: @ 81F5BAF
-	.string "STEVEN: I see…\n"
-	.string "Your battle style is intriguing.\p"
-	.string "Your POKéMON have obviously grown\n"
-	.string "since I first met you in DEWFORD.\p"
-	.string "I’d like you to have this\n"
-	.string "DEVON SCOPE.\p"
-	.string "Who knows, there may be other\n"
-	.string "concealed POKéMON.$"
-
-Route120_Text_1F5C7B: @ 81F5C7B
-	.string "STEVEN: {PLAYER}{KUN}.\p"
-	.string "I enjoy seeing POKéMON and TRAINERS\n"
-	.string "who strive together.\p"
-	.string "I think you’re doing great.\p"
-	.string "Well, let’s meet again somewhere.$"
-
-Route119_Text_1F5D00: @ 81F5D00
-Route120_Text_1F5D00: @ 81F5D00
-	.string "Something unseeable is in the way.$"
-
-Route119_Text_1F5D23: @ 81F5D23
-	.string "Something unseeable is in the way.\p"
-	.string "Want to use the DEVON SCOPE?$"
-
-Route119_Text_1F5D63: @ 81F5D63
-	.string "{PLAYER} used the DEVON SCOPE.\p"
-	.string "An invisible POKéMON became completely\n"
-	.string "visible!\p"
-	.string "The startled POKéMON attacked!$"
-
-Route120_Text_1F5DCB: @ 81F5DCB
-	.string "ROUTE 120\n"
-	.string "{0x7B} FORTREE CITY$"
-
-Route120_Text_1F5DE4: @ 81F5DE4
-	.string "{0x7C} ROUTE 121\n"
-	.string "{0x7B} ROUTE 120$"
diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc
deleted file mode 100644
index d579401b8..000000000
--- a/data/scripts/maps/Route121.inc
+++ /dev/null
@@ -1,200 +0,0 @@
-Route121_MapScripts:: @ 81F5DFC
-	.byte 0
-
-Route121_EventScript_1F5DFD:: @ 81F5DFD
-	msgbox Route121_Text_1F607F, 2
-	end
-
-Route121_EventScript_1F5E06:: @ 81F5E06
-	msgbox Route121_Text_1F60D3, 3
-	end
-
-Route121_EventScript_1F5E0F:: @ 81F5E0F
-	msgbox Route121_Text_1F611E, 3
-	end
-
-Route121_EventScript_1F5E18:: @ 81F5E18
-	lockall
-	playbgm MUS_AQA_0, 0
-	applymovement 13, Route121_Movement_2725B8
-	waitmovement 0
-	msgbox Route121_Text_1F605A, 4
-	closemessage
-	applymovement 12, Route121_Movement_1F5E59
-	applymovement 13, Route121_Movement_1F5E62
-	applymovement 14, Route121_Movement_1F5E6B
-	waitmovement 0
-	fadedefaultbgm
-	removeobject 12
-	removeobject 13
-	removeobject 14
-	setvar VAR_0x4074, 1
-	releaseall
-	end
-
-Route121_Movement_1F5E59: @ 81F5E59
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route121_Movement_1F5E62: @ 81F5E62
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route121_Movement_1F5E6B: @ 81F5E6B
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route121_EventScript_1F5E74:: @ 81F5E74
-	trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F
-	msgbox Route121_Text_29F138, 6
-	end
-
-Route121_EventScript_1F5E8B:: @ 81F5E8B
-	trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route121_EventScript_1F5ED6
-	msgbox Route121_Text_29F21E, 4
-	release
-	end
-
-Route121_EventScript_1F5EB7:: @ 81F5EB7
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route121_Text_29F25B, 4
-	setvar VAR_0x8004, 254
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 254
-	callstd 8
-	release
-	end
-
-Route121_EventScript_1F5ED6:: @ 81F5ED6
-	trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A
-	msgbox Route121_Text_29F32B, 6
-	end
-
-Route121_EventScript_1F5EED:: @ 81F5EED
-	trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9
-	msgbox Route121_Text_29F3C6, 6
-	end
-
-Route121_EventScript_1F5F04:: @ 81F5F04
-	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9
-	msgbox Route121_Text_29F476, 6
-	end
-
-Route121_EventScript_1F5F1F:: @ 81F5F1F
-	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE
-	msgbox Route121_Text_29F582, 6
-	end
-
-Route121_EventScript_1F5F3A:: @ 81F5F3A
-	trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route121_EventScript_1F5F85
-	msgbox Route121_Text_29F66F, 4
-	release
-	end
-
-Route121_EventScript_1F5F66:: @ 81F5F66
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route121_Text_29F69F, 4
-	setvar VAR_0x8004, 127
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 127
-	callstd 8
-	release
-	end
-
-Route121_EventScript_1F5F85:: @ 81F5F85
-	trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710
-	msgbox Route121_Text_29F740, 6
-	end
-
-Route121_EventScript_1F5F9C:: @ 81F5F9C
-	trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B
-	msgbox Route121_Text_29F9AE, 6
-	end
-
-Route121_EventScript_1F5FB3:: @ 81F5FB3
-	trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64
-	msgbox Route121_Text_29FA73, 6
-	end
-
-Route121_EventScript_1F5FCA:: @ 81F5FCA
-	trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8
-	msgbox Route121_Text_29FAEA, 6
-	end
-
-Route121_EventScript_1F5FE1:: @ 81F5FE1
-	trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C
-	msgbox Route121_Text_29FBA8, 6
-	end
-
-Route121_EventScript_1F5FF8:: @ 81F5FF8
-	trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route121_EventScript_1F6043
-	msgbox Route121_Text_29F7D4, 4
-	release
-	end
-
-Route121_EventScript_1F6024:: @ 81F6024
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route121_Text_29F80D, 4
-	setvar VAR_0x8004, 767
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 767
-	callstd 8
-	release
-	end
-
-Route121_EventScript_1F6043:: @ 81F6043
-	trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8
-	msgbox Route121_Text_29F8D0, 6
-	end
-
-Route121_Text_1F605A: @ 81F605A
-	.string "Okay!\n"
-	.string "We’re to move out to MT. PYRE!$"
-
-Route121_Text_1F607F: @ 81F607F
-	.string "Ahead looms MT. PYRE…\p"
-	.string "It is a natural monument to the spirits \n"
-	.string "of departed POKéMON…$"
-
-Route121_Text_1F60D3: @ 81F60D3
-	.string "MT. PYRE PIER\p"
-	.string "…The sign is old and worn out.\n"
-	.string "The words are barely legible…$"
-
-Route121_Text_1F611E: @ 81F611E
-	.string "“Filled with rare POKéMON!”\n"
-	.string "SAFARI ZONE$"
-
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
deleted file mode 100644
index 1369b5721..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
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_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
-	step_right
-	step_end
-
-Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_14
-	step_end
-
-Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21
-	msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3
-	end
-
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
deleted file mode 100644
index f62f78404..000000000
--- a/data/scripts/maps/Route128.inc
+++ /dev/null
@@ -1,311 +0,0 @@
-Route128_MapScripts:: @ 81F6B38
-	map_script 3, Route128_MapScript1_1F6B43
-	map_script 2, Route128_MapScript2_1F6B4D
-	.byte 0
-
-Route128_MapScript1_1F6B43: @ 81F6B43
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, Route128_EventScript_27207A
-	end
-
-Route128_MapScript2_1F6B4D: @ 81F6B4D
-	map_script_2 VAR_0x407B, 1, Route128_EventScript_1F6B57
-	.2byte 0
-
-Route128_EventScript_1F6B57:: @ 81F6B57
-	lockall
-	delay 20
-	applymovement 4, Route128_Movement_1F6C89
-	waitmovement 0
-	msgbox Route128_Text_1F6DF5, 4
-	closemessage
-	applymovement 4, Route128_Movement_1F6C91
-	waitmovement 0
-	msgbox Route128_Text_1F6E48, 4
-	closemessage
-	applymovement 5, Route128_Movement_1F6CAD
-	waitmovement 0
-	applymovement 4, Route128_Movement_2725A6
-	waitmovement 0
-	msgbox Route128_Text_1F6E5A, 4
-	closemessage
-	applymovement 5, Route128_Movement_1F6CBB
-	waitmovement 0
-	applymovement 255, Route128_Movement_2725A6
-	waitmovement 0
-	msgbox Route128_Text_1F6F1E, 4
-	closemessage
-	applymovement 4, Route128_Movement_1F6C96
-	applymovement 255, Route128_Movement_2725A4
-	applymovement 5, Route128_Movement_1F6CA8
-	waitmovement 0
-	msgbox Route128_Text_1F704F, 4
-	closemessage
-	delay 40
-	applymovement 5, Route128_Movement_1F6CB0
-	applymovement 4, Route128_Movement_1F6C9B
-	waitmovement 0
-	removeobject 5
-	removeobject 4
-	delay 100
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	waitfieldeffect 30
-	addobject 3
-	applymovement 3, Route128_Movement_1F6C87
-	waitmovement 0
-	applymovement 255, Route128_Movement_2725A8
-	waitmovement 0
-	msgbox Route128_Text_1F70C9, 4
-	closemessage
-	applymovement 3, Route128_Movement_1F6C85
-	applymovement 255, Route128_Movement_2725A6
-	waitmovement 0
-	msgbox Route128_Text_1F70EA, 4
-	applymovement 3, Route128_Movement_2725AA
-	waitmovement 0
-	msgbox Route128_Text_1F721B, 4
-	closemessage
-	applymovement 3, Route128_Movement_2725AA
-	waitmovement 0
-	delay 50
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	delay 15
-	removeobject 3
-	waitfieldeffect 30
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x407B, 2
-	releaseall
-	end
-
-Route128_Movement_1F6C76: @ 81F6C76
-	step_17
-	step_end
-
-Route128_Movement_1F6C78: @ 81F6C78
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route128_Movement_1F6C85: @ 81F6C85
-	step_up
-	step_end
-
-Route128_Movement_1F6C87: @ 81F6C87
-	step_17
-	step_end
-
-Route128_Movement_1F6C89: @ 81F6C89
-	step_15
-	step_27
-	step_14
-	step_28
-	step_14
-	step_14
-	step_25
-	step_end
-
-Route128_Movement_1F6C91: @ 81F6C91
-	step_40
-	slow_step_up
-	step_14
-	step_41
-	step_end
-
-Route128_Movement_1F6C96: @ 81F6C96
-	step_17
-	step_17
-	step_17
-	step_28
-	step_end
-
-Route128_Movement_1F6C9B: @ 81F6C9B
-	step_14
-	step_14
-	step_16
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route128_Movement_1F6CA8: @ 81F6CA8
-	step_left
-	step_left
-	step_13
-	step_12
-	step_end
-
-Route128_Movement_1F6CAD: @ 81F6CAD
-	step_left
-	step_25
-	step_end
-
-Route128_Movement_1F6CB0: @ 81F6CB0
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route128_Movement_1F6CBB: @ 81F6CBB
-	step_right
-	step_25
-	step_end
-
-Route128_EventScript_1F6CBE:: @ 81F6CBE
-	trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route128_EventScript_1F6D09
-	msgbox Route128_Text_2A28D7, 4
-	release
-	end
-
-Route128_EventScript_1F6CEA:: @ 81F6CEA
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route128_Text_2A2916, 4
-	setvar VAR_0x8004, 376
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 376
-	callstd 8
-	release
-	end
-
-Route128_EventScript_1F6D09:: @ 81F6D09
-	trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8
-	msgbox Route128_Text_2A29DC, 6
-	end
-
-Route128_EventScript_1F6D20:: @ 81F6D20
-	trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq Route128_EventScript_1F6D6B
-	msgbox Route128_Text_2A2AB7, 4
-	release
-	end
-
-Route128_EventScript_1F6D4C:: @ 81F6D4C
-	special sub_80B4808
-	waitmovement 0
-	msgbox Route128_Text_2A2AF9, 4
-	setvar VAR_0x8004, 386
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 386
-	callstd 8
-	release
-	end
-
-Route128_EventScript_1F6D6B:: @ 81F6D6B
-	trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB
-	msgbox Route128_Text_2A2BDD, 6
-	end
-
-Route128_EventScript_1F6D82:: @ 81F6D82
-	trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79
-	msgbox Route128_Text_2A2C95, 6
-	end
-
-Route128_EventScript_1F6D99:: @ 81F6D99
-	trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE
-	msgbox Route128_Text_2A2D0D, 6
-	end
-
-Route128_EventScript_1F6DB0:: @ 81F6DB0
-	trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9
-	msgbox Route128_Text_2A2DBA, 6
-	end
-
-Route128_EventScript_1F6DC7:: @ 81F6DC7
-	trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44
-	msgbox Route128_Text_2A2E6C, 6
-	end
-
-Route128_EventScript_1F6DDE:: @ 81F6DDE
-	trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA
-	msgbox Route128_Text_2A2F2F, 6
-	end
-
-Route128_Text_1F6DF5: @ 81F6DF5
-	.string "ARCHIE: What happened…\n"
-	.string "What is this wretched scene…\p"
-	.string "Did I…make a horrible mistake?$"
-
-Route128_Text_1F6E48: @ 81F6E48
-	.string "I…\n"
-	.string "I only wanted…$"
-
-Route128_Text_1F6E5A: @ 81F6E5A
-	.string "MAXIE: Do you understand now,\n"
-	.string "ARCHIE?\p"
-	.string "Do you finally see how disastrous\n"
-	.string "your dream turned out to be?\p"
-	.string "We have to hurry! We have to do\n"
-	.string "something before the situation goes\l"
-	.string "completely out of control!$"
-
-Route128_Text_1F6F1E: @ 81F6F1E
-	.string "MAXIE: {PLAYER}, don’t say anything.\p"
-	.string "I know that I have no right to be\n"
-	.string "critical of ARCHIE…\p"
-	.string "But the way things are now, I doubt\n"
-	.string "that we humans will be capable of\l"
-	.string "doing anything about it.\p"
-	.string "But neither can we stand by and\n"
-	.string "just watch helplessly.\p"
-	.string "The responsibility for putting an end\n"
-	.string "to this falls to ARCHIE and me…$"
-
-Route128_Text_1F704F: @ 81F704F
-	.string "MAXIE: This defies belief…\p"
-	.string "Those super-ancient POKéMON…\p"
-	.string "Their power is unbelievable.\n"
-	.string "They’ve upset the balance of nature…$"
-
-Route128_Text_1F70C9: @ 81F70C9
-	.string "STEVEN: {PLAYER}{KUN}!\n"
-	.string "What is happening?$"
-
-Route128_Text_1F70EA: @ 81F70EA
-	.string "This is terrible…\p"
-	.string "After the scorching heat wave ended,\n"
-	.string "this deluge began.\p"
-	.string "If this doesn’t stop, all of HOENN…\n"
-	.string "No, the whole world will drown.\p"
-	.string "This huge rain cloud is spreading\n"
-	.string "from above SOOTOPOLIS…\p"
-	.string "What in the world is taking place there?\p"
-	.string "There’s no point arguing here…\n"
-	.string "SOOTOPOLIS might provide answers…$"
-
-Route128_Text_1F721B: @ 81F721B
-	.string "{PLAYER}{KUN}…\n"
-	.string "I don’t know what you intend to do,\l"
-	.string "but don’t do anything reckless.\p"
-	.string "Okay.\n"
-	.string "I’m going to SOOTOPOLIS.$"
-
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 f8426a7eb..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
-	step_1d
-	step_end
-
-RustboroCity_Movement_1E0850: @ 81E0850
-	step_down
-	step_end
-
-RustboroCity_Movement_1E0852: @ 81E0852
-	step_down
-	step_14
-	step_end
-
-RustboroCity_Movement_1E0855: @ 81E0855
-	step_14
-	step_left
-	step_down
-	step_down
-	step_right
-	step_26
-	step_14
-	step_end
-
-RustboroCity_Movement_1E085D: @ 81E085D
-	step_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
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-RustboroCity_Movement_1E0AA0: @ 81E0AA0
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-RustboroCity_Movement_1E0AB1: @ 81E0AB1
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-RustboroCity_Movement_1E0AB9: @ 81E0AB9
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-RustboroCity_Movement_1E0AC1: @ 81E0AC1
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_1E0AC5: @ 81E0AC5
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_1E0ACA: @ 81E0ACA
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_1E0ACF: @ 81E0ACF
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_1E0AD5: @ 81E0AD5
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
-	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
-	step_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
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-RustboroCity_Movement_1E1215: @ 81E1215
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-RustboroCity_Movement_1E121B: @ 81E121B
-	step_down
-	step_left
-	step_left
-	step_down
-	step_end
-
-RustboroCity_Movement_1E1220: @ 81E1220
-	step_down
-	step_left
-	step_down
-	step_end
-
-RustboroCity_Movement_1E1224: @ 81E1224
-	step_down
-	step_down
-	step_end
-
-RustboroCity_Movement_1E1227: @ 81E1227
-	step_down
-	step_right
-	step_down
-	step_end
-
-RustboroCity_Movement_1E122B: @ 81E122B
-	step_down
-	step_right
-	step_right
-	step_down
-	step_end
-
-RustboroCity_Movement_1E1230: @ 81E1230
-	step_down
-	step_right
-	step_right
-	step_right
-	step_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/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
deleted file mode 100644
index 9547fbd67..000000000
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ /dev/null
@@ -1,311 +0,0 @@
-RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D
-	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_21243D
-	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_212455
-	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_212464
-	.byte 0
-
-RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D
-	compare VAR_0x408F, 0
-	call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
-	setobjectxyperm 2, 3, 2
-	setobjectmovementtype 2, 9
-	return
-
-RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455
-	map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21245F
-	.2byte 0
-
-RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F
-	turnobject 255, 4
-	end
-
-RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464
-	map_script_2 VAR_0x408F, 0, RustboroCity_DevonCorp_3F_EventScript_21246E
-	.2byte 0
-
-RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E
-	lockall
-	msgbox RustboroCity_DevonCorp_3F_Text_212C37, 4
-	closemessage
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546
-	waitmovement 0
-	delay 80
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4
-	closemessage
-	playbgm MUS_TSURETEK, 0
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_212E2F, 4
-	closemessage
-	fadedefaultbgm
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_212609, 4
-	giveitem_std ITEM_LETTER
-	msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4
-	playfanfare MUS_FANFA4
-	message RustboroCity_DevonCorp_3F_Text_212820
-	waitfanfare
-	setflag FLAG_SYS_POKENAV_GET
-	setflag FLAG_0x0BC
-	setflag FLAG_0x3E7
-	msgbox RustboroCity_DevonCorp_3F_Text_212837, 4
-	closemessage
-	call RustboroCity_DevonCorp_3F_EventScript_272083
-	msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4
-	setflag FLAG_0x37E
-	clearflag FLAG_0x327
-	clearflag FLAG_0x3D7
-	clearflag FLAG_0x2E3
-	clearflag FLAG_0x371
-	setvar VAR_0x4096, 1
-	clearflag FLAG_0x32E
-	setvar VAR_0x408F, 1
-	setvar VAR_0x405A, 6
-	releaseall
-	end
-
-RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
-	step_up
-	step_up
-	step_up
-	step_27
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_27
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543
-	step_14
-	step_25
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_left
-	step_left
-	step_left
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566
-	step_14
-	step_14
-	step_down
-	step_down
-	step_28
-	step_end
-
-RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C
-	lock
-	faceplayer
-	checkflag FLAG_0x110
-	goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC
-	checkflag FLAG_0x0BD
-	goto_eq RustboroCity_DevonCorp_3F_EventScript_212595
-	msgbox RustboroCity_DevonCorp_3F_Text_212A09, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595
-	msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4
-	giveitem_std ITEM_EXP_SHARE
-	compare VAR_RESULT, 0
-	goto_eq RustboroCity_DevonCorp_3F_EventScript_272054
-	setflag FLAG_0x110
-	msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC
-	msgbox RustboroCity_DevonCorp_3F_Text_212B78, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1
-	lock
-	faceplayer
-	checkflag FLAG_0x100
-	goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6
-	msgbox RustboroCity_DevonCorp_3F_Text_212E41, 4
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6
-	msgbox RustboroCity_DevonCorp_3F_Text_212E88, 4
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600
-	msgbox RustboroCity_DevonCorp_3F_Text_212EE9, 3
-	end
-
-RustboroCity_DevonCorp_3F_Text_212609: @ 8212609
-	.string "I’m MR. STONE, the PRESIDENT of\n"
-	.string "the DEVON CORPORATION.\p"
-	.string "I’d just got word about you!\p"
-	.string "You saved our staff not just once,\n"
-	.string "but twice!\p"
-	.string "I have a favor to ask of an amazing\n"
-	.string "person like you.\p"
-	.string "I understand that you’re delivering\n"
-	.string "a package to SLATEPORT’s SHIPYARD.\p"
-	.string "Well, on the way, could you stop off in\n"
-	.string "DEWFORD TOWN?\p"
-	.string "I was hoping that you’d deliver a\n"
-	.string "LETTER to STEVEN in DEWFORD.$"
-
-RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C
-	.string "MR. STONE: Now, you should know that\n"
-	.string "I am a great PRESIDENT.\p"
-	.string "So, I’d never be so cheap as to ask\n"
-	.string "a favor for nothing in return.\p"
-	.string "That’s why I want you to have this!$"
-
-RustboroCity_DevonCorp_3F_Text_212820: @ 8212820
-	.string "{PLAYER} received a POKéNAV.$"
-
-RustboroCity_DevonCorp_3F_Text_212837: @ 8212837
-	.string "MR. STONE: That device…\p"
-	.string "It’s a POKéMON NAVIGATOR, or POKéNAV\n"
-	.string "for short.\p"
-	.string "It’s an indispensable tool for any\n"
-	.string "TRAINER on an adventure.\p"
-	.string "It has a map of the HOENN region.\p"
-	.string "You can check the locations of\n"
-	.string "DEWFORD and SLATEPORT easily!\p"
-	.string "By the way, I’ve heard that sinister\n"
-	.string "criminals--MAGMA and AQUA, I believe--\l"
-	.string "have been making trouble far and wide.\p"
-	.string "I think it would be best if you rested\n"
-	.string "up before you go on your way.$"
-
-RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2
-	.string "MR. STONE: Well, then, {PLAYER}{KUN},\n"
-	.string "go with caution and care!$"
-
-RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09
-	.string "MR. STONE: I’m counting on you!$"
-
-RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29
-	.string "MR. STONE: You delivered my LETTER?\n"
-	.string "Thank you kindly!\p"
-	.string "This is my way of thanking you.\n"
-	.string "It should help you, a TRAINER.$"
-
-RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E
-	.string "MR. STONE: A POKéMON holding that\n"
-	.string "EXP. SHARE will be given some of the\l"
-	.string "EXP Points from battle.\p"
-	.string "It will get EXP Points even if it didn’t\n"
-	.string "actually battle.\p"
-	.string "I would say EXP. SHARE is quite useful\n"
-	.string "for raising weak POKéMON.$"
-
-RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78
-	.string "MR. STONE: Since my youth, I’ve immersed\n"
-	.string "myself in work.\p"
-	.string "Consequently, I’m not familiar with\n"
-	.string "trends and that sort of thing.\p"
-	.string "But do young people all want to be\n"
-	.string "TRAINERS in the POKéMON LEAGUE?$"
-
-RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37
-	.string "This is the DEVON CORPORATION’s\n"
-	.string "third floor.\p"
-	.string "Our PRESIDENT’s OFFICE is on\n"
-	.string "this floor.\p"
-	.string "Anyway, I can’t tell you how much I’m\n"
-	.string "grateful for what you’ve done.\p"
-	.string "Um… By the way, that parcel\n"
-	.string "you got back for us…\p"
-	.string "Could I get you to deliver that to\n"
-	.string "the SHIPYARD in SLATEPORT?\p"
-	.string "It would be awful if those robbers\n"
-	.string "tried to take it again.\p"
-	.string "Uh… Hehehe, so, uh, could I count\n"
-	.string "on you to do that for me?\p"
-	.string "Oh, that’s right.\n"
-	.string "Could you wait here a second?$"
-
-RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8
-	.string "Our PRESIDENT would like to have\n"
-	.string "a word with you.\p"
-	.string "Please come with me.$"
-
-RustboroCity_DevonCorp_3F_Text_212E2F: @ 8212E2F
-	.string "Please, go ahead.$"
-
-RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41
-	.string "If you visit the SHIPYARD in SLATEPORT,\n"
-	.string "you should go see CAPT. STERN.$"
-
-RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88
-	.string "DEVON’s new products, the REPEAT BALL\n"
-	.string "and TIMER BALL, have become hugely\l"
-	.string "popular among TRAINERS.$"
-
-RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9
-	.string "It’s a collection of rare rocks and\n"
-	.string "stones assembled by the PRESIDENT.$"
-
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
deleted file mode 100644
index 46887b9c6..000000000
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ /dev/null
@@ -1,359 +0,0 @@
-RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8
-	.byte 0
-
-RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9
-	lockall
-	msgbox RustboroCity_PokemonSchool_Text_2140B2, 4
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
-	end
-
-RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8
-	message RustboroCity_PokemonSchool_Text_2140F9
-	waitmessage
-	multichoicegrid 8, 1, 13, 3, 0
-	switch VAR_RESULT
-	case 0, RustboroCity_PokemonSchool_EventScript_213F17
-	case 1, RustboroCity_PokemonSchool_EventScript_213F25
-	case 2, RustboroCity_PokemonSchool_EventScript_213F33
-	case 3, RustboroCity_PokemonSchool_EventScript_213F41
-	case 4, RustboroCity_PokemonSchool_EventScript_213F4F
-	case 5, RustboroCity_PokemonSchool_EventScript_213F5D
-	case 127, RustboroCity_PokemonSchool_EventScript_213F5D
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17
-	msgbox RustboroCity_PokemonSchool_Text_21411A, 4
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25
-	msgbox RustboroCity_PokemonSchool_Text_2141D8, 4
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33
-	msgbox RustboroCity_PokemonSchool_Text_21427D, 4
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41
-	msgbox RustboroCity_PokemonSchool_Text_214336, 4
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F
-	msgbox RustboroCity_PokemonSchool_Text_2143B8, 4
-	goto RustboroCity_PokemonSchool_EventScript_213EB8
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D
-	releaseall
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F
-	msgbox RustboroCity_PokemonSchool_Text_21459F, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68
-	msgbox RustboroCity_PokemonSchool_Text_2145CD, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71
-	msgbox RustboroCity_PokemonSchool_Text_214604, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A
-	msgbox RustboroCity_PokemonSchool_Text_214669, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83
-	msgbox RustboroCity_PokemonSchool_Text_214719, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C
-	msgbox RustboroCity_PokemonSchool_Text_2147A2, 3
-	end
-
-RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
-	lock
-	faceplayer
-	checkflag FLAG_0x113
-	goto_eq RustboroCity_PokemonSchool_EventScript_213FFB
-	compare VAR_FACING, 4
-	call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5
-	compare VAR_FACING, 3
-	call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0
-	msgbox RustboroCity_PokemonSchool_Text_214433, 4
-	giveitem_std ITEM_QUICK_CLAW
-	compare VAR_RESULT, 0
-	goto_eq RustboroCity_PokemonSchool_EventScript_272054
-	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
-	waitmovement 0
-	setflag FLAG_0x113
-	release
-	end
-
-RustboroCity_PokemonSchool_EventScript_213FE5:: @ 8213FE5
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214027
-	waitmovement 0
-	return
-
-RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_214010
-	waitmovement 0
-	return
-
-RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
-	msgbox RustboroCity_PokemonSchool_Text_2144C8, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA
-	waitmovement 0
-	release
-	end
-
-RustboroCity_PokemonSchool_Movement_214010: @ 8214010
-	step_left
-	step_down
-	step_down
-	step_right
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_right
-	step_end
-
-RustboroCity_PokemonSchool_Movement_214027: @ 8214027
-	step_right
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_left
-	step_left
-	step_end
-
-RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040
-	lock
-	faceplayer
-	checkflag FLAG_0x1CB
-	goto_eq RustboroCity_PokemonSchool_EventScript_2140A8
-	checkflag FLAG_0x136
-	goto_eq RustboroCity_PokemonSchool_EventScript_21406F
-	checkflag FLAG_BADGE01_GET
-	goto_eq RustboroCity_PokemonSchool_EventScript_214082
-	msgbox RustboroCity_PokemonSchool_Text_2148C0, 4
-	addvar VAR_0x40D1, 1
-	setflag FLAG_0x136
-	release
-	end
-
-RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F
-	checkflag FLAG_BADGE01_GET
-	goto_eq RustboroCity_PokemonSchool_EventScript_214090
-	msgbox RustboroCity_PokemonSchool_Text_214A5F, 4
-	release
-	end
-
-RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082
-	msgbox RustboroCity_PokemonSchool_Text_214B8A, 4
-	goto RustboroCity_PokemonSchool_EventScript_21409E
-	end
-
-RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090
-	msgbox RustboroCity_PokemonSchool_Text_214AB6, 4
-	goto RustboroCity_PokemonSchool_EventScript_21409E
-	end
-
-RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E
-	addvar VAR_0x40D1, 1
-	setflag FLAG_0x1CB
-	release
-	end
-
-RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8
-	msgbox RustboroCity_PokemonSchool_Text_214A5F, 4
-	release
-	end
-
-RustboroCity_PokemonSchool_Text_2140B2: @ 82140B2
-	.string "The blackboard lists status changes\n"
-	.string "that may affect POKéMON in battle.$"
-
-RustboroCity_PokemonSchool_Text_2140F9: @ 82140F9
-	.string "Which topic do you want to read?$"
-
-RustboroCity_PokemonSchool_Text_21411A: @ 821411A
-	.string "If a POKéMON is poisoned, it will\n"
-	.string "steadily lose HP.\p"
-	.string "The effects of poison remain after\n"
-	.string "a battle.\p"
-	.string "A poisoned POKéMON’s HP will drop\n"
-	.string "while it is traveling.\p"
-	.string "Heal a poisoning using an ANTIDOTE.$"
-
-RustboroCity_PokemonSchool_Text_2141D8: @ 82141D8
-	.string "If a POKéMON becomes paralyzed,\n"
-	.string "its SPEED drops.\p"
-	.string "It may also not be able to move while\n"
-	.string "it is in battle.\p"
-	.string "Paralysis remains after battle.\n"
-	.string "Cure it using a PARLYZ HEAL.$"
-
-RustboroCity_PokemonSchool_Text_21427D: @ 821427D
-	.string "If a POKéMON falls asleep, it will be\n"
-	.string "unable to attack.\p"
-	.string "A POKéMON may wake up on its own,\n"
-	.string "but if a battle ends while it is\l"
-	.string "sleeping, it will stay asleep.\p"
-	.string "Wake it up using an AWAKENING.$"
-
-RustboroCity_PokemonSchool_Text_214336: @ 8214336
-	.string "A burn reduces ATTACK power, and it\n"
-	.string "steadily reduces the victim’s HP.\p"
-	.string "A burn lingers after battle.\n"
-	.string "Cure a burn using a BURN HEAL.$"
-
-RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8
-	.string "If a POKéMON is frozen, it becomes\n"
-	.string "completely helpless.\p"
-	.string "It will remain frozen after battle.\n"
-	.string "Thaw it out using an ICE HEAL.$"
-
-RustboroCity_PokemonSchool_Text_214433: @ 8214433
-	.string "Students who don’t study get a little\n"
-	.string "taste of my QUICK CLAW.\p"
-	.string "Whether or not you are a good student \n"
-	.string "will be evident from the way you use\l"
-	.string "this item.$"
-
-RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8
-	.string "A POKéMON holding the QUICK CLAW will\n"
-	.string "occasionally speed up and get to move\l"
-	.string "before its opponent.\p"
-	.string "There are many other items that are\n"
-	.string "meant to be held by POKéMON.\p"
-	.string "Just those alone will give you many\n"
-	.string "topics to study!$"
-
-RustboroCity_PokemonSchool_Text_21459F: @ 821459F
-	.string "I’m trading POKéMON with my friend\n"
-	.string "right now.$"
-
-RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD
-	.string "I always wanted a SEEDOT, and\n"
-	.string "I’m finally getting one!$"
-
-RustboroCity_PokemonSchool_Text_214604: @ 8214604
-	.string "POKéMON can hold items, but they\n"
-	.string "don’t know what to do with man-made\l"
-	.string "items like POTION and ANTIDOTE.$"
-
-RustboroCity_PokemonSchool_Text_214669: @ 8214669
-	.string "You know how some POKéMON moves can\n"
-	.string "confuse a POKéMON?\p"
-	.string "A confused POKéMON will sometimes\n"
-	.string "attack itself without meaning to.\p"
-	.string "But once it leaves battle, it will\n"
-	.string "return to normal.$"
-
-RustboroCity_PokemonSchool_Text_214719: @ 8214719
-	.string "A POKéMON holding a BERRY will heal\n"
-	.string "itself…\p"
-	.string "There are many kinds of items that\n"
-	.string "POKéMON can hold…\p"
-	.string "Boy, it sure is hard taking notes\n"
-	.string "down…$"
-
-RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2
-	.string "It’s this student’s notebook…\p"
-	.string "POKéMON are to be caught using\n"
-	.string "POKé BALLS.\p"
-	.string "Up to six POKéMON can accompany\n"
-	.string "a TRAINER.\p"
-	.string "A TRAINER is someone who catches\n"
-	.string "POKéMON, raises them, and battles\l"
-	.string "with them.\p"
-	.string "A TRAINER’s mission is to defeat\n"
-	.string "the strong TRAINERS who await\l"
-	.string "challengers in POKéMON GYMS.$"
-
-RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0
-	.string "Hello? Didn’t we meet before?\n"
-	.string "I think back in PETALBURG CITY.\p"
-	.string "Let me introduce myself.\n"
-	.string "My name’s SCOTT.\p"
-	.string "I’ve been traveling everywhere in\n"
-	.string "search of outstanding TRAINERS.\p"
-	.string "More specifically, I’m looking for\n"
-	.string "POKéMON battle experts.\p"
-	.string "So, what brings you to this SCHOOL?\n"
-	.string "Are you a TRAINER, too?\p"
-	.string "The first thing you should do is to\n"
-	.string "have a POKéMON learn the move CUT.\p"
-	.string "If I remember correctly, someone in\n"
-	.string "this town has CUT.$"
-
-RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F
-	.string "SCOTT: Hmm…\p"
-	.string "The talent levels of the students here\n"
-	.string "are unknown. The potential’s there.$"
-
-RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6
-	.string "SCOTT: Oh, what’s that?\p"
-	.string "It’s a STONE BADGE, isn’t it?\n"
-	.string "That’s pretty impressive, I’d say.\p"
-	.string "But, you know, I would’ve loved to see\n"
-	.string "you in battle.\p"
-	.string "It’s hard to tell what you’re like as\n"
-	.string "a TRAINER from a LEAGUE BADGE.$"
-
-RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A
-	.string "Hello? Didn’t we meet before?\n"
-	.string "I think back in PETALBURG CITY.\p"
-	.string "Let me introduce myself.\n"
-	.string "My name’s SCOTT.\p"
-	.string "I’ve been traveling everywhere in\n"
-	.string "search of outstanding TRAINERS.\p"
-	.string "More specifically, I’m looking for\n"
-	.string "POKéMON battle experts.\p"
-	.string "Oh, what’s that?\n"
-	.string "It’s a STONE BADGE, isn’t it?\p"
-	.string "That’s pretty impressive, I’d say, for\n"
-	.string "a starting TRAINER like yourself.\p"
-	.string "But, you know, I would’ve loved to see\n"
-	.string "you in battle.\p"
-	.string "It’s hard to tell what you’re like as\n"
-	.string "a TRAINER from a LEAGUE BADGE.$"
-
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
deleted file mode 100644
index 52dca4c95..000000000
--- a/data/scripts/maps/RusturfTunnel.inc
+++ /dev/null
@@ -1,539 +0,0 @@
-RusturfTunnel_MapScripts:: @ 822CE27
-	map_script 3, RusturfTunnel_MapScript1_22CE44
-	map_script 2, RusturfTunnel_MapScript2_22CE32
-	.byte 0
-
-RusturfTunnel_MapScript2_22CE32: @ 822CE32
-	map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE
-	map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE
-	.2byte 0
-
-RusturfTunnel_MapScript1_22CE44: @ 822CE44
-	compare VAR_0x409A, 2
-	call_if 1, RusturfTunnel_EventScript_22CE50
-	end
-
-RusturfTunnel_EventScript_22CE50:: @ 822CE50
-	setobjectxyperm 7, 13, 4
-	setobjectxyperm 6, 13, 5
-	return
-
-RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
-	lock
-	faceplayer
-	msgbox RusturfTunnel_Text_22D7A3, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_22CE76:: @ 822CE76
-	lock
-	faceplayer
-	checkflag FLAG_0x001
-	goto_eq RusturfTunnel_EventScript_22CE99
-	setflag FLAG_0x001
-	msgbox RusturfTunnel_Text_22D510, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_22CE99:: @ 822CE99
-	msgbox RusturfTunnel_Text_22D5F3, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_22CEAE:: @ 822CEAE
-	lockall
-	compare VAR_TEMP_1, 1
-	call_if 1, RusturfTunnel_EventScript_22CFA7
-	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_22CFBC
-	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_22CFC7
-	call RusturfTunnel_EventScript_22CFFF
-	msgbox RusturfTunnel_Text_22D65C, 4
-	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_22CFC8
-	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_22CFC8
-	giveitem_std ITEM_HM04
-	setflag FLAG_0x06A
-	msgbox RusturfTunnel_Text_22D6D2, 4
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if 1, RusturfTunnel_EventScript_22CF5D
-	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_22CF6F
-	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_22CF8B
-	msgbox RusturfTunnel_Text_22D745, 4
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if 1, RusturfTunnel_EventScript_22CFD4
-	compare VAR_TEMP_1, 2
-	call_if 1, RusturfTunnel_EventScript_22CFE6
-	compare VAR_TEMP_1, 3
-	call_if 1, RusturfTunnel_EventScript_22CFE6
-	call RusturfTunnel_EventScript_272216
-	releaseall
-	end
-
-RusturfTunnel_EventScript_22CF5D:: @ 822CF5D
-	applymovement 255, RusturfTunnel_Movement_22D042
-	applymovement 1, RusturfTunnel_Movement_22D067
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
-	applymovement 255, RusturfTunnel_Movement_22D045
-	applymovement 1, RusturfTunnel_Movement_22D06C
-	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_2725AA
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
-	applymovement 255, RusturfTunnel_Movement_22D045
-	applymovement 1, RusturfTunnel_Movement_22D06C
-	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_2725AA
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
-	applymovement 1, RusturfTunnel_Movement_2725A6
-	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_2725AA
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CFBC:: @ 822CFBC
-	applymovement 1, RusturfTunnel_Movement_22D048
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CFC7:: @ 822CFC7
-	return
-
-RusturfTunnel_EventScript_22CFC8:: @ 822CFC8
-	closemessage
-	applymovement 1, RusturfTunnel_Movement_22D065
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CFD4:: @ 822CFD4
-	applymovement 10, RusturfTunnel_Movement_22D017
-	applymovement 1, RusturfTunnel_Movement_22D04B
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CFE6:: @ 822CFE6
-	applymovement 255, RusturfTunnel_Movement_22D02F
-	applymovement 10, RusturfTunnel_Movement_22D023
-	applymovement 1, RusturfTunnel_Movement_22D058
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
-	playse SE_PIN
-	applymovement 1, RusturfTunnel_Movement_272598
-	waitmovement 0
-	applymovement 1, RusturfTunnel_Movement_27259A
-	waitmovement 0
-	return
-
-RusturfTunnel_Movement_22D017: @ 822D017
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-RusturfTunnel_Movement_22D023: @ 822D023
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-RusturfTunnel_Movement_22D02F: @ 822D02F
-	step_13
-	step_26
-	step_14
-	step_14
-	step_28
-	step_end
-
-RusturfTunnel_Movement_22D035: @ 822D035
-	step_left
-	step_28
-	step_end
-
-RusturfTunnel_Movement_22D038: @ 822D038
-	step_down
-	step_26
-	step_13
-	step_28
-	step_end
-
-RusturfTunnel_Movement_22D03D: @ 822D03D
-	step_up
-	step_25
-	step_13
-	step_28
-	step_end
-
-RusturfTunnel_Movement_22D042: @ 822D042
-	step_left
-	step_28
-	step_end
-
-RusturfTunnel_Movement_22D045: @ 822D045
-	step_right
-	step_27
-	step_end
-
-RusturfTunnel_Movement_22D048: @ 822D048
-	step_up
-	step_28
-	step_end
-
-RusturfTunnel_Movement_22D04B: @ 822D04B
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-RusturfTunnel_Movement_22D058: @ 822D058
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-RusturfTunnel_Movement_22D065: @ 822D065
-	step_right
-	step_end
-
-RusturfTunnel_Movement_22D067: @ 822D067
-	step_22
-	step_22
-	step_16
-	step_18
-	step_end
-
-RusturfTunnel_Movement_22D06C: @ 822D06C
-	step_24
-	step_24
-	step_18
-	step_26
-	step_end
-
-RusturfTunnel_EventScript_22D071:: @ 822D071
-	setvar VAR_TEMP_1, 1
-	end
-
-RusturfTunnel_EventScript_22D077:: @ 822D077
-	setvar VAR_TEMP_1, 2
-	end
-
-RusturfTunnel_EventScript_22D07D:: @ 822D07D
-	setvar VAR_TEMP_1, 3
-	end
-
-RusturfTunnel_EventScript_22D083:: @ 822D083
-	lockall
-	msgbox RusturfTunnel_Text_22D1C8, 4
-	closemessage
-	applymovement 6, RusturfTunnel_Movement_22D0AB
-	applymovement 7, RusturfTunnel_Movement_22D0AB
-	waitmovement 0
-	moveobjectoffscreen 6
-	moveobjectoffscreen 7
-	setvar VAR_0x409A, 3
-	releaseall
-	end
-
-RusturfTunnel_Movement_22D0AB: @ 822D0AB
-	step_40
-	step_right
-	step_41
-	step_end
-
-RusturfTunnel_EventScript_22D0AF:: @ 822D0AF
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox RusturfTunnel_Text_22D1F7, 4
-	waitmoncry
-	release
-	end
-
-RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
-	lock
-	faceplayer
-	playbgm MUS_AQA_0, 0
-	msgbox RusturfTunnel_Text_22D20A, 4
-	trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0
-	msgbox RusturfTunnel_Text_22D2E1, 4
-	giveitem_std ITEM_DEVON_GOODS
-	closemessage
-	applymovement 255, RusturfTunnel_Movement_22D178
-	applymovement 6, RusturfTunnel_Movement_22D181
-	waitmovement 0
-	removeobject 6
-	delay 50
-	addobject 5
-	applymovement 5, RusturfTunnel_Movement_22D18B
-	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_22D17E
-	applymovement 5, RusturfTunnel_Movement_22D1A4
-	waitmovement 0
-	msgbox RusturfTunnel_Text_22D395, 4
-	applymovement 5, RusturfTunnel_Movement_27259E
-	waitmovement 0
-	message RusturfTunnel_Text_22D3BA
-	waitmessage
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	waitbuttonpress
-	waitmoncry
-	closemessage
-	applymovement 255, RusturfTunnel_Movement_22D19F
-	applymovement 5, RusturfTunnel_Movement_22D193
-	applymovement 7, RusturfTunnel_Movement_22D1A7
-	waitmovement 0
-	removeobject 5
-	removeobject 7
-	clearflag FLAG_0x08E
-	setflag FLAG_0x08F
-	setvar VAR_0x405A, 4
-	setvar VAR_0x4090, 1
-	setflag FLAG_0x37B
-	release
-	end
-
-RusturfTunnel_Movement_22D178: @ 822D178
-	step_00
-	step_40
-	step_up
-	step_41
-	step_27
-	step_end
-
-RusturfTunnel_Movement_22D17E: @ 822D17E
-	step_down
-	step_26
-	step_end
-
-RusturfTunnel_Movement_22D181: @ 822D181
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_end
-
-RusturfTunnel_Movement_22D18B: @ 822D18B
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-RusturfTunnel_Movement_22D193: @ 822D193
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-RusturfTunnel_Movement_22D19F: @ 822D19F
-	step_14
-	step_13
-	step_12
-	step_27
-	step_end
-
-RusturfTunnel_Movement_22D1A4: @ 822D1A4
-	step_14
-	step_right
-	step_end
-
-RusturfTunnel_Movement_22D1A7: @ 822D1A7
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-RusturfTunnel_EventScript_22D1B1:: @ 822D1B1
-	trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
-	msgbox RusturfTunnel_Text_22D8F9, 6
-	end
-
-RusturfTunnel_Text_22D1C8: @ 822D1C8
-	.string "What, are you coming?\n"
-	.string "Come and get some, then!$"
-
-RusturfTunnel_Text_22D1F7: @ 822D1F7
-	.string "PEEKO: Pii pihyoh!$"
-
-RusturfTunnel_Text_22D20A: @ 822D20A
-	.string "Grah, keelhaul it all!\p"
-	.string "That hostage POKéMON turned out to\n"
-	.string "be worthless!\p"
-	.string "And to think I made a getaway…\n"
-	.string "In this tunnel to nowhere!\p"
-	.string "Hey! You!\n"
-	.string "So you want to battle me?$"
-
-RusturfTunnel_Text_22D2B0: @ 822D2B0
-	.string "Urrrggh! My career in crime comes to\n"
-	.string "a dead end!$"
-
-RusturfTunnel_Text_22D2E1: @ 822D2E1
-	.string "This is plain not right…\p"
-	.string "The BOSS told me this would be a\n"
-	.string "slick-and-easy job to pull.\p"
-	.string "All I had to do was steal some package\n"
-	.string "from DEVON.\p"
-	.string "Tch!\n"
-	.string "You want it back that badly, take it!$"
-
-RusturfTunnel_Text_22D395: @ 822D395
-	.string "PEEKO!\n"
-	.string "Am I glad to see you’re safe!$"
-
-RusturfTunnel_Text_22D3BA: @ 822D3BA
-	.string "PEEKO owes her life to you!\p"
-	.string "They call me MR. BRINEY.\n"
-	.string "And, you are?\p"
-	.string "… … … … … … … …\n"
-	.string "… … … … … … … …\p"
-	.string "Ah, so you are {PLAYER}{KUN}!\n"
-	.string "I sincerely thank you!\p"
-	.string "Now, if there’s anything that troubles\n"
-	.string "you, don’t hesitate to tell me!\p"
-	.string "You can usually find me in my cottage\n"
-	.string "by the sea near PETALBURG WOODS.\p"
-	.string "Come, PEEKO, we should make our way\n"
-	.string "home.\p"
-	.string "PEEKO: Pihyoh!$"
-
-RusturfTunnel_Text_22D510: @ 822D510
-	.string "… …\p"
-	.string "Why can’t they keep digging?\n"
-	.string "Is the bedrock too hard?\p"
-	.string "My beloved awaits me in VERDANTURF\n"
-	.string "TOWN just beyond here…\p"
-	.string "If RUSTBORO and VERDANTURF were\n"
-	.string "joined by this tunnel, I could visit\l"
-	.string "her every day…\p"
-	.string "But this…\n"
-	.string "What am I to do?$"
-
-RusturfTunnel_Text_22D5F3: @ 822D5F3
-	.string "To get from RUSTBORO to VERDANTURF,\n"
-	.string "you need to go to DEWFORD, then pass\l"
-	.string "through SLATEPORT and MAUVILLE…$"
-
-RusturfTunnel_Text_22D65C: @ 822D65C
-	.string "Wow! You shattered that boulder\n"
-	.string "blocking the way.\p"
-	.string "To show you how much I appreciate it,\n"
-	.string "I’d like you to have this HM.$"
-
-RusturfTunnel_Text_22D6D2: @ 822D6D2
-	.string "That HM contains STRENGTH.\p"
-	.string "If a muscular POKéMON were to learn\n"
-	.string "that, it would be able to move even\l"
-	.string "large boulders.$"
-
-RusturfTunnel_Text_22D745: @ 822D745
-	.string "WANDA!\n"
-	.string "Now I can see you anytime!\p"
-	.string "WANDA: That’s…wonderful.\p"
-	.string "Please, take some rest at my home.$"
-
-RusturfTunnel_Text_22D7A3: @ 822D7A3
-	.string "On the other side of this rock…\n"
-	.string "My boyfriend is there.\p"
-	.string "He… He’s not just digging the tunnel\n"
-	.string "to come see me.\p"
-	.string "He works his hands raw and rough\n"
-	.string "for the benefit of everyone.$"
-
-RusturfTunnel_Text_22D84D: @ 822D84D
-	.string "What do you call a wild man up in the\n"
-	.string "mountains? A mountain man, right?\p"
-	.string "So why don’t they call a POKéMON in\n"
-	.string "the mountains a mountain POKéMON?$"
-
-RusturfTunnel_Text_22D8DB: @ 822D8DB
-	.string "My POKéMON…\n"
-	.string "Ran out of power…$"
-
-RusturfTunnel_Text_22D8F9: @ 822D8F9
-	.string "They halted development here to\n"
-	.string "protect POKéMON, right?\l"
-	.string "There’s a feel-good story!$"
-
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
deleted file mode 100644
index ad10e2669..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
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-SSTidalCorridor_Movement_23C275: @ 823C275
-	step_25
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_left
-	step_end
-
-SSTidalCorridor_Movement_23C27D: @ 823C27D
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_25
-	step_end
-
-SSTidalCorridor_Movement_23C284: @ 823C284
-	step_14
-	step_right
-	step_right
-	step_26
-	step_14
-	step_27
-	step_end
-
-SSTidalCorridor_Movement_23C28B: @ 823C28B
-	step_left
-	step_left
-	step_26
-	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 4be06d00b..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
-	step_down
-	step_end
-
-SafariZone_South_Movement_23D2C7: @ 823D2C7
-	step_right
-	step_25
-	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
-	step_up
-	step_end
-
-SafariZone_South_Movement_23D387: @ 823D387
-	step_right
-	step_26
-	step_end
-
-SafariZone_South_Movement_23D38A: @ 823D38A
-	step_left
-	step_28
-	step_end
-
-SafariZone_South_Movement_23D38D: @ 823D38D
-	step_down
-	step_26
-	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 a2247286c..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
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SeafloorCavern_Room9_Movement_235032: @ 8235032
-	step_left
-	step_left
-	step_end
-
-SeafloorCavern_Room9_Movement_235035: @ 8235035
-	step_left
-	step_14
-	step_end
-
-SeafloorCavern_Room9_Movement_235038: @ 8235038
-	step_right
-	step_end
-
-SeafloorCavern_Room9_Movement_23503A: @ 823503A
-	step_01
-	step_40
-	step_down
-	step_41
-	step_28
-	step_end
-
-SeafloorCavern_Room9_Movement_235040: @ 8235040
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	step_end
-
-SeafloorCavern_Room9_Movement_23504B: @ 823504B
-	step_32
-	step_32
-	step_end
-
-SeafloorCavern_Room9_Movement_23504E: @ 823504E
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-SeafloorCavern_Room9_Movement_235054: @ 8235054
-	step_right
-	step_right
-	step_end
-
-SeafloorCavern_Room9_Movement_235057: @ 8235057
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-SeafloorCavern_Room9_Movement_23505C: @ 823505C
-	step_14
-	step_14
-	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/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc
deleted file mode 100644
index cced073aa..000000000
--- a/data/scripts/maps/SkyPillar_Outside.inc
+++ /dev/null
@@ -1,174 +0,0 @@
-SkyPillar_Outside_MapScripts:: @ 82392A8
-	map_script 3, SkyPillar_Outside_MapScript1_2392B8
-	map_script 1, SkyPillar_Outside_MapScript1_2392DD
-	map_script 2, SkyPillar_Outside_MapScript2_2392FA
-	.byte 0
-
-SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
-	compare VAR_0x405E, 3
-	call_if 1, SkyPillar_Outside_EventScript_2392CF
-	compare VAR_0x405E, 4
-	call_if 4, SkyPillar_Outside_EventScript_2392D3
-	end
-
-SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
-	setflag FLAG_SPECIAL_FLAG_0x4000
-	return
-
-SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, SkyPillar_Outside_EventScript_27207A
-	return
-
-SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
-	checkflag FLAG_0x137
-	call_if 1, SkyPillar_Outside_EventScript_2392E7
-	end
-
-SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
-	setmetatile 14, 4, 682, 0
-	setmetatile 14, 5, 690, 0
-	return
-
-SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
-	map_script_2 VAR_0x405E, 3, SkyPillar_Outside_EventScript_239304
-	.2byte 0
-
-SkyPillar_Outside_EventScript_239304:: @ 8239304
-	lockall
-	applymovement 1, SkyPillar_Outside_Movement_2393D3
-	waitmovement 0
-	applymovement 255, SkyPillar_Outside_Movement_2725A4
-	waitmovement 0
-	msgbox SkyPillar_Outside_Text_239416, 4
-	closemessage
-	delay 30
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	setvar VAR_0x8006, 8
-	setvar VAR_0x8007, 3
-	special sub_8139560
-	waitstate
-	delay 40
-	msgbox SkyPillar_Outside_Text_2394BC, 4
-	closemessage
-	applymovement 255, SkyPillar_Outside_Movement_2393EB
-	applymovement 1, SkyPillar_Outside_Movement_2393DE
-	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 3
-	setvar VAR_0x8006, 20
-	setvar VAR_0x8007, 5
-	special sub_8139560
-	waitstate
-	delay 20
-	applymovement 1, SkyPillar_Outside_Movement_2725A4
-	waitmovement 0
-	delay 10
-	applymovement 1, SkyPillar_Outside_Movement_2725A8
-	waitmovement 0
-	delay 20
-	applymovement 1, SkyPillar_Outside_Movement_2725AA
-	waitmovement 0
-	delay 30
-	msgbox SkyPillar_Outside_Text_23950C, 4
-	closemessage
-	setflag FLAG_SYS_WEATHER_CTRL
-	setweather 15
-	doweather
-	special WaitWeather
-	waitstate
-	delay 30
-	msgbox SkyPillar_Outside_Text_23953A, 4
-	closemessage
-	playse SE_KAIDAN
-	fadescreenswapbuffers 1
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	setvar VAR_0x405E, 4
-	removeobject 1
-	clearflag FLAG_0x330
-	fadescreenswapbuffers 0
-	releaseall
-	end
-
-SkyPillar_Outside_Movement_2393D3: @ 82393D3
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_end
-
-SkyPillar_Outside_Movement_2393DE: @ 82393DE
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-SkyPillar_Outside_Movement_2393EB: @ 82393EB
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_end
-
-SkyPillar_Outside_EventScript_2393F8:: @ 82393F8
-	end
-
-SkyPillar_Outside_EventScript_2393F9:: @ 82393F9
-	msgbox SkyPillar_Outside_Text_239402, 3
-	end
-
-SkyPillar_Outside_Text_239402: @ 8239402
-	.string "The door is closed.$"
-
-SkyPillar_Outside_Text_239416: @ 8239416
-	.string "WALLACE: Oh, my, I’m terribly sorry!\p"
-	.string "In my haste, I didn’t notice that\n"
-	.string "I’d left you behind!\p"
-	.string "I’ve opened the locked door of\n"
-	.string "the SKY PILLAR.\p"
-	.string "{PLAYER}{KUN}, let’s be on our way!$"
-
-SkyPillar_Outside_Text_2394BC: @ 82394BC
-	.string "WALLACE: It’s an earthquake!\p"
-	.string "There’s not a moment to waste!\n"
-	.string "We’ve got to hurry!$"
-
-SkyPillar_Outside_Text_23950C: @ 823950C
-	.string "WALLACE: Hmm…\n"
-	.string "The situation is getting worse…$"
-
-SkyPillar_Outside_Text_23953A: @ 823953A
-	.string "WALLACE: This isn’t good…\p"
-	.string "The weather distortion is spreading\n"
-	.string "even here…\p"
-	.string "{PLAYER}{KUN}.\p"
-	.string "RAYQUAZA should be farther up\n"
-	.string "from here.\p"
-	.string "I’m worried about SOOTOPOLIS.\n"
-	.string "I’ve got to go back.\p"
-	.string "Everything is in your hands now.\n"
-	.string "Don’t fail us!$"
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
deleted file mode 100644
index a652c7897..000000000
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ /dev/null
@@ -1,189 +0,0 @@
-SkyPillar_Top_MapScripts:: @ 82396B8
-	map_script 5, SkyPillar_Top_MapScript1_2396C8
-	map_script 3, SkyPillar_Top_MapScript1_2396E6
-	map_script 4, SkyPillar_Top_MapScript2_239713
-	.byte 0
-
-SkyPillar_Top_MapScript1_2396C8: @ 82396C8
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, SkyPillar_Top_EventScript_2396D2
-	end
-
-SkyPillar_Top_EventScript_2396D2:: @ 82396D2
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, SkyPillar_Top_EventScript_27374E
-	removeobject VAR_LAST_TALKED
-	return
-
-SkyPillar_Top_MapScript1_2396E6: @ 82396E6
-	compare VAR_0x40CA, 2
-	call_if 0, SkyPillar_Top_EventScript_2396FD
-	compare VAR_0x40CA, 2
-	call_if 4, SkyPillar_Top_EventScript_239705
-	end
-
-SkyPillar_Top_EventScript_2396FD:: @ 82396FD
-	setmaplayoutindex 438
-	setobjectmovementtype 1, 8
-	return
-
-SkyPillar_Top_EventScript_239705:: @ 8239705
-	checkflag FLAG_0x1C0
-	call_if 0, SkyPillar_Top_EventScript_23970F
-	return
-
-SkyPillar_Top_EventScript_23970F:: @ 823970F
-	clearflag FLAG_0x050
-	return
-
-SkyPillar_Top_MapScript2_239713: @ 8239713
-	map_script_2 VAR_0x40CA, 0, SkyPillar_Top_EventScript_23971D
-	.2byte 0
-
-SkyPillar_Top_EventScript_23971D:: @ 823971D
-	turnobject 1, 1
-	end
-
-SkyPillar_Top_EventScript_239722:: @ 8239722
-	lockall
-	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
-	delay 40
-	waitmoncry
-	setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special BattleSetup_StartLegendaryBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq SkyPillar_Top_EventScript_239768
-	compare VAR_RESULT, 4
-	goto_eq SkyPillar_Top_EventScript_239771
-	compare VAR_RESULT, 5
-	goto_eq SkyPillar_Top_EventScript_239771
-	setflag FLAG_0x1C0
-	releaseall
-	end
-
-SkyPillar_Top_EventScript_239768:: @ 8239768
-	setflag FLAG_0x1C0
-	goto SkyPillar_Top_EventScript_23977C
-	end
-
-SkyPillar_Top_EventScript_239771:: @ 8239771
-	setvar VAR_0x8004, 406
-	goto SkyPillar_Top_EventScript_239785
-	end
-
-SkyPillar_Top_EventScript_23977C:: @ 823977C
-	fadescreenswapbuffers 1
-	removeobject VAR_LAST_TALKED
-	fadescreenswapbuffers 0
-	releaseall
-	end
-
-SkyPillar_Top_EventScript_239785:: @ 8239785
-	fadescreenswapbuffers 1
-	removeobject VAR_LAST_TALKED
-	fadescreenswapbuffers 0
-	bufferspeciesname 0, VAR_0x8004
-	msgbox gUnknown_08273204, 4
-	releaseall
-	end
-
-SkyPillar_Top_EventScript_23979A:: @ 823979A
-	lockall
-	fadeoutbgm 1
-	applymovement 255, SkyPillar_Top_Movement_2725B2
-	waitmovement 0
-	special SpawnScriptFieldObject
-	applymovement 127, SkyPillar_Top_Movement_239858
-	waitmovement 0
-	special RemoveScriptFieldObject
-	applymovement 1, SkyPillar_Top_Movement_23983A
-	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
-	applymovement 1, SkyPillar_Top_Movement_23984B
-	waitmovement 0
-	removeobject 1
-	msgbox SkyPillar_Top_Text_239860, 4
-	closemessage
-	delay 20
-	fadeinbgm 1
-	special SpawnScriptFieldObject
-	applymovement 127, SkyPillar_Top_Movement_23985C
-	waitmovement 0
-	special RemoveScriptFieldObject
-	setvar VAR_0x405E, 5
-	setvar VAR_0x40CA, 1
-	setvar VAR_0x40D7, 1
-	releaseall
-	end
-
-SkyPillar_Top_Movement_23983A: @ 823983A
-	step_14
-	step_23
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_1f
-	step_14
-	step_20
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_end
-
-SkyPillar_Top_Movement_23984B: @ 823984B
-	step_14
-	step_1d
-	step_13
-	step_20
-	step_13
-	step_2e
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_end
-
-SkyPillar_Top_Movement_239858: @ 8239858
-	slow_step_up
-	slow_step_up
-	slow_step_up
-	step_end
-
-SkyPillar_Top_Movement_23985C: @ 823985C
-	slow_step_down
-	slow_step_down
-	slow_step_down
-	step_end
-
-SkyPillar_Top_Text_239860: @ 8239860
-	.string "The awakened RAYQUAZA flew off…$"
-
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
deleted file mode 100644
index fe7cfc0fd..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
-	step_14
-	step_13
-	step_27
-	step_end
-
-SlateportCity_Movement_1DCDAC: @ 81DCDAC
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SlateportCity_Movement_1DCDB4: @ 81DCDB4
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_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
-	step_14
-	step_14
-	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
-	step_14
-	step_14
-	step_57
-	step_28
-	step_14
-	step_14
-	step_27
-	step_end
-
-SlateportCity_Movement_1DD311: @ 81DD311
-	step_57
-	step_26
-	step_14
-	step_25
-	step_14
-	step_14
-	step_27
-	step_end
-
-SlateportCity_Movement_1DD319: @ 81DD319
-	step_14
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-SlateportCity_Movement_1DD326: @ 81DD326
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-SlateportCity_Movement_1DD334: @ 81DD334
-	step_down
-	step_26
-	step_end
-
-SlateportCity_Movement_1DD337: @ 81DD337
-	step_right
-	step_up
-	step_up
-	step_54
-	step_end
-
-SlateportCity_Movement_1DD33C: @ 81DD33C
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_left
-	step_end
-
-SlateportCity_Movement_1DD344: @ 81DD344
-	step_28
-	step_14
-	step_14
-	step_right
-	step_up
-	step_end
-
-SlateportCity_Movement_1DD34A: @ 81DD34A
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_25
-	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
-	step_40
-	step_down
-	step_41
-	step_end
-
-SlateportCity_Movement_1DD634: @ 81DD634
-	step_14
-	step_28
-	step_end
-
-SlateportCity_Movement_1DD637: @ 81DD637
-	step_13
-	step_down
-	step_end
-
-SlateportCity_Movement_1DD63A: @ 81DD63A
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_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 4c5aa0371..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
-	step_up
-	step_up
-	step_up
-	step_28
-	step_end
-
-SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E
-	step_down
-	step_down
-	step_down
-	step_down
-	step_27
-	step_end
-
diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc
deleted file mode 100644
index 47ca641ce..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E
-	step_up
-	step_up
-	step_54
-	step_end
-
-SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068
-	step_up
-	step_54
-	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 6353856e3..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
-	step_up
-	step_up
-	step_up
-	step_end
-
-SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC
-	step_up
-	step_54
-	step_end
-
-SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF
-	step_up
-	step_up
-	step_up
-	step_end
-
-SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03
-	step_up
-	step_up
-	step_54
-	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
-	step_up
-	step_up
-	step_up
-	step_54
-	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 a66e0e6d9..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
-	step_14
-	step_14
-	step_43
-	step_54
-	step_end
-
-SlateportCity_Harbor_Movement_20CACD: @ 820CACD
-	step_14
-	step_14
-	step_43
-	step_54
-	step_end
-
-SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
-	step_14
-	step_14
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
-
-SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6
-	step_left
-	step_left
-	step_up
-	step_left
-	step_end
-
-SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB
-	step_left
-	step_left
-	step_left
-	step_end
-
-SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF
-	step_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
-	step_right
-	step_26
-	step_end
-
-SlateportCity_Harbor_Movement_20CC50: @ 820CC50
-	step_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/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
deleted file mode 100644
index ba8575c66..000000000
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ /dev/null
@@ -1,395 +0,0 @@
-SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95
-	.byte 0
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F
-	lockall
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A4
-	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0
-	lockall
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A8
-	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1
-	showmoneybox 0, 0, 0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5
-	compare VAR_RESULT, 1
-	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8
-	closemessage
-	hidemoneybox
-	nop
-	nop
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
-	waitmovement 0
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
-	checkmoney 0x32, 0
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18
-	playse SE_REGI
-	takemoney 0x32, 0
-	updatemoneybox 0, 0
-	nop
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 4
-	setvar VAR_0x40AA, 1
-	hidemoneybox
-	nop
-	nop
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18
-	checkflag FLAG_0x095
-	goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, 4
-	closemessage
-	hidemoneybox
-	nop
-	nop
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
-	waitmovement 0
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, 4
-	setvar VAR_0x40AA, 1
-	hidemoneybox
-	nop
-	nop
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B
-	step_down
-	step_end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8
-	lock
-	faceplayer
-	delay 8
-	playse SE_PIN
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_272598
-	waitmovement 0
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4
-	giveitem_std ITEM_TM46
-	compare VAR_RESULT, 0
-	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5
-	setflag FLAG_0x10D
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4
-	closemessage
-	compare VAR_FACING, 2
-	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C
-	compare VAR_FACING, 1
-	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83
-	compare VAR_FACING, 3
-	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
-	compare VAR_FACING, 4
-	goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFBF
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE
-	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7
-	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFC4
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7
-	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA
-	setflag FLAG_0x3C5
-	playse SE_KAIDAN
-	removeobject 13
-	release
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5
-	msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, 4
-	release
-	end
-
-SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF
-	step_14
-	step_13
-	step_12
-	step_25
-	step_end
-
-SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4
-	step_14
-	step_25
-	step_end
-
-SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7
-	step_00
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
-
-SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
-
-SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5
-	.string "Welcome to the OCEANIC MUSEUM.\p"
-	.string "The entrance fee is ¥50.\n"
-	.string "Would you like to enter?$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026
-	.string "Please enjoy yourself.$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D
-	.string "Oh? I’m sorry, but you don’t seem to\n"
-	.string "have enough money.$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075
-	.string "Oh? You’re with that group that\n"
-	.string "went in earlier?\p"
-	.string "You’re the only one who’s late.\n"
-	.string "You’d better go catch up to them!$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8
-	.string "We, TEAM AQUA, exist for the good\n"
-	.string "of all!$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112
-	.string "We were told to assemble here,\n"
-	.string "so we did, but…\p"
-	.string "Our BOSS, the linchpin, isn’t here.$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165
-	.string "If I ripped off the stuff here,\n"
-	.string "would it make me rich?$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C
-	.string "What I learn here, I can put to use on\n"
-	.string "nefarious deeds…$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4
-	.string "If our goons didn’t bungle things\n"
-	.string "in RUSTBORO, we wouldn’t be here!$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218
-	.string "I didn’t have ¥50, so it took a long\n"
-	.string "time getting by the receptionist.$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F
-	.string "I want to learn about the sea and\n"
-	.string "use that knowledge for battling.$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B2A2: @ 820B2A2
-	.string "I get all giddy and gooey when\n"
-	.string "I see the sea!\p"
-	.string "For me, CAPT. STERN is the number\n"
-	.string "one role model!$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302
-	.string "The sea is vast without end, and\n"
-	.string "infinitely deep…\p"
-	.string "There must be many POKéMON that\n"
-	.string "we don’t know about.$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369
-	.string "I want a sea POKéMON.\p"
-	.string "I think it would feel cool and nice\n"
-	.string "to hug.$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB
-	.string "Aiyeeeh!\n"
-	.string "What are you doing here?\p"
-	.string "Me? I’m the TEAM AQUA member\n"
-	.string "you thumped before, remember?\l"
-	.string "Back in RUSTURF TUNNEL?\p"
-	.string "Here, take this!\n"
-	.string "You have to forgive me!$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B449: @ 820B449
-	.string "That TM, it suits you more than it\n"
-	.string "does me.\p"
-	.string "Hope I never see you again!\n"
-	.string "Wahahaha!$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B49B: @ 820B49B
-	.string "Awww, come on!\n"
-	.string "You have to take this and let me go!$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B4CF: @ 820B4CF
-	.string "A blue fluid is spiraling inside\n"
-	.string "a glass vessel.\p"
-	.string "“This is an experiment to create a\n"
-	.string "WHIRLPOOL artificially using wind.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547
-	.string "A red ball is bobbing up and down\n"
-	.string "inside a glass vessel.\p"
-	.string "“This is an experiment simulating a\n"
-	.string "WATERFALL using the ball’s buoyancy.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA
-	.string "It’s a sample of soil from the ocean\n"
-	.string "floor.\p"
-	.string "“Over many years, the remains of\n"
-	.string "life-forms settle at the bottom of\l"
-	.string "the sea, making sedimentary layers.\p"
-	.string "“By analyzing these layers, the\n"
-	.string "ancient past is revealed.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699
-	.string "It’s a sample of beach sand.\p"
-	.string "“Stones from mountains are washed\n"
-	.string "down by rivers where they are\l"
-	.string "chipped and ground down.\p"
-	.string "“They are reduced to grains and end\n"
-	.string "up as sand on beaches.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B
-	.string "“OCEANIC MINIFACT 1\n"
-	.string "Why is seawater blue?\p"
-	.string "“Light is composed of many colors.\p"
-	.string "“When light passes through water,\n"
-	.string "most kinds of light lose color.\p"
-	.string "“However, blue light retains its\n"
-	.string "color, making the sea appear blue.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F
-	.string "“OCEANIC MINIFACT 2\n"
-	.string "Why is the sea salty?\p"
-	.string "“Seawater contains dissolved salt in\n"
-	.string "the form of sodium and chlorine ions.\p"
-	.string "“These ions leech out of rocks\n"
-	.string "and are carried out to sea by rain.\p"
-	.string "“The concentration of dissolved salt\n"
-	.string "makes the sea salty.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912
-	.string "“OCEANIC MINIFACT 3\n"
-	.string "Which is bigger? The sea or land?\p"
-	.string "“The sea covers about 70% of\n"
-	.string "the planet, and the rest is land.\p"
-	.string "“The sea is therefore more than twice\n"
-	.string "the size of land.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0
-	.string "It’s a fossil with wavy ridges on it.\p"
-	.string "“Soil on the ocean floor gets scoured\n"
-	.string "by the tide.\p"
-	.string "“The flowing seawater marks the soil\n"
-	.string "with small ridges and valleys.\p"
-	.string "“If this soil becomes fossilized, it is\n"
-	.string "called a ripple mark.”$"
-
-SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C
-	.string "A strange machine is rotating under\n"
-	.string "a glass dome.\p"
-	.string "Maybe it’s for measuring the depth\n"
-	.string "of something…$"
-
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
deleted file mode 100644
index a7a24757f..000000000
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ /dev/null
@@ -1,441 +0,0 @@
-SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF
-	.byte 0
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
-	lock
-	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4
-	closemessage
-	playbgm MUS_AQA_0, 1
-	addobject 3
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4
-	waitmovement 0
-	addobject 4
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF3
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5
-	waitmovement 0
-	compare VAR_FACING, 1
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92
-	compare VAR_FACING, 4
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4
-	compare VAR_FACING, 4
-	call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4
-	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
-	waitmovement 0
-	compare VAR_FACING, 1
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
-	compare VAR_FACING, 3
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
-	trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4
-	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, 4
-	trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, 4
-	closemessage
-	delay 35
-	addobject 2
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, 4
-	closemessage
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4
-	closemessage
-	savebgm MUS_DUMMY
-	fadedefaultbgm
-	fadescreen 1
-	removeobject 2
-	removeobject 3
-	removeobject 4
-	fadescreen 0
-	delay 30
-	setflag FLAG_0x373
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4
-	setvar VAR_0x8004, 269
-	call SlateportCity_OceanicMuseum_2F_EventScript_2723E4
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4
-	closemessage
-	fadescreen 1
-	playfanfare MUS_ME_ASA
-	waitfanfare
-	special HealPlayerParty
-	removeobject 1
-	setflag FLAG_0x384
-	compare VAR_0x40DA, 0
-	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C
-	setflag FLAG_0x095
-	clearflag FLAG_0x3B3
-	setflag FLAG_0x3B5
-	setvar VAR_0x40D2, 1
-	fadescreen 0
-	release
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C
-	setvar VAR_0x40DA, 1
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A4
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D
-	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_2725A4
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCBE
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCC2
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE
-	step_left
-	step_down
-	step_27
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2
-	step_up
-	step_left
-	step_left
-	step_down
-	step_27
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_13
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4
-	step_down
-	step_right
-	step_25
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF
-	step_40
-	step_left
-	step_41
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3
-	step_down
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_15
-	step_26
-	step_end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, 2
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, 2
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76
-	lock
-	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2
-	waitmovement 0
-	release
-	end
-
-SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D
-	.string "Yes? If you’re looking for STERN,\n"
-	.string "that would be me.\p"
-	.string "Ah! Those must be the parts I ordered\n"
-	.string "from MR. STONE of DEVON.\p"
-	.string "Thank you! That’s great!\n"
-	.string "We can prepare for our expedition now.$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40
-	.string "Hehehe, hold it!\n"
-	.string "We’ll take those parts!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69
-	.string "CAPT. STERN: Wh-what?\n"
-	.string "Who are you people?$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93
-	.string "We’re TEAM AQUA!\p"
-	.string "Our BOSS wants those parts!\n"
-	.string "Shut your yap and fork them over!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BEE2: @ 820BEE2
-	.string "Awaaaah!\n"
-	.string "A kid beat me!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BEFA: @ 820BEFA
-	.string "Oh, man, what a disaster…\n"
-	.string "The BOSS is going to be furious…$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BF35: @ 820BF35
-	.string "Humph, sniveling wimp!\n"
-	.string "Let me take care of this!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66
-	.string "What?!\n"
-	.string "I lost, too!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A
-	.string "Now what? If we don’t get the parts,\n"
-	.string "we’re in for it!\p"
-	.string "Arrgh, I didn’t count on being meddled\n"
-	.string "with by some meddling kid!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2
-	.string "I came to see what was taking so\n"
-	.string "long to snatch some parts, and you\l"
-	.string "simps are held up by a mere child?$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059
-	.string "We are TEAM AQUA,\n"
-	.string "and we love the sea!\p"
-	.string "And I am TEAM AQUA’s leader,\n"
-	.string "ARCHIE!\p"
-	.string "What makes you interfere with us?\p"
-	.string "…No! You can’t be!\n"
-	.string "You’re not one of TEAM MAGMA?\p"
-	.string "Wait, that can’t be right.\n"
-	.string "You’re not dressed for the part.\p"
-	.string "… … … … … …\n"
-	.string "… … … … … …\p"
-	.string "POKéMON, people… All life depends on\n"
-	.string "the sea.\p"
-	.string "So, TEAM AQUA is dedicated to\n"
-	.string "the expansion of the sea.\p"
-	.string "Don’t you agree? What we are doing\n"
-	.string "is a magnificent undertaking.\p"
-	.string "Ah, fine…\n"
-	.string "You’re still too young to understand\l"
-	.string "our noble objective.\p"
-	.string "But, I warn you, don’t even consider\n"
-	.string "interfering with our plans again.\p"
-	.string "The consequences will cost you\n"
-	.string "dearly!\p"
-	.string "And don’t you forget it!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE
-	.string "CAPT. STERN: You’re…\n"
-	.string "Ah, okay, you’re {PLAYER}{KUN}…\p"
-	.string "Anyway, that was a tense situation!\n"
-	.string "Thank you for saving us!\p"
-	.string "Oh, yes, I almost forgot that you\n"
-	.string "even brought the parts from DEVON!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C
-	.string "CAPT. STERN: Whoops!\n"
-	.string "There’s no time to lose!\p"
-	.string "We have to set out on our ocean-floor\n"
-	.string "expedition really soon.\p"
-	.string "Thanks again, but now I’ve got\n"
-	.string "to go!\p"
-	.string "Feel free to wander around and check\n"
-	.string "out our facilities, though.$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F
-	.string "I saw a model of a ship here.\p"
-	.string "It reminded me of the ABANDONED SHIP\n"
-	.string "near DEWFORD TOWN…$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495
-	.string "Don’t you dare run around inside\n"
-	.string "the MUSEUM!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2
-	.string "Wow, the submarine’s awesome!\n"
-	.string "I want to go for a ride!$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9
-	.string "“WATER QUALITY SAMPLE 1,” the\n"
-	.string "label says.\p"
-	.string "The sea is all connected, but the\n"
-	.string "water seems to differ by region.$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C566: @ 820C566
-	.string "“WATER QUALITY SAMPLE 2,” the\n"
-	.string "label says.\p"
-	.string "Does the saltiness of seawater differ\n"
-	.string "by region, too?$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6
-	.string "A rubber ball is expanding and\n"
-	.string "shrinking.\p"
-	.string "“In the sea, the weight of water itself\n"
-	.string "exerts pressure.\p"
-	.string "“In shallow water, the pressure is not\n"
-	.string "very heavy.\p"
-	.string "“However, in extremely deep water,\n"
-	.string "the pressure can reach even tens of\l"
-	.string "thousands of tons on a small area.”$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7
-	.string "“MODEL OF HOENN REGION”\p"
-	.string "It’s a miniature diorama of the\n"
-	.string "HOENN region.\p"
-	.string "Where is LITTLEROOT TOWN on this?$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F
-	.string "It’s a display on the flow of seawater.\p"
-	.string "“Near the bottom of the sea, water\n"
-	.string "flows due to differences in such\l"
-	.string "factors as temperature and salinity.”$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1
-	.string "It’s a display on the flow of seawater.\p"
-	.string "“Toward the surface, seawater flows\n"
-	.string "as currents driven by the winds.”$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F
-	.string "“THE FERRY S.S. TIDAL\p"
-	.string "“A scale replica of the ship under\n"
-	.string "construction at STERN’S SHIPYARD.”$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B
-	.string "“SUBMARINE EXPLORER 1\p"
-	.string "“A replica of the high-performance\n"
-	.string "ocean floor exploration submarine.”$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C8E8: @ 820C8E8
-	.string "“SUBMERSIBLE POD\p"
-	.string "“A replica of a compact, unmanned\n"
-	.string "pod for seafloor exploration.”$"
-
-SlateportCity_OceanicMuseum_2F_Text_20C93A: @ 820C93A
-	.string "“S.S. ANNE\p"
-	.string "“A replica of the luxury liner that\n"
-	.string "circles the globe.”$"
-
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
deleted file mode 100644
index 793b6f4fd..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 SpawnScriptFieldObject
-	applymovement 127, SootopolisCity_Movement_1E5A68
-	waitmovement 0
-	special RemoveScriptFieldObject
-	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 SpawnScriptFieldObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement 127, SootopolisCity_Movement_1E5A75
-	waitmovement 0
-	special RemoveScriptFieldObject
-	setvar VAR_0x405E, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	releaseall
-	end
-
-SootopolisCity_Movement_1E5A68: @ 81E5A68
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_92
-	step_end
-
-SootopolisCity_Movement_1E5A75: @ 81E5A75
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_end
-
-SootopolisCity_EventScript_1E5A82:: @ 81E5A82
-	delay 60
-	special SpawnScriptFieldObject
-	applymovement 127, SootopolisCity_Movement_1E5BA4
-	waitmovement 0
-	special RemoveScriptFieldObject
-	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 SpawnScriptFieldObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement 127, SootopolisCity_Movement_1E5BAE
-	waitmovement 0
-	special RemoveScriptFieldObject
-	setvar VAR_0x405E, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
-	releaseall
-	end
-
-SootopolisCity_Movement_1E5BA4: @ 81E5BA4
-	step_91
-	step_91
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-SootopolisCity_Movement_1E5BAE: @ 81E5BAE
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_92
-	step_92
-	step_end
-
-SootopolisCity_Movement_1E5BB8: @ 81E5BB8
-	step_1b
-	step_1b
-	step_1b
-	step_14
-	step_14
-	step_14
-	step_5e
-	step_96
-	step_5f
-	step_end
-
-SootopolisCity_Movement_1E5BC2: @ 81E5BC2
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_5e
-	step_96
-	step_5f
-	step_end
-
-SootopolisCity_Movement_1E5BCF: @ 81E5BCF
-	step_40
-	step_right
-	step_14
-	step_14
-	step_14
-	step_41
-	step_end
-
-SootopolisCity_Movement_1E5BD6: @ 81E5BD6
-	step_1b
-	step_1b
-	step_1b
-	step_1b
-	step_1b
-	step_1b
-	step_end
-
-SootopolisCity_Movement_1E5BDD: @ 81E5BDD
-	step_1c
-	step_1c
-	step_1c
-	step_14
-	step_14
-	step_14
-	step_18
-	step_end
-
-SootopolisCity_Movement_1E5BE5: @ 81E5BE5
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_18
-	step_end
-
-SootopolisCity_Movement_1E5BF0: @ 81E5BF0
-	step_40
-	step_left
-	step_14
-	step_14
-	step_14
-	step_41
-	step_end
-
-SootopolisCity_Movement_1E5BF7: @ 81E5BF7
-	step_1c
-	step_1c
-	step_1c
-	step_1c
-	step_1c
-	step_1c
-	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 SpawnScriptFieldObject
-	applymovement 127, SootopolisCity_Movement_1E5A68
-	waitmovement 0
-	special RemoveScriptFieldObject
-	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 SpawnScriptFieldObject
-	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 SpawnScriptFieldObject
-	applymovement 127, SootopolisCity_Movement_1E5BA4
-	waitmovement 0
-	special RemoveScriptFieldObject
-	delay 60
-	fadescreenspeed 1, 8
-	call SootopolisCity_EventScript_1E5D82
-	removeobject 9
-	removeobject 10
-	addobject 11
-	setvar VAR_0x8004, 1
-	special sub_813B7D8
-	waitstate
-	special SpawnScriptFieldObject
-	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
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_end
-
-SootopolisCity_Movement_1E5E63: @ 81E5E63
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-SootopolisCity_Movement_1E5E68: @ 81E5E68
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-SootopolisCity_Movement_1E5E6D: @ 81E5E6D
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-SootopolisCity_Movement_1E5E72: @ 81E5E72
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_91
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SootopolisCity_Movement_1E5E7F: @ 81E5E7F
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_92
-	step_92
-	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
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-SootopolisCity_Movement_1E628C: @ 81E628C
-	step_left
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-SootopolisCity_Movement_1E62B0: @ 81E62B0
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-SootopolisCity_Movement_1E62D4: @ 81E62D4
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_12
-	step_27
-	step_14
-	step_14
-	step_right
-	step_up
-	step_up
-	step_end
-
-SootopolisCity_Movement_1E630E: @ 81E630E
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_end
-
-SootopolisCity_Movement_1E6341: @ 81E6341
-	slow_step_left
-	step_28
-	step_end
-
-SootopolisCity_Movement_1E6344: @ 81E6344
-	step_down
-	step_down
-	step_left
-	step_13
-	step_right
-	step_up
-	step_up
-	step_up
-	step_right
-	step_27
-	step_end
-
-SootopolisCity_Movement_1E634F: @ 81E634F
-	step_14
-	step_14
-	step_14
-	step_13
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_28
-	step_end
-
-SootopolisCity_Movement_1E635A: @ 81E635A
-	step_up
-	step_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
-	step_right
-	step_25
-	step_end
-
-SootopolisCity_Movement_1E64EF: @ 81E64EF
-	step_left
-	step_25
-	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
-	step_98
-	step_end
-
-SootopolisCity_Movement_1E656D:: @ 81E656D
-	step_9A
-	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 6a53dc57c..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
-	step_54
-	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 54ade5181..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
-	step_down
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21
-	step_right
-	step_25
-	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
-	step_14
-	step_up
-	step_up
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38
-	step_14
-	step_right
-	step_up
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C
-	step_14
-	step_left
-	step_up
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40
-	step_left
-	step_28
-	step_end
-
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43
-	step_right
-	step_27
-	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 5a4a09735..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
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_end
-
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
deleted file mode 100644
index 8784a6424..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
-	step_down
-	step_end
-
-BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39
-	step_left
-	step_25
-	step_end
-
-SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C
-	msgbox SouthernIsland_Exterior_Text_2A6AD5, 3
-	end
-
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
deleted file mode 100644
index b7d4e101c..000000000
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ /dev/null
@@ -1,167 +0,0 @@
-SouthernIsland_Interior_MapScripts:: @ 8242A45
-	map_script 5, SouthernIsland_Interior_MapScript1_242A50
-	map_script 3, SouthernIsland_Interior_MapScript1_242A6E
-	.byte 0
-
-SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, SouthernIsland_Interior_EventScript_242A5A
-	end
-
-SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, SouthernIsland_Interior_EventScript_27374E
-	removeobject 2
-	return
-
-SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E
-	compare VAR_0x40D5, 0
-	call_if 1, SouthernIsland_Interior_EventScript_242A8A
-	compare VAR_0x40D5, 0
-	call_if 5, SouthernIsland_Interior_EventScript_242A95
-	call SouthernIsland_Interior_EventScript_242AA0
-	end
-
-SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A
-	setvar VAR_OBJ_GFX_ID_1, 188
-	setvar VAR_TEMP_4, 408
-	return
-
-SouthernIsland_Interior_EventScript_242A95:: @ 8242A95
-	setvar VAR_OBJ_GFX_ID_1, 187
-	setvar VAR_TEMP_4, 407
-	return
-
-SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_eq SouthernIsland_Interior_EventScript_242AB8
-	compare VAR_RESULT, 1
-	goto_eq SouthernIsland_Interior_EventScript_242ABE
-	end
-
-SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8
-	setvar VAR_OBJ_GFX_ID_0, 100
-	return
-
-SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE
-	setvar VAR_OBJ_GFX_ID_0, 105
-	return
-
-SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4
-	lockall
-	setvar VAR_0x8008, 12
-	goto SouthernIsland_Interior_EventScript_242AD0
-	end
-
-SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
-	checkflag FLAG_0x002
-	goto_eq SouthernIsland_Interior_EventScript_242B9A
-	checkflag FLAG_0x1C8
-	goto_eq SouthernIsland_Interior_EventScript_242B9A
-	checkflag FLAG_0x1C9
-	goto_eq SouthernIsland_Interior_EventScript_242B9A
-	checkflag FLAG_SYS_HAS_EON_TICKET
-	goto_if 0, SouthernIsland_Interior_EventScript_242B9A
-	setflag FLAG_0x0CE
-	setflag FLAG_0x002
-	special SpawnScriptFieldObject
-	applymovement 127, SouthernIsland_Interior_Movement_242BCA
-	waitmovement 0
-	delay 50
-	waitse
-	playmoncry VAR_TEMP_4, 0
-	delay 30
-	waitmoncry
-	addobject 2
-	delay 30
-	applymovement 127, SouthernIsland_Interior_Movement_242BCE
-	applymovement 2, SouthernIsland_Interior_Movement_242BDA
-	waitmovement 0
-	delay 50
-	special RemoveScriptFieldObject
-	setvar VAR_LAST_TALKED, 2
-	compare VAR_0x40D5, 0
-	call_if 1, SouthernIsland_Interior_EventScript_242BA4
-	compare VAR_0x40D5, 0
-	call_if 5, SouthernIsland_Interior_EventScript_242BB7
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special BattleSetup_StartLatiBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq SouthernIsland_Interior_EventScript_242B81
-	compare VAR_RESULT, 4
-	goto_eq SouthernIsland_Interior_EventScript_242B8F
-	compare VAR_RESULT, 5
-	goto_eq SouthernIsland_Interior_EventScript_242B8F
-	setflag FLAG_0x1C9
-	releaseall
-	end
-
-SouthernIsland_Interior_EventScript_242B81:: @ 8242B81
-	setflag FLAG_0x1C8
-	copyvar VAR_0x8004, VAR_TEMP_4
-	goto SouthernIsland_Interior_EventScript_273776
-	end
-
-SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F
-	copyvar VAR_0x8004, VAR_TEMP_4
-	goto SouthernIsland_Interior_EventScript_273776
-	end
-
-SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A
-	msgbox SouthernIsland_Interior_Text_2A6AA1, 4
-	releaseall
-	end
-
-SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4
-	setvar VAR_0x8004, 408
-	setvar VAR_0x8005, 50
-	setvar VAR_0x8006, 191
-	special CreateObedientEnemyMon
-	return
-
-SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7
-	setvar VAR_0x8004, 407
-	setvar VAR_0x8005, 50
-	setvar VAR_0x8006, 191
-	special CreateObedientEnemyMon
-	return
-
-SouthernIsland_Interior_Movement_242BCA: @ 8242BCA
-	step_up
-	step_up
-	step_up
-	step_end
-
-SouthernIsland_Interior_Movement_242BCE: @ 8242BCE
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_26
-	step_end
-
-SouthernIsland_Interior_Movement_242BDA: @ 8242BDA
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc
deleted file mode 100644
index be532733d..000000000
--- a/data/scripts/maps/TerraCave_End.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-TerraCave_End_MapScripts:: @ 823B0B0
-	map_script 5, TerraCave_End_MapScript1_23B0BB
-	map_script 3, TerraCave_End_MapScript1_23B0D9
-	.byte 0
-
-TerraCave_End_MapScript1_23B0BB: @ 823B0BB
-	checkflag FLAG_SYS_CTRL_OBJ_DELETE
-	call_if 1, TerraCave_End_EventScript_23B0C5
-	end
-
-TerraCave_End_EventScript_23B0C5:: @ 823B0C5
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 7
-	goto_if 5, TerraCave_End_EventScript_27374E
-	removeobject 1
-	return
-
-TerraCave_End_MapScript1_23B0D9: @ 823B0D9
-	checkflag FLAG_0x1BF
-	call_if 0, TerraCave_End_EventScript_23B0E3
-	end
-
-TerraCave_End_EventScript_23B0E3:: @ 823B0E3
-	clearflag FLAG_0x30F
-	setvar VAR_TEMP_1, 1
-	return
-
-TerraCave_End_EventScript_23B0EC:: @ 823B0EC
-	lockall
-	applymovement 255, TerraCave_End_Movement_2725B2
-	waitmovement 0
-	applymovement 1, TerraCave_End_Movement_23B16E
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_GROUDON, 2
-	delay 40
-	waitmoncry
-	setvar VAR_LAST_TALKED, 1
-	setwildbattle SPECIES_GROUDON, 70, ITEM_NONE
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special BattleSetup_StartLegendaryBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	setvar VAR_TEMP_1, 0
-	specialvar VAR_RESULT, sub_8138B80
-	compare VAR_RESULT, 1
-	goto_eq TerraCave_End_EventScript_23B155
-	compare VAR_RESULT, 4
-	goto_eq TerraCave_End_EventScript_23B163
-	compare VAR_RESULT, 5
-	goto_eq TerraCave_End_EventScript_23B163
-	setvar VAR_0x4039, 1
-	setflag FLAG_0x1BF
-	releaseall
-	end
-
-TerraCave_End_EventScript_23B155:: @ 823B155
-	setvar VAR_0x4039, 1
-	setflag FLAG_0x1BF
-	goto TerraCave_End_EventScript_27376D
-	end
-
-TerraCave_End_EventScript_23B163:: @ 823B163
-	setvar VAR_0x8004, 405
-	goto TerraCave_End_EventScript_273776
-	end
-
-TerraCave_End_Movement_23B16E: @ 823B16E
-	step_5e
-	step_62
-	step_14
-	step_14
-	step_63
-	step_14
-	step_14
-	step_63
-	step_end
-
diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc
deleted file mode 100644
index 7886f91b8..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
-	step_up
-	step_up
-	step_right
-	step_00
-	step_end
-
-TrainerHill_Elevator_Movement_2693E4: @ 82693E4
-	step_14
-	step_left
-	step_end
-
-TrainerHill_Elevator_Movement_2693E7: @ 82693E7
-	step_14
-	step_down
-	step_down
-	step_end
-
-TrainerHill_Elevator_Movement_2693EB: @ 82693EB
-	step_00
-	step_14
-	step_end
-
-TrainerHill_Elevator_Movement_2693EE: @ 82693EE
-	step_03
-	step_end
-
-TrainerHill_Elevator_Movement_2693F0: @ 82693F0
-	step_00
-	step_end
-
diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc
deleted file mode 100644
index 6dc934f3c..000000000
--- a/data/scripts/maps/TrainerHill_Entrance.inc
+++ /dev/null
@@ -1,476 +0,0 @@
-TrainerHill_Entrance_MapScripts:: @ 82680AC
-	map_script 5, TrainerHill_Entrance_MapScript1_2680D0
-	map_script 7, TrainerHill_Entrance_MapScript1_26811B
-	map_script 3, TrainerHill_Entrance_MapScript1_2680C6
-	map_script 1, TrainerHill_Entrance_MapScript1_268128
-	map_script 2, TrainerHill_Entrance_MapScript2_26813E
-	.byte 0
-
-TrainerHill_Entrance_MapScript1_2680C6: @ 82680C6
-	setflag FLAG_LANDMARK_TRAINER_HILL
-	getplayerxy VAR_TEMP_D, VAR_RESULT
-	end
-
-TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
-	end
-
-TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
-	setvar VAR_0x8004, 4
-	special sp194_trainer_tower
-	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, 9
-	special sp194_trainer_tower
-	compare VAR_RESULT, 0
-	goto_eq TrainerHill_Entrance_EventScript_2680FF
-	setobjectxy 255, 9, 6
-	applymovement 255, TrainerHill_Entrance_Movement_26837F
-	end
-
-TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
-	setvar VAR_0x8004, 16
-	special sp194_trainer_tower
-	compare VAR_RESULT, 1
-	goto_eq TrainerHill_Entrance_EventScript_26811A
-	applymovement 255, TrainerHill_Entrance_Movement_26837F
-	end
-
-TrainerHill_Entrance_EventScript_26811A:: @ 826811A
-	end
-
-TrainerHill_Entrance_MapScript1_26811B: @ 826811B
-	addobject 2
-	addobject 1
-	addobject 5
-	addobject 4
-	end
-
-TrainerHill_Entrance_MapScript1_268128: @ 8268128
-	compare VAR_TEMP_D, 17
-	call_if 1, TrainerHill_Entrance_EventScript_268134
-	end
-
-TrainerHill_Entrance_EventScript_268134:: @ 8268134
-	setmetatile 17, 10, 775, 0
-	return
-
-TrainerHill_Entrance_MapScript2_26813E: @ 826813E
-	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182
-	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160
-	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229
-	map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF
-	.2byte 0
-
-TrainerHill_Entrance_EventScript_268160:: @ 8268160
-	lockall
-	applymovement 255, TrainerHill_Entrance_Movement_268385
-	waitmovement 0
-	setmetatile 17, 10, 820, 1
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	waitse
-	setvar VAR_TEMP_D, 0
-	releaseall
-	end
-
-TrainerHill_Entrance_EventScript_268182:: @ 8268182
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 6
-	special sp194_trainer_tower
-	switch VAR_RESULT
-	case 0, TrainerHill_Entrance_EventScript_2681B5
-	case 1, TrainerHill_Entrance_EventScript_2681CA
-	case 2, TrainerHill_Entrance_EventScript_2681EE
-
-TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5
-	lockall
-	applymovement 255, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268689, 4
-	goto TrainerHill_Entrance_EventScript_2681DA
-
-TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA
-	lockall
-	applymovement 255, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268712, 4
-
-TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
-	closemessage
-	applymovement 255, TrainerHill_Entrance_Movement_268381
-	waitmovement 0
-	setvar VAR_0x40D6, 0
-	special HealPlayerParty
-	releaseall
-
-TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE
-	end
-
-TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
-	setvar VAR_0x800B, 2
-	call TrainerHill_Entrance_EventScript_27191E
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
-	lock
-	faceplayer
-	setvar VAR_0x8004, 10
-	special sp194_trainer_tower
-	compare VAR_RESULT, 0
-	goto_eq TrainerHill_Entrance_EventScript_26821F
-	msgbox TrainerHill_Entrance_Text_2686F4, 4
-	goto TrainerHill_Entrance_EventScript_268227
-
-TrainerHill_Entrance_EventScript_26821F:: @ 826821F
-	msgbox TrainerHill_Entrance_Text_2687AC, 4
-
-TrainerHill_Entrance_EventScript_268227:: @ 8268227
-	release
-	end
-
-TrainerHill_Entrance_EventScript_268229:: @ 8268229
-	lockall
-	applymovement 255, TrainerHill_Entrance_Movement_26837F
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, TrainerHill_Entrance_EventScript_26836A
-	msgbox TrainerHill_Entrance_Text_2684C6, 4
-	setvar VAR_0x8004, 13
-	special sp194_trainer_tower
-	compare VAR_RESULT, 0
-	call_if 1, TrainerHill_Entrance_EventScript_26832E
-	setvar VAR_0x8004, 8
-	special sp194_trainer_tower
-	compare VAR_RESULT, 1
-	goto_eq TrainerHill_Entrance_EventScript_268275
-	msgbox TrainerHill_Entrance_Text_268564, 4
-	goto TrainerHill_Entrance_EventScript_26827D
-
-TrainerHill_Entrance_EventScript_268275:: @ 8268275
-	msgbox TrainerHill_Entrance_Text_26859E, 4
-
-TrainerHill_Entrance_EventScript_26827D:: @ 826827D
-	message TrainerHill_Entrance_Text_2685F8
-	waitmessage
-	multichoice 15, 6, 17, 0
-	switch VAR_RESULT
-	case 0, TrainerHill_Entrance_EventScript_2682C8
-	case 1, TrainerHill_Entrance_EventScript_268314
-	case 2, TrainerHill_Entrance_EventScript_2682BA
-	case 127, TrainerHill_Entrance_EventScript_268314
-	end
-
-TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA
-	msgbox TrainerHill_Entrance_Text_2687C3, 4
-	goto TrainerHill_Entrance_EventScript_26827D
-	end
-
-TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
-	multichoice 13, 2, 113, 0
-	switch VAR_RESULT
-	case 4, TrainerHill_Entrance_EventScript_268314
-	case 127, TrainerHill_Entrance_EventScript_268314
-	setvar VAR_0x8004, 17
-	copyvar VAR_0x8005, VAR_RESULT
-	special sp194_trainer_tower
-	setvar VAR_0x40D6, 1
-	setvar VAR_TEMP_5, 0
-	special HealPlayerParty
-	msgbox TrainerHill_Entrance_Text_26862A, 4
-	setvar VAR_0x8004, 0
-	special sp194_trainer_tower
-	releaseall
-	end
-
-TrainerHill_Entrance_EventScript_268314:: @ 8268314
-	setvar VAR_TEMP_5, 0
-	msgbox TrainerHill_Entrance_Text_26866F, 4
-	closemessage
-	applymovement 255, TrainerHill_Entrance_Movement_268381
-	waitmovement 0
-	releaseall
-	end
-
-TrainerHill_Entrance_EventScript_26832E:: @ 826832E
-	msgbox TrainerHill_Entrance_Text_26851C, 4
-	setvar VAR_0x8004, 14
-	special sp194_trainer_tower
-	setvar VAR_TEMP_5, 1
-	call TrainerHill_Entrance_EventScript_27134F
-	compare VAR_RESULT, 0
-	goto_eq TrainerHill_Entrance_EventScript_26835C
-	setvar VAR_0x8004, 14
-	special sp194_trainer_tower
-	return
-
-TrainerHill_Entrance_EventScript_26835C:: @ 826835C
-	setvar VAR_0x8004, 15
-	special sp194_trainer_tower
-	goto TrainerHill_Entrance_EventScript_268314
-	end
-
-TrainerHill_Entrance_EventScript_26836A:: @ 826836A
-	msgbox TrainerHill_Entrance_Text_268430, 4
-	closemessage
-	applymovement 255, TrainerHill_Entrance_Movement_268381
-	waitmovement 0
-	releaseall
-	end
-
-TrainerHill_Entrance_Movement_26837F: @ 826837F
-	step_03
-	step_end
-
-TrainerHill_Entrance_Movement_268381: @ 8268381
-	step_down
-	step_end
-
-TrainerHill_Entrance_Movement_268383: @ 8268383
-	step_01
-	step_end
-
-TrainerHill_Entrance_Movement_268385: @ 8268385
-	step_down
-	step_down
-	step_end
-
-TrainerHill_Entrance_EventScript_268388:: @ 8268388
-	lockall
-	fadescreen 1
-	special ShowTrainerHillRecords
-	waitstate
-	releaseall
-	end
-
-TrainerHill_Entrance_EventScript_268391:: @ 8268391
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, TrainerHill_Entrance_EventScript_2683A3
-	msgbox TrainerHill_Entrance_Text_268D5A, 2
-	end
-
-TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3
-	msgbox TrainerHill_Entrance_Text_268DDA, 2
-	end
-
-TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if 0, TrainerHill_Entrance_EventScript_2683BE
-	msgbox TrainerHill_Entrance_Text_268E6A, 2
-	end
-
-TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE
-	msgbox TrainerHill_Entrance_Text_268EDC, 2
-	end
-
-TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7
-	lock
-	faceplayer
-	message gUnknown_08272A21
-	waitmessage
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq TrainerHill_Entrance_EventScript_268402
-	pokemart TrainerHill_Entrance_Pokemart_2683E8
-	msgbox gUnknown_08272A3F, 4
-	release
-	end
-
-	.align 2
-TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
-	.2byte ITEM_SUPER_POTION
-	.2byte ITEM_ANTIDOTE
-	.2byte ITEM_PARALYZE_HEAL
-	.2byte ITEM_AWAKENING
-	.2byte ITEM_X_SPEED
-	.2byte ITEM_X_SPECIAL
-	.2byte ITEM_X_ATTACK
-	.2byte ITEM_X_DEFEND
-	.2byte ITEM_DIRE_HIT
-	.2byte ITEM_GUARD_SPEC
-	.2byte ITEM_X_ACCURACY
-	.2byte ITEM_NONE
-	release
-	end
-
-TrainerHill_Entrance_EventScript_268402:: @ 8268402
-	pokemart TrainerHill_Entrance_Pokemart_268414
-	msgbox gUnknown_08272A3F, 4
-	release
-	end
-
-	.align 2
-TrainerHill_Entrance_Pokemart_268414: @ 8268414
-	.2byte ITEM_HYPER_POTION
-	.2byte ITEM_MAX_POTION
-	.2byte ITEM_FULL_RESTORE
-	.2byte ITEM_FULL_HEAL
-	.2byte ITEM_REVIVE
-	.2byte ITEM_X_SPEED
-	.2byte ITEM_X_SPECIAL
-	.2byte ITEM_X_ATTACK
-	.2byte ITEM_X_DEFEND
-	.2byte ITEM_DIRE_HIT
-	.2byte ITEM_GUARD_SPEC
-	.2byte ITEM_X_ACCURACY
-	.2byte ITEM_NONE
-	release
-	end
-
-TrainerHill_Entrance_Text_268430: @ 8268430
-	.string "This is the TRAINER HILL where\n"
-	.string "you may enjoy tag battles with many\l"
-	.string "TRAINERS.\p"
-	.string "Unfortunately, we’re still getting\n"
-	.string "things ready. Please come back later!$"
-
-TrainerHill_Entrance_Text_2684C6: @ 82684C6
-	.string "Welcome!\p"
-	.string "This is the TRAINER HILL where\n"
-	.string "you may enjoy tag battles with many\l"
-	.string "TRAINERS!$"
-
-TrainerHill_Entrance_Text_26851C: @ 826851C
-	.string "Is this your first visit here?\p"
-	.string "Before you enter, please save\n"
-	.string "your game.$"
-
-TrainerHill_Entrance_Text_268564: @ 8268564
-	.string "Let’s see…\n"
-	.string "The TRAINERS here now are…\p"
-	.string "Up to floor no. {STR_VAR_1}.$"
-
-TrainerHill_Entrance_Text_26859E: @ 826859E
-	.string "Let’s see…\n"
-	.string "The TRAINERS here now are…\p"
-	.string "There appear to be TRAINERS gathered\n"
-	.string "in every room.$"
-
-TrainerHill_Entrance_Text_2685F8: @ 82685F8
-	.string "Would you like to challenge the\n"
-	.string "waiting TRAINERS?$"
-
-TrainerHill_Entrance_Text_26862A: @ 826862A
-	.string "I will time your progress.\n"
-	.string "Best of luck!\p"
-	.string "On your marks…\p"
-	.string "Get set…\p"
-	.string "Go!$"
-
-TrainerHill_Entrance_Text_26866F: @ 826866F
-	.string "Please do visit us again!$"
-
-TrainerHill_Entrance_Text_268689: @ 8268689
-	.string "That was too bad.\p"
-	.string "I think you put in a tremendous\n"
-	.string "effort in your battling.\p"
-	.string "Please come back and try again!$"
-
-TrainerHill_Entrance_Text_2686F4: @ 82686F4
-	.string "I hope you give it your best.$"
-
-TrainerHill_Entrance_Text_268712: @ 8268712
-	.string "When the TRAINERS switch places,\n"
-	.string "the movement can be hectic.\p"
-	.string "To avoid the stampede, we moved\n"
-	.string "the reception counter here.\p"
-	.string "I’m sorry for the inconvenience.$"
-
-TrainerHill_Entrance_Text_2687AC: @ 82687AC
-	.string "Thank you for playing!$"
-
-TrainerHill_Entrance_Text_2687C3: @ 82687C3
-	.string "Here at the TRAINER HILL, we conduct\n"
-	.string "an event called the Time Attack.\p"
-	.string "It is a race that measures how long\n"
-	.string "you take to reach our owner on\l"
-	.string "the rooftop from this counter.\p"
-	.string "The fastest times are posted on\n"
-	.string "the Time Board--try competing with\l"
-	.string "your friends.\p"
-	.string "In TRAINER battles along the way,\n"
-	.string "neither Exp. Points nor money will\l"
-	.string "be awarded.$"
-
-TrainerHill_Entrance_Text_26890D: @ 826890D
-	.string "Oh, I’m sorry, but you appear to have\n"
-	.string "only one POKéMON with you.\p"
-	.string "You will need at least two POKéMON\n"
-	.string "to enter this event.$"
-
-TrainerHill_Roof_Text_268986: @ 8268986
-	.string "Hm! Hm!\p"
-	.string "You finally came!\n"
-	.string "Yes, you have arrived!\p"
-	.string "Wait! Don’t say it!\n"
-	.string "I know why you came all the way\l"
-	.string "here by yourself!\p"
-	.string "You wanted to see me, the owner\n"
-	.string "of the TRAINER HILL, because…\p"
-	.string "You want to form a tag team with me!\n"
-	.string "Wa-hoo!\p"
-	.string "…Uh?\n"
-	.string "That’s not it?\p"
-	.string "Anyway, I watched you on your way up.\n"
-	.string "Marvelous battling! Bravo, indeed!$"
-
-TrainerHill_Roof_Text_268AC5: @ 8268AC5
-	.string "For a marvelous someone like you,\n"
-	.string "I have the most marvelous gift!$"
-
-TrainerHill_Roof_Text_268B07: @ 8268B07
-	.string "Oh, no, full up with things!\n"
-	.string "You’ll be back later for this!$"
-
-TrainerHill_Roof_Text_268B43: @ 8268B43
-	.string "Oh, hold on here! Did you possibly get\n"
-	.string "here marvelously quickly?\p"
-	.string "How splendid! You needn’t have\n"
-	.string "hurried so to see me!\p"
-	.string "That is so delightful. I’ll have the Time\n"
-	.string "Board at the reception updated!$"
-
-TrainerHill_Roof_Text_268C03: @ 8268C03
-	.string "But, oh…\n"
-	.string "You weren’t very quick getting here.$"
-
-TrainerHill_Roof_Text_268C31: @ 8268C31
-	.string "Perhaps it would please me more if you\n"
-	.string "arrived zippier next time.\p"
-	.string "Then, I should be pleased to form\n"
-	.string "a tag team with you!\p"
-	.string "Until we meet again, amigo!$"
-
-TrainerHill_Roof_Text_268CC6: @ 8268CC6
-	.string "I had the TRAINER HILL built for but\n"
-	.string "one reason and one only!\p"
-	.string "To find the most suitable partner\n"
-	.string "with whom I may form a tag team!$"
-
-TrainerHill_Entrance_Text_268D47: @ 8268D47
-	.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
-
-TrainerHill_Entrance_Text_268D5A: @ 8268D5A
-	.string "Who knows what sort of TRAINERS\n"
-	.string "and POKéMON combos are ahead?\p"
-	.string "All I know is that I’ll knock aside\n"
-	.string "anyone that stands in my way!$"
-
-TrainerHill_Entrance_Text_268DDA: @ 8268DDA
-	.string "I heard tough TRAINERS come to this\n"
-	.string "TRAINER HILL from all over.\p"
-	.string "I can’t wait to test the waters!\p"
-	.string "I’ll knock aside anyone that stands\n"
-	.string "in my way!$"
-
-TrainerHill_Entrance_Text_268E6A: @ 8268E6A
-	.string "Do you see the Time Board over there?\p"
-	.string "My friends and I are trying to see who\n"
-	.string "can reach the top in the least time.$"
-
-TrainerHill_Entrance_Text_268EDC: @ 8268EDC
-	.string "Do you know when they’re opening\n"
-	.string "this place up?\p"
-	.string "I’m waiting here to be the first\n"
-	.string "challenger ever!$"
-
-TrainerHill_Elevator_Text_268F3E: @ 8268F3E
-	.string "Would you like to return to\n"
-	.string "the reception counter?$"
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 24c319337..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
-	step_54
-	step_end
-
-VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575
-	step_55
-	step_up
-	step_up
-	step_up
-	step_03
-	step_end
-
-VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
-
-VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc
deleted file mode 100644
index 0d0470fc1..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
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3
-	step_up
-
-VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4
-	step_up
-	step_54
-	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 85c5f33c7..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
-	step_up
-	step_up
-	step_up
-	step_end
-
-VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74
-	step_up
-	step_54
-	step_end
-
-VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77
-	step_up
-	step_up
-	step_54
-	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/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
deleted file mode 100644
index 4dd00035a..000000000
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ /dev/null
@@ -1,220 +0,0 @@
-VictoryRoad_1F_MapScripts:: @ 8235D7A
-	map_script 3, VictoryRoad_1F_MapScript1_235D80
-	.byte 0
-
-VictoryRoad_1F_MapScript1_235D80: @ 8235D80
-	compare VAR_0x40C3, 1
-	call_if 1, VictoryRoad_1F_EventScript_235D97
-	compare VAR_0x40C3, 2
-	call_if 1, VictoryRoad_1F_EventScript_235DA3
-	end
-
-VictoryRoad_1F_EventScript_235D97:: @ 8235D97
-	setobjectxyperm 4, 2, 24
-	setobjectmovementtype 4, 8
-	return
-
-VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3
-	setobjectxyperm 4, 3, 24
-	setobjectmovementtype 4, 8
-	return
-
-VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF
-	lockall
-	setvar VAR_0x8008, 1
-	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_235E15
-	waitmovement 0
-	goto VictoryRoad_1F_EventScript_235DE1
-	end
-
-VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8
-	lockall
-	setvar VAR_0x8008, 2
-	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_235E21
-	waitmovement 0
-	goto VictoryRoad_1F_EventScript_235DE1
-	end
-
-VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
-	applymovement 255, VictoryRoad_1F_Movement_2725AA
-	waitmovement 0
-	msgbox VictoryRoad_1F_Text_235EE6, 4
-	trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC
-	msgbox VictoryRoad_1F_Text_236020, 4
-	clearflag FLAG_0x35A
-	moveobjectoffscreen 4
-	setflag FLAG_0x07E
-	copyvar VAR_0x40C3, VAR_0x8008
-	releaseall
-	end
-
-VictoryRoad_1F_Movement_235E15: @ 8235E15
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
-
-VictoryRoad_1F_Movement_235E21: @ 8235E21
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
-
-VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C
-	msgbox VictoryRoad_1F_Text_236020, 2
-	end
-
-VictoryRoad_1F_EventScript_235E35:: @ 8235E35
-	trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
-	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_eq VictoryRoad_1F_EventScript_235E5C
-	msgbox VictoryRoad_1F_Text_2360FE, 6
-	end
-
-VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C
-	trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
-	msgbox VictoryRoad_1F_Text_2360FE, 6
-	end
-
-VictoryRoad_1F_EventScript_235E73:: @ 8235E73
-	trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB
-	msgbox VictoryRoad_1F_Text_2361E5, 6
-	end
-
-VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A
-	trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290
-	msgbox VictoryRoad_1F_Text_2362A4, 6
-	end
-
-VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1
-	trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336
-	msgbox VictoryRoad_1F_Text_236356, 6
-	end
-
-VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8
-	trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4
-	msgbox VictoryRoad_1F_Text_2363D5, 6
-	end
-
-VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF
-	trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7
-	msgbox VictoryRoad_1F_Text_2364BB, 6
-	end
-
-VictoryRoad_1F_Text_235EE6: @ 8235EE6
-	.string "WALLY: Hi! {PLAYER}!\p"
-	.string "I bet you’re surprised to see me here!\p"
-	.string "I made it all the way here, and it’s\n"
-	.string "all thanks to you!\p"
-	.string "{PLAYER}, losing to you that time\n"
-	.string "made me stronger!\p"
-	.string "But I’m not going to lose anymore!\p"
-	.string "I’m going to win! For the POKéMON who\n"
-	.string "gave me courage and strength!\p"
-	.string "Okay… Here I come!$"
-
-VictoryRoad_1F_Text_235FFC: @ 8235FFC
-	.string "Wow!\n"
-	.string "{PLAYER}, you are strong, after all!$"
-
-VictoryRoad_1F_Text_236020: @ 8236020
-	.string "WALLY: I couldn’t beat you today,\n"
-	.string "{PLAYER}, but one of these days, I’ll\l"
-	.string "catch up to you!$"
-
-VictoryRoad_1F_Text_236073: @ 8236073
-	.string "WALLY: Hi! {PLAYER}!\p"
-	.string "I’ve gotten stronger since that last\n"
-	.string "time! I wanted to show you, {PLAYER}!\p"
-	.string "Okay… Here I come!$"
-
-VictoryRoad_1F_Text_2360DA: @ 82360DA
-	.string "Wow!\n"
-	.string "{PLAYER}, you are strong, after all!$"
-
-VictoryRoad_1F_Text_2360FE: @ 82360FE
-	.string "WALLY: I couldn’t beat you this time,\n"
-	.string "too… But one of these days, {PLAYER},\l"
-	.string "I’m going to catch up to you…\p"
-	.string "And challenge the POKéMON LEAGUE!$"
-
-VictoryRoad_1F_Text_236184: @ 8236184
-	.string "I’ve made it this far a couple times,\n"
-	.string "but the last stretch is so long…$"
-
-VictoryRoad_1F_Text_2361CB: @ 82361CB
-	.string "My dream ends here again…$"
-
-VictoryRoad_1F_Text_2361E5: @ 82361E5
-	.string "You’ve made it this far. Keep the\n"
-	.string "momentum going and become the\l"
-	.string "CHAMPION! If anyone can, it’s you!$"
-
-VictoryRoad_1F_Text_236248: @ 8236248
-	.string "I didn’t come all this way to lose now.\n"
-	.string "That possibility doesn’t exist!$"
-
-VictoryRoad_1F_Text_236290: @ 8236290
-	.string "Impossible…\n"
-	.string "I lost?$"
-
-VictoryRoad_1F_Text_2362A4: @ 82362A4
-	.string "I lost here…\p"
-	.string "That means I lack the qualifications\n"
-	.string "to become the CHAMPION…$"
-
-VictoryRoad_1F_Text_2362EE: @ 82362EE
-	.string "This seemingly infinite and harsh road\n"
-	.string "lives up to its name of VICTORY.$"
-
-VictoryRoad_1F_Text_236336: @ 8236336
-	.string "Your battle style is fantastic…$"
-
-VictoryRoad_1F_Text_236356: @ 8236356
-	.string "You seem to have the potential for\n"
-	.string "becoming the CHAMPION.$"
-
-VictoryRoad_1F_Text_236390: @ 8236390
-	.string "What is the VICTORY ROAD?\n"
-	.string "I’ll tell you if you win!$"
-
-VictoryRoad_1F_Text_2363C4: @ 82363C4
-	.string "Okay!\n"
-	.string "Well done!$"
-
-VictoryRoad_1F_Text_2363D5: @ 82363D5
-	.string "Getting through here safely--that’s\n"
-	.string "the final test for any TRAINER aiming\l"
-	.string "to become the POKéMON CHAMPION.\p"
-	.string "That’s why it’s called the VICTORY\n"
-	.string "ROAD.$"
-
-VictoryRoad_1F_Text_236468: @ 8236468
-	.string "I have nothing to say to anyone\n"
-	.string "that’s come this far. Come on!$"
-
-VictoryRoad_1F_Text_2364A7: @ 82364A7
-	.string "This is a disgrace…$"
-
-VictoryRoad_1F_Text_2364BB: @ 82364BB
-	.string "Humph, go right on ahead.\n"
-	.string "See if I care.$"
-
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 8f8d493f8..734831f7f 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -32,7 +32,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763
-	step_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
@@ -119,33 +119,33 @@ LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849
 	return
 
 LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850
-	step_13
-	step_down
-	step_27
-	step_14
-	step_13
-	step_left
+	delay_8
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_8
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857
-	step_right
-	step_up
-	step_13
+	walk_right
+	walk_up
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B
-	step_13
-	step_down
-	step_28
-	step_14
-	step_13
-	step_right
+	delay_8
+	walk_down
+	walk_in_place_fastest_right
+	delay_16
+	delay_8
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862
-	step_left
-	step_up
-	step_13
+	walk_left
+	walk_up
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866
@@ -227,87 +227,87 @@ LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_28
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_27
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999
-	step_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B
-	step_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D
-	step_27
-	step_14
-	step_14
-	step_14
-	step_14
-	step_28
-	step_14
-	step_14
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6
-	step_28
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
-	step_14
-	step_14
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF
-	step_up
-	step_left
-	step_left
+	walk_up
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3
-	step_up
-	step_right
-	step_right
+	walk_up
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7
-	step_left
-	step_28
+	walk_left
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA
-	step_right
-	step_27
+	walk_right
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD
-	step_left
-	step_down
-	step_28
+	walk_left
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1
-	step_right
-	step_down
-	step_27
+	walk_right
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5
@@ -413,31 +413,31 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6
-	step_left
+	walk_left
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE
-	step_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0
-	step_up
+	walk_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2
@@ -641,74 +641,74 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2
-	step_right
-	step_right
+	walk_right
+	walk_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5
-	step_left
-	step_left
+	walk_left
+	walk_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8
-	step_02
+	face_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA
-	step_03
+	face_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC
-	step_down
-	step_right
-	step_down
-	step_13
+	walk_down
+	walk_right
+	walk_down
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1
-	step_down
-	step_left
-	step_down
-	step_13
+	walk_down
+	walk_left
+	walk_down
+	delay_8
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6
-	step_14
-	step_down
-	step_down
-	step_down
-	step_27
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC
-	step_13
-	step_14
-	step_14
-	step_25
+	delay_8
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1
-	step_14
-	step_down
-	step_down
-	step_down
-	step_28
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
 	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
 	step_end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index f694db330..3187c95f4 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -573,7 +573,7 @@ LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
 	end
 
 LilycoveCity_ContestLobby_Movement_294053: @ 8294053
-	step_28
+	walk_in_place_fastest_right
 	step_end
 
 EventScript_PblockLink:: @ 8294055
@@ -608,7 +608,7 @@ EventScript_PblocLink_TryConnect: @ 82940BB
 	call LilycoveCity_ContestLobby_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq EventScript_PblocLink_End
-	specialvar VAR_RESULT, sub_80093CC
+	specialvar VAR_RESULT, IsWirelessAdapterConnected
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_ContestLobby_EventScript_2941ED
 	message Text_PblockLink_Searching
@@ -697,7 +697,7 @@ EventScript_PblocLink_SpawnPartners: @ 82941AA
 	specialvar VAR_RESULT, GetLinkPartnerNames
 	copyvar VAR_0x8008, VAR_RESULT
 	copyvar VAR_0x8004, VAR_0x8008
-	special SpawnLinkPartnerFieldObject
+	special SpawnLinkPartnerEventObject
 	goto EventScript_PblocLink_Arrived
 	end
 
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
 
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index c75fb9b48..76a4ee8f1 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -77,31 +77,31 @@ Route111_EventScript_276680:: @ 8276680
 	end
 
 Route111_Movement_27668A: @ 827668A
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 Route111_Movement_276696: @ 8276696
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
 	step_end
 
 EventScript_2766A2:: @ 82766A2
diff --git a/data/specials.inc b/data/specials.inc
index 1fa17b908..1020b1c80 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64
 	def_special sub_80B3254
 	def_special sub_80B2FD8
 	def_special GetLinkPartnerNames
-	def_special SpawnLinkPartnerFieldObject
+	def_special SpawnLinkPartnerEventObject
 	def_special SavePlayerParty
 	def_special LoadPlayerParty
 	def_special sub_80F9438
 	def_special sp02A_crash_sound
-	def_special FieldObjectInteractionGetBerryTreeData
-	def_special FieldObjectInteractionGetBerryName
-	def_special FieldObjectInteractionGetBerryCountString
+	def_special EventObjectInteractionGetBerryTreeData
+	def_special EventObjectInteractionGetBerryName
+	def_special EventObjectInteractionGetBerryCountString
 	def_special Bag_ChooseBerry
-	def_special FieldObjectInteractionPlantBerryTree
-	def_special FieldObjectInteractionPickBerryTree
-	def_special FieldObjectInteractionRemoveBerryTree
-	def_special FieldObjectInteractionWaterBerryTree
+	def_special EventObjectInteractionPlantBerryTree
+	def_special EventObjectInteractionPickBerryTree
+	def_special EventObjectInteractionRemoveBerryTree
+	def_special EventObjectInteractionWaterBerryTree
 	def_special PlayerHasBerries
 	def_special IsEnigmaBerryValid
 	def_special GetTrainerBattleMode
@@ -115,7 +115,7 @@ gSpecials:: @ 81DBA64
 	def_special ScrSpecial_SetHipsterSpokenFlag
 	def_special ScrSpecial_HipsterTeachWord
 	def_special ScrSpecial_PlayBardSong
-	def_special ScrSpecial_SetMauvilleOldManMapObjGfx
+	def_special ScrSpecial_SetMauvilleOldManEventObjGfx
 	def_special ScrSpecial_GenerateGiddyLine
 	def_special ScrSpecial_GiddyShouldTellAnotherTale
 	def_special ScrSpecial_StorytellerGetFreeStorySlot
@@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64
 	def_special IsTVShowInSearchOfTrainersAiring
 	def_special GabbyAndTyGetLastQuote
 	def_special GabbyAndTyGetLastBattleTrivia
-	def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	def_special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	def_special sub_8138B80
 	def_special GetDaycareMonNicknames
 	def_special GetDaycareState
@@ -286,8 +286,8 @@ gSpecials:: @ 81DBA64
 	def_special GameClear
 	def_special sub_8139A78
 	def_special nullsub_55
-	def_special SpawnScriptFieldObject
-	def_special RemoveScriptFieldObject
+	def_special SpawnScriptEventObject
+	def_special RemoveScriptEventObject
 	def_special GetPokeblockNameByMonNature
 	def_special GetSecretBaseNearbyMapName
 	def_special CheckRelicanthWailord
@@ -297,7 +297,7 @@ gSpecials:: @ 81DBA64
 	def_special WaitWeather
 	def_special sub_8139238
 	def_special sub_8139248
-	def_special player_get_direction_lower_nybble
+	def_special GetPlayerFacingDirection
 	def_special sub_81392AC
 	def_special sub_81392D4
 	def_special sub_81392F8
@@ -423,7 +423,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_81BE79C
 	def_special sub_81BE7F4
 	def_special sub_81398C0
-	def_special sub_80093CC
+	def_special IsWirelessAdapterConnected
 	def_special BerryBlenderLinkBecomeLeader
 	def_special BerryBlenderLinkJoinGroup
 	def_special UnionRoomSpecial