249 files changed, 572 insertions, 572 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index c1b71e5d4..7ee8e6cf2 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -636,12 +636,12 @@ SecretBase_RedCave1_Text_23B759: @ 823B759
 	.include "data/maps/RecordCorner/scripts.inc"
 	.include "data/maps/DoubleBattleColosseum/scripts.inc"
 	.include "data/maps/LinkContestRoom1/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/UnknownLinkContestRoom_25_29/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc"
 	.include "data/maps/LinkContestRoom2/scripts.inc"
 	.include "data/maps/LinkContestRoom3/scripts.inc"
 	.include "data/maps/LinkContestRoom4/scripts.inc"
@@ -5631,346 +5631,346 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E
 	.include "data/text/match_call.inc"
 	.include "data/scripts/apprentice.inc"
 
-gBattleDomeOpponentPotential1::
+gBattleDomeOpponentPotentialText1::
 	.string "The best candidate to be a champ!$"
 
-gBattleDomeOpponentPotential2::
+gBattleDomeOpponentPotentialText2::
 	.string "A sure-finalist team.$"
 
-gBattleDomeOpponentPotential3::
+gBattleDomeOpponentPotentialText3::
 	.string "A likely top-three finisher.$"
 
-gBattleDomeOpponentPotential4::
+gBattleDomeOpponentPotentialText4::
 	.string "A candidate to finish first.$"
 
-gBattleDomeOpponentPotential5::
+gBattleDomeOpponentPotentialText5::
 	.string "A team with top-class potential.$"
 
-gBattleDomeOpponentPotential6::
+gBattleDomeOpponentPotentialText6::
 	.string "The dark horse team this tournament.$"
 
-gBattleDomeOpponentPotential7::
+gBattleDomeOpponentPotentialText7::
 	.string "A better-than-average team.$"
 
-gBattleDomeOpponentPotential8::
+gBattleDomeOpponentPotentialText8::
 	.string "This tournament's average team.$"
 
-gBattleDomeOpponentPotential9::
+gBattleDomeOpponentPotentialText9::
 	.string "A team with average potential.$"
 
-gBattleDomeOpponentPotential10::
+gBattleDomeOpponentPotentialText10::
 	.string "A weaker-than-average team.$"
 
-gBattleDomeOpponentPotential11::
+gBattleDomeOpponentPotentialText11::
 	.string "A team looking for its first win.$"
 
-gBattleDomeOpponentPotential12::
+gBattleDomeOpponentPotentialText12::
 	.string "One win will make this team proud.$"
 
-gBattleDomeOpponentPotential13::
+gBattleDomeOpponentPotentialText13::
 	.string "Overall, a weak team.$"
 
-gBattleDomeOpponentPotential14::
+gBattleDomeOpponentPotentialText14::
 	.string "A team with very low potential.$"
 
-gBattleDomeOpponentPotential15::
+gBattleDomeOpponentPotentialText15::
 	.string "A team unlikely to win the tournament.$"
 
-gBattleDomeOpponentPotential16::
+gBattleDomeOpponentPotentialText16::
 	.string "The team most unlikely to win.$"
 
-gBattleDomeOpponentPotential17::
+gBattleDomeOpponentPotentialText17::
 	.string "The perfect, invincible superstar!$"
 
-gBattleDomeOpponentStyle1::
+gBattleDomeOpponentStyleText1::
 	.string "Willing to risk total disaster at times.$"
 
-gBattleDomeOpponentStyle2::
+gBattleDomeOpponentStyleText2::
 	.string "Skilled at enduring long battles.$"
 
-gBattleDomeOpponentStyle3::
+gBattleDomeOpponentStyleText3::
 	.string "Varies tactics to suit the opponent.$"
 
-gBattleDomeOpponentStyle4::
+gBattleDomeOpponentStyleText4::
 	.string "Has a tough winning pattern.$"
 
-gBattleDomeOpponentStyle5::
+gBattleDomeOpponentStyleText5::
 	.string "Occasionally uses a very rare move.$"
 
-gBattleDomeOpponentStyle6::
+gBattleDomeOpponentStyleText6::
 	.string "Uses startling and disruptive moves.$"
 
-gBattleDomeOpponentStyle7::
+gBattleDomeOpponentStyleText7::
 	.string "Constantly watches HP in battle.$"
 
-gBattleDomeOpponentStyle8::
+gBattleDomeOpponentStyleText8::
 	.string "Good at storing then loosing power.$"
 
-gBattleDomeOpponentStyle9::
+gBattleDomeOpponentStyleText9::
 	.string "Skilled at enfeebling foes.$"
 
-gBattleDomeOpponentStyle10::
+gBattleDomeOpponentStyleText10::
 	.string "Prefers tactics that rely on luck.$"
 
-gBattleDomeOpponentStyle11::
+gBattleDomeOpponentStyleText11::
 	.string "Attacks with a regal atmosphere.$"
 
-gBattleDomeOpponentStyle12::
+gBattleDomeOpponentStyleText12::
 	.string "Attacks with powerful, low-PP moves.$"
 
-gBattleDomeOpponentStyle13::
+gBattleDomeOpponentStyleText13::
 	.string "Skilled at enfeebling, then attacking.$"
 
-gBattleDomeOpponentStyle14::
+gBattleDomeOpponentStyleText14::
 	.string "Battles while enduring all attacks.$"
 
-gBattleDomeOpponentStyle15::
+gBattleDomeOpponentStyleText15::
 	.string "Skilled at upsetting foes emotionally.$"
 
-gBattleDomeOpponentStyle16::
+gBattleDomeOpponentStyleText16::
 	.string "Uses strong and straightforward moves.$"
 
-gBattleDomeOpponentStyle17::
+gBattleDomeOpponentStyleText17::
 	.string "Aggressively uses strong moves.$"
 
-gBattleDomeOpponentStyle18::
+gBattleDomeOpponentStyleText18::
 	.string "Battles while cleverly dodging attacks.$"
 
-gBattleDomeOpponentStyle19::
+gBattleDomeOpponentStyleText19::
 	.string "Skilled at using upsetting attacks.$"
 
-gBattleDomeOpponentStyle20::
+gBattleDomeOpponentStyleText20::
 	.string "Uses many popular moves.$"
 
-gBattleDomeOpponentStyle21::
+gBattleDomeOpponentStyleText21::
 	.string "Has moves for powerful combinations.$"
 
-gBattleDomeOpponentStyle22::
+gBattleDomeOpponentStyleText22::
 	.string "Uses high-probability attacks.$"
 
-gBattleDomeOpponentStyle23::
+gBattleDomeOpponentStyleText23::
 	.string "Aggressively uses spectacular moves.$"
 
-gBattleDomeOpponentStyle24::
+gBattleDomeOpponentStyleText24::
 	.string "Emphasizes offense over defense.$"
 
-gBattleDomeOpponentStyle25::
+gBattleDomeOpponentStyleText25::
 	.string "Emphasizes defense over offense.$"
 
-gBattleDomeOpponentStyle26::
+gBattleDomeOpponentStyleText26::
 	.string "Attacks quickly with strong moves.$"
 
-gBattleDomeOpponentStyle27::
+gBattleDomeOpponentStyleText27::
 	.string "Often uses moves with added effects.$"
 
-gBattleDomeOpponentStyle28::
+gBattleDomeOpponentStyleText28::
 	.string "Uses a well-balanced mix of moves.$"
 
-gBattleDomeOpponentStyleUnused1::
+gBattleDomeOpponentStyleTextUnused1::
 	.string "This is sample message 1.$"
 
-gBattleDomeOpponentStyleUnused2::
+gBattleDomeOpponentStyleTextUnused2::
 	.string "This is sample message 2.$"
 
-gBattleDomeOpponentStyleUnused3::
+gBattleDomeOpponentStyleTextUnused3::
 	.string "This is sample message 3.$"
 
-gBattleDomeOpponentStyleUnused4::
+gBattleDomeOpponentStyleTextUnused4::
 	.string "This is sample message 4.$"
 
-gBattleDomeOpponentStats1::
+gBattleDomeOpponentStatsText1::
 	.string "Emphasizes HP and ATTACK.$"
 
-gBattleDomeOpponentStats2::
+gBattleDomeOpponentStatsText2::
 	.string "Emphasizes HP and DEFENSE.$"
 
-gBattleDomeOpponentStats3::
+gBattleDomeOpponentStatsText3::
 	.string "Emphasizes HP and SPEED.$"
 
-gBattleDomeOpponentStats4::
+gBattleDomeOpponentStatsText4::
 	.string "Emphasizes HP and SP. ATTACK.$"
 
-gBattleDomeOpponentStats5::
+gBattleDomeOpponentStatsText5::
 	.string "Emphasizes HP and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats6::
+gBattleDomeOpponentStatsText6::
 	.string "Emphasizes ATTACK and DEFENSE.$"
 
-gBattleDomeOpponentStats7::
+gBattleDomeOpponentStatsText7::
 	.string "Emphasizes ATTACK and SPEED.$"
 
-gBattleDomeOpponentStats8::
+gBattleDomeOpponentStatsText8::
 	.string "Emphasizes ATTACK and SP. ATTACK.$"
 
-gBattleDomeOpponentStats9::
+gBattleDomeOpponentStatsText9::
 	.string "Emphasizes ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats10::
+gBattleDomeOpponentStatsText10::
 	.string "Emphasizes DEFENSE and SPEED.$"
 
-gBattleDomeOpponentStats11::
+gBattleDomeOpponentStatsText11::
 	.string "Emphasizes DEFENSE and SP. ATTACK.$"
 
-gBattleDomeOpponentStats12::
+gBattleDomeOpponentStatsText12::
 	.string "Emphasizes DEFENSE and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats13::
+gBattleDomeOpponentStatsText13::
 	.string "Emphasizes SPEED and SP. ATTACK.$"
 
-gBattleDomeOpponentStats14::
+gBattleDomeOpponentStatsText14::
 	.string "Emphasizes SPEED and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats15::
+gBattleDomeOpponentStatsText15::
 	.string "Emphasizes SP. ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats16::
+gBattleDomeOpponentStatsText16::
 	.string "Emphasizes HP.$"
 
-gBattleDomeOpponentStats17::
+gBattleDomeOpponentStatsText17::
 	.string "Emphasizes ATTACK.$"
 
-gBattleDomeOpponentStats18::
+gBattleDomeOpponentStatsText18::
 	.string "Emphasizes DEFENSE.$"
 
-gBattleDomeOpponentStats19::
+gBattleDomeOpponentStatsText19::
 	.string "Emphasizes SPEED.$"
 
-gBattleDomeOpponentStats20::
+gBattleDomeOpponentStatsText20::
 	.string "Emphasizes SP. ATTACK.$"
 
-gBattleDomeOpponentStats21::
+gBattleDomeOpponentStatsText21::
 	.string "Emphasizes SP. DEFENSE.$"
 
-gBattleDomeOpponentStats22::
+gBattleDomeOpponentStatsText22::
 	.string "Neglects HP and ATTACK.$"
 
-gBattleDomeOpponentStats23::
+gBattleDomeOpponentStatsText23::
 	.string "Neglects HP and DEFENSE.$"
 
-gBattleDomeOpponentStats24::
+gBattleDomeOpponentStatsText24::
 	.string "Neglects HP and SPEED.$"
 
-gBattleDomeOpponentStats25::
+gBattleDomeOpponentStatsText25::
 	.string "Neglects HP and SP. ATTACK.$"
 
-gBattleDomeOpponentStats26::
+gBattleDomeOpponentStatsText26::
 	.string "Neglects HP and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats27::
+gBattleDomeOpponentStatsText27::
 	.string "Neglects ATTACK and DEFENSE.$"
 
-gBattleDomeOpponentStats28::
+gBattleDomeOpponentStatsText28::
 	.string "Neglects ATTACK and SPEED.$"
 
-gBattleDomeOpponentStats29::
+gBattleDomeOpponentStatsText29::
 	.string "Neglects ATTACK and SP. ATTACK.$"
 
-gBattleDomeOpponentStats30::
+gBattleDomeOpponentStatsText30::
 	.string "Neglects ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats31::
+gBattleDomeOpponentStatsText31::
 	.string "Neglects DEFENSE and SPEED.$"
 
-gBattleDomeOpponentStats32::
+gBattleDomeOpponentStatsText32::
 	.string "Neglects DEFENSE and SP. ATTACK.$"
 
-gBattleDomeOpponentStats33::
+gBattleDomeOpponentStatsText33::
 	.string "Neglects DEFENSE and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats34::
+gBattleDomeOpponentStatsText34::
 	.string "Neglects SPEED and SP. ATTACK.$"
 
-gBattleDomeOpponentStats35::
+gBattleDomeOpponentStatsText35::
 	.string "Neglects SPEED and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats36::
+gBattleDomeOpponentStatsText36::
 	.string "Neglects SP. ATTACK and SP. DEFENSE.$"
 
-gBattleDomeOpponentStats37::
+gBattleDomeOpponentStatsText37::
 	.string "Neglects HP.$"
 
-gBattleDomeOpponentStats38::
+gBattleDomeOpponentStatsText38::
 	.string "Neglects ATTACK.$"
 
-gBattleDomeOpponentStats39::
+gBattleDomeOpponentStatsText39::
 	.string "Neglects DEFENSE.$"
 
-gBattleDomeOpponentStats40::
+gBattleDomeOpponentStatsText40::
 	.string "Neglects SPEED.$"
 
-gBattleDomeOpponentStats41::
+gBattleDomeOpponentStatsText41::
 	.string "Neglects SP. ATTACK.$"
 
-gBattleDomeOpponentStats42::
+gBattleDomeOpponentStatsText42::
 	.string "Neglects SP. DEFENSE.$"
 
-gBattleDomeOpponentStats43::
+gBattleDomeOpponentStatsText43::
 	.string "Raises POKéMON in a well-balanced way.$"
 
-gBattleDomeWinStrings1::
+gBattleDomeWinText1::
 	.string "Let the battle begin!$"
 
-gBattleDomeWinStrings2::
+gBattleDomeWinText2::
 	.string "{STR_VAR_1} won using {STR_VAR_2}!$"
 
-gBattleDomeWinStrings3::
+gBattleDomeWinText3::
 	.string "{STR_VAR_1} became the champ!$"
 
-gBattleDomeWinStrings4::
+gBattleDomeWinText4::
 	.string "{STR_VAR_1} won by default!$"
 
-gBattleDomeWinStrings5::
+gBattleDomeWinText5::
 	.string "{STR_VAR_1} won outright by default!$"
 
-gBattleDomeWinStrings6::
+gBattleDomeWinText6::
 	.string "{STR_VAR_1} won without using a move!$"
 
-gBattleDomeWinStrings7::
+gBattleDomeWinText7::
 	.string "{STR_VAR_1} won outright with no moves!$"
 
-gBattleDomeMatchNumber1::
+gBattleDomeMatchNumberText1::
 	.string "Round 1, Match 1$"
 
-gBattleDomeMatchNumber2::
+gBattleDomeMatchNumberText2::
 	.string "Round 1, Match 2$"
 
-gBattleDomeMatchNumber3::
+gBattleDomeMatchNumberText3::
 	.string "Round 1, Match 3$"
 
-gBattleDomeMatchNumber4::
+gBattleDomeMatchNumberText4::
 	.string "Round 1, Match 4$"
 
-gBattleDomeMatchNumber5::
+gBattleDomeMatchNumberText5::
 	.string "Round 1, Match 5$"
 
-gBattleDomeMatchNumber6::
+gBattleDomeMatchNumberText6::
 	.string "Round 1, Match 6$"
 
-gBattleDomeMatchNumber7::
+gBattleDomeMatchNumberText7::
 	.string "Round 1, Match 7$"
 
-gBattleDomeMatchNumber8::
+gBattleDomeMatchNumberText8::
 	.string "Round 1, Match 8$"
 
-gBattleDomeMatchNumber9::
+gBattleDomeMatchNumberText9::
 	.string "Round 2, Match 1$"
 
-gBattleDomeMatchNumber10::
+gBattleDomeMatchNumberText10::
 	.string "Round 2, Match 2$"
 
-gBattleDomeMatchNumber11::
+gBattleDomeMatchNumberText11::
 	.string "Round 2, Match 3$"
 
-gBattleDomeMatchNumber12::
+gBattleDomeMatchNumberText12::
 	.string "Round 2, Match 4$"
 
-gBattleDomeMatchNumber13::
+gBattleDomeMatchNumberText13::
 	.string "Semifinal Match 1$"
 
-gBattleDomeMatchNumber14::
+gBattleDomeMatchNumberText14::
 	.string "Semifinal Match 2$"
 
-gBattleDomeMatchNumber15::
+gBattleDomeMatchNumberText15::
 	.string "Final Match$"
 
 BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B
@@ -7498,7 +7498,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
 	step_end
 
 EventScript_2C83F0:: @ 82C83F0
-	trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+	trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	setvar VAR_0x8004, 11
 	special CallTrainerHillFunction
 	waitmessage
diff --git a/data/layouts/UnknownMap_0845A394/border.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
index f1629c020..f1629c020 100644
--- a/data/layouts/UnknownMap_0845A394/border.bin
+++ b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin
diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
index fd294d9b6..fd294d9b6 100644
--- a/data/layouts/UnknownMap_0845A394/map.bin
+++ b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin
diff --git a/data/layouts/UnknownMap_08428450/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08428450/border.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin
diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
index d1277f280..d1277f280 100644
--- a/data/layouts/UnknownMap_08480DAC/map.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin
diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/Route130_MirageIsland/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnknownMap_08417FC4/border.bin
+++ b/data/layouts/Route130_MirageIsland/border.bin
diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/Route130_MirageIsland/map.bin
index 17a14a8d5..17a14a8d5 100644
--- a/data/layouts/UnknownMap_08417FC4/map.bin
+++ b/data/layouts/Route130_MirageIsland/map.bin
diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/Route131_SkyPillar/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnknownMap_0845D470/border.bin
+++ b/data/layouts/Route131_SkyPillar/border.bin
diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/Route131_SkyPillar/map.bin
index cd136de41..cd136de41 100644
--- a/data/layouts/UnknownMap_0845D470/map.bin
+++ b/data/layouts/Route131_SkyPillar/map.bin
diff --git a/data/layouts/UnknownMap_0845ECB4/border.bin b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/layouts/UnknownMap_0845ECB4/border.bin
+++ b/data/layouts/SeafloorCavern_Room9_Lava/border.bin
diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
index ec344933f..ec344933f 100644
--- a/data/layouts/UnknownMap_0845ECB4/map.bin
+++ b/data/layouts/SeafloorCavern_Room9_Lava/map.bin
diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/SkyPillar_1F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084294C4/border.bin
+++ b/data/layouts/SkyPillar_1F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/SkyPillar_1F_Clean/map.bin
index f0d9c299c..f0d9c299c 100644
--- a/data/layouts/UnknownMap_08480F54/map.bin
+++ b/data/layouts/SkyPillar_1F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/SkyPillar_2F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084294E8/border.bin
+++ b/data/layouts/SkyPillar_2F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/SkyPillar_2F_Clean/map.bin
index 908158cf4..908158cf4 100644
--- a/data/layouts/UnknownMap_084810FC/map.bin
+++ b/data/layouts/SkyPillar_2F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/SkyPillar_3F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08480DAC/border.bin
+++ b/data/layouts/SkyPillar_3F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/SkyPillar_3F_Clean/map.bin
index d033bc4d2..d033bc4d2 100644
--- a/data/layouts/UnknownMap_084812A4/map.bin
+++ b/data/layouts/SkyPillar_3F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/SkyPillar_4F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_08480F54/border.bin
+++ b/data/layouts/SkyPillar_4F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/SkyPillar_4F_Clean/map.bin
index eeccae9ae..eeccae9ae 100644
--- a/data/layouts/UnknownMap_0848144C/map.bin
+++ b/data/layouts/SkyPillar_4F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/SkyPillar_5F_Clean/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084810FC/border.bin
+++ b/data/layouts/SkyPillar_5F_Clean/border.bin
diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/SkyPillar_5F_Clean/map.bin
index 8507a4932..8507a4932 100644
--- a/data/layouts/UnknownMap_084815F4/map.bin
+++ b/data/layouts/SkyPillar_5F_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/SkyPillar_Top_Clean/border.bin
index e9d1c658c..e9d1c658c 100644
--- a/data/layouts/UnknownMap_08481B24/border.bin
+++ b/data/layouts/SkyPillar_Top_Clean/border.bin
diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/SkyPillar_Top_Clean/map.bin
index 2a47bca91..2a47bca91 100644
--- a/data/layouts/UnknownMap_08481B24/map.bin
+++ b/data/layouts/SkyPillar_Top_Clean/map.bin
diff --git a/data/layouts/UnknownMap_08469200/border.bin b/data/layouts/SootopolisCity_LegendsBattle/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/layouts/UnknownMap_08469200/border.bin
+++ b/data/layouts/SootopolisCity_LegendsBattle/border.bin
diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/SootopolisCity_LegendsBattle/map.bin
index 67085fd37..67085fd37 100644
--- a/data/layouts/UnknownMap_08469200/map.bin
+++ b/data/layouts/SootopolisCity_LegendsBattle/map.bin
diff --git a/data/layouts/UnknownMap_084693AC/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnknownMap_084693AC/border.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin
diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
index 603f55c93..603f55c93 100644
--- a/data/layouts/UnknownMap_08481DBC/map.bin
+++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin
diff --git a/data/layouts/UnknownMap_084812A4/border.bin b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084812A4/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_29/border.bin
diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_29/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_29/map.bin
diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_0848144C/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_30/border.bin
diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_30/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_30/map.bin
diff --git a/data/layouts/UnknownMap_084815F4/border.bin b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_084815F4/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_31/border.bin
diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_31/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_31/map.bin
diff --git a/data/layouts/UnknownMap_25_29/border.bin b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_29/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_32/border.bin
diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_32/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_32/map.bin
diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_30/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_33/border.bin
diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_33/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_33/map.bin
diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_31/border.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_34/border.bin
diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/layouts/UnknownMap_25_34/map.bin
+++ b/data/layouts/UnknownLinkContestRoom_25_34/map.bin
diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/Unknown_08428450/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_32/border.bin
+++ b/data/layouts/Unknown_08428450/border.bin
diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/Unknown_08428450/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/UnknownMap_08428450/map.bin
+++ b/data/layouts/Unknown_08428450/map.bin
diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/Unknown_084294C4/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_33/border.bin
+++ b/data/layouts/Unknown_084294C4/border.bin
diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/Unknown_084294C4/map.bin
index 37f05b971..37f05b971 100644
--- a/data/layouts/UnknownMap_084294C4/map.bin
+++ b/data/layouts/Unknown_084294C4/map.bin
diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/Unknown_084294E8/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnknownMap_25_34/border.bin
+++ b/data/layouts/Unknown_084294E8/border.bin
diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/Unknown_084294E8/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/layouts/UnknownMap_084294E8/map.bin
+++ b/data/layouts/Unknown_084294E8/map.bin
diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/Unknown_0843E6C0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E6C0/border.bin
+++ b/data/layouts/Unknown_0843E6C0/border.bin
diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/Unknown_0843E6C0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E6C0/map.bin
+++ b/data/layouts/Unknown_0843E6C0/map.bin
diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/Unknown_0843E6E4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E6E4/border.bin
+++ b/data/layouts/Unknown_0843E6E4/border.bin
diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/Unknown_0843E6E4/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E6E4/map.bin
+++ b/data/layouts/Unknown_0843E6E4/map.bin
diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/Unknown_0843E708/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E708/border.bin
+++ b/data/layouts/Unknown_0843E708/border.bin
diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/Unknown_0843E708/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E708/map.bin
+++ b/data/layouts/Unknown_0843E708/map.bin
diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/Unknown_0843E72C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E72C/border.bin
+++ b/data/layouts/Unknown_0843E72C/border.bin
diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/Unknown_0843E72C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E72C/map.bin
+++ b/data/layouts/Unknown_0843E72C/map.bin
diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/Unknown_0843E750/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E750/border.bin
+++ b/data/layouts/Unknown_0843E750/border.bin
diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/Unknown_0843E750/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E750/map.bin
+++ b/data/layouts/Unknown_0843E750/map.bin
diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/Unknown_0843E774/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E774/border.bin
+++ b/data/layouts/Unknown_0843E774/border.bin
diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/Unknown_0843E774/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E774/map.bin
+++ b/data/layouts/Unknown_0843E774/map.bin
diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/Unknown_0843E798/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E798/border.bin
+++ b/data/layouts/Unknown_0843E798/border.bin
diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/Unknown_0843E798/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E798/map.bin
+++ b/data/layouts/Unknown_0843E798/map.bin
diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/Unknown_0843E7BC/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E7BC/border.bin
+++ b/data/layouts/Unknown_0843E7BC/border.bin
diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/Unknown_0843E7BC/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E7BC/map.bin
+++ b/data/layouts/Unknown_0843E7BC/map.bin
diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/Unknown_0843E7E0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E7E0/border.bin
+++ b/data/layouts/Unknown_0843E7E0/border.bin
diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/Unknown_0843E7E0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E7E0/map.bin
+++ b/data/layouts/Unknown_0843E7E0/map.bin
diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/Unknown_0843E804/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E804/border.bin
+++ b/data/layouts/Unknown_0843E804/border.bin
diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/Unknown_0843E804/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E804/map.bin
+++ b/data/layouts/Unknown_0843E804/map.bin
diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/Unknown_0843E828/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E828/border.bin
+++ b/data/layouts/Unknown_0843E828/border.bin
diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/Unknown_0843E828/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E828/map.bin
+++ b/data/layouts/Unknown_0843E828/map.bin
diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/Unknown_0843E84C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E84C/border.bin
+++ b/data/layouts/Unknown_0843E84C/border.bin
diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/Unknown_0843E84C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E84C/map.bin
+++ b/data/layouts/Unknown_0843E84C/map.bin
diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/Unknown_0843E870/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E870/border.bin
+++ b/data/layouts/Unknown_0843E870/border.bin
diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/Unknown_0843E870/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E870/map.bin
+++ b/data/layouts/Unknown_0843E870/map.bin
diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/Unknown_0843E894/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/layouts/UnknownMap_0843E894/border.bin
+++ b/data/layouts/Unknown_0843E894/border.bin
diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/Unknown_0843E894/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/layouts/UnknownMap_0843E894/map.bin
+++ b/data/layouts/Unknown_0843E894/map.bin
diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/Unknown_08447028/border.bin
index 9e4b3fb7a..9e4b3fb7a 100644
--- a/data/layouts/UnknownMap_08447028/border.bin
+++ b/data/layouts/Unknown_08447028/border.bin
diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/Unknown_08447028/map.bin
index 028da0526..028da0526 100644
--- a/data/layouts/UnknownMap_08447028/map.bin
+++ b/data/layouts/Unknown_08447028/map.bin
diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/Unknown_084693AC/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnknownMap_08481DBC/border.bin
+++ b/data/layouts/Unknown_084693AC/border.bin
diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/Unknown_084693AC/map.bin
index a179d8997..a179d8997 100644
--- a/data/layouts/UnknownMap_084693AC/map.bin
+++ b/data/layouts/Unknown_084693AC/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index b6e31981d..353b9a284 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -452,14 +452,14 @@
       "blockdata_filepath": "data/layouts/Route129/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08417FC4",
-      "name": "UnknownMap_08417FC4_Layout",
+      "id": "LAYOUT_ROUTE130_MIRAGE_ISLAND",
+      "name": "Route130_MirageIsland_Layout",
       "width": 80,
       "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.bin"
+      "border_filepath": "data/layouts/Route130_MirageIsland/border.bin",
+      "blockdata_filepath": "data/layouts/Route130_MirageIsland/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE131",
@@ -742,14 +742,14 @@
       "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08428450",
-      "name": "UnknownMap_08428450_Layout",
+      "id": "LAYOUT_UNKNOWN_08428450",
+      "name": "Unknown_08428450_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_08428450/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.bin"
+      "border_filepath": "data/layouts/Unknown_08428450/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_08428450/map.bin"
     },
     {
       "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE",
@@ -822,24 +822,24 @@
       "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084294C4",
-      "name": "UnknownMap_084294C4_Layout",
+      "id": "LAYOUT_UNKNOWN_084294C4",
+      "name": "Unknown_084294C4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin"
+      "border_filepath": "data/layouts/Unknown_084294C4/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084294E8",
-      "name": "UnknownMap_084294E8_Layout",
+      "id": "LAYOUT_UNKNOWN_084294E8",
+      "name": "Unknown_084294E8_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.bin"
+      "border_filepath": "data/layouts/Unknown_084294E8/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084294E8/map.bin"
     },
     {
       "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB",
@@ -1692,144 +1692,144 @@
       "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E6C0",
-      "name": "UnknownMap_0843E6C0_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E6C0",
+      "name": "Unknown_0843E6C0_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E6C0/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E6E4",
-      "name": "UnknownMap_0843E6E4_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E6E4",
+      "name": "Unknown_0843E6E4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E6E4/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E708",
-      "name": "UnknownMap_0843E708_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E708",
+      "name": "Unknown_0843E708_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E708/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E72C",
-      "name": "UnknownMap_0843E72C_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E72C",
+      "name": "Unknown_0843E72C_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E72C/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E750",
-      "name": "UnknownMap_0843E750_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E750",
+      "name": "Unknown_0843E750_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E750/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E774",
-      "name": "UnknownMap_0843E774_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E774",
+      "name": "Unknown_0843E774_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E774/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E798",
-      "name": "UnknownMap_0843E798_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E798",
+      "name": "Unknown_0843E798_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E798/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E7BC",
-      "name": "UnknownMap_0843E7BC_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E7BC",
+      "name": "Unknown_0843E7BC_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E7BC/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E7E0",
-      "name": "UnknownMap_0843E7E0_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E7E0",
+      "name": "Unknown_0843E7E0_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E7E0/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E804",
-      "name": "UnknownMap_0843E804_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E804",
+      "name": "Unknown_0843E804_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E804/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E828",
-      "name": "UnknownMap_0843E828_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E828",
+      "name": "Unknown_0843E828_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E828/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E84C",
-      "name": "UnknownMap_0843E84C_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E84C",
+      "name": "Unknown_0843E84C_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E84C/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E870",
-      "name": "UnknownMap_0843E870_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E870",
+      "name": "Unknown_0843E870_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E870/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E894",
-      "name": "UnknownMap_0843E894_Layout",
+      "id": "LAYOUT_UNKNOWN_0843E894",
+      "name": "Unknown_0843E894_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.bin"
+      "border_filepath": "data/layouts/Unknown_0843E894/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_0843E894/map.bin"
     },
     {
       "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE",
@@ -2252,64 +2252,64 @@
       "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_29",
-      "name": "UnknownMap_25_29_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
+      "name": "UnknownLinkContestRoom_25_29_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_29/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_30",
-      "name": "UnknownMap_25_30_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
+      "name": "UnknownLinkContestRoom_25_30_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_30/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_31",
-      "name": "UnknownMap_25_31_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
+      "name": "UnknownLinkContestRoom_25_31_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_31/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_32",
-      "name": "UnknownMap_25_32_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
+      "name": "UnknownLinkContestRoom_25_32_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_32/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_33",
-      "name": "UnknownMap_25_33_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
+      "name": "UnknownLinkContestRoom_25_33_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_33/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_34",
-      "name": "UnknownMap_25_34_Layout",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
+      "name": "UnknownLinkContestRoom_25_34_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_25_34/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.bin"
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin",
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
     },
     {
       "id": "LAYOUT_LINK_CONTEST_ROOM2",
@@ -2412,14 +2412,14 @@
       "blockdata_filepath": "data/layouts/SafariZone_South/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08447028",
-      "name": "UnknownMap_08447028_Layout",
+      "id": "LAYOUT_UNKNOWN_08447028",
+      "name": "Unknown_08447028_Layout",
       "width": 58,
       "height": 26,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "0",
-      "border_filepath": "data/layouts/UnknownMap_08447028/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.bin"
+      "border_filepath": "data/layouts/Unknown_08447028/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_08447028/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE",
@@ -3112,14 +3112,14 @@
       "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0845A394",
-      "name": "UnknownMap_0845A394_Layout",
+      "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA",
+      "name": "CaveOfOrigin_Unused_B4F_Lava_Layout",
       "width": 19,
       "height": 19,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.bin"
+      "border_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin",
+      "blockdata_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin"
     },
     {
       "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
@@ -3182,14 +3182,14 @@
       "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0845D470",
-      "name": "UnknownMap_0845D470_Layout",
+      "id": "LAYOUT_ROUTE131_SKY_PILLAR",
+      "name": "Route131_SkyPillar_Layout",
       "width": 60,
       "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.bin"
+      "border_filepath": "data/layouts/Route131_SkyPillar/border.bin",
+      "blockdata_filepath": "data/layouts/Route131_SkyPillar/map.bin"
     },
     {
       "id": "LAYOUT_SKY_PILLAR_ENTRANCE",
@@ -3252,14 +3252,14 @@
       "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0845ECB4",
-      "name": "UnknownMap_0845ECB4_Layout",
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA",
+      "name": "SeafloorCavern_Room9_Lava_Layout",
       "width": 27,
       "height": 46,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.bin"
+      "border_filepath": "data/layouts/SeafloorCavern_Room9_Lava/border.bin",
+      "blockdata_filepath": "data/layouts/SeafloorCavern_Room9_Lava/map.bin"
     },
     {
       "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE",
@@ -3562,14 +3562,14 @@
       "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08469200",
-      "name": "UnknownMap_08469200_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE",
+      "name": "SootopolisCity_LegendsBattle_Layout",
       "width": 60,
       "height": 60,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Sootopolis",
-      "border_filepath": "data/layouts/UnknownMap_08469200/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.bin"
+      "border_filepath": "data/layouts/SootopolisCity_LegendsBattle/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_LegendsBattle/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
@@ -3582,14 +3582,14 @@
       "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084693AC",
-      "name": "UnknownMap_084693AC_Layout",
+      "id": "LAYOUT_UNKNOWN_084693AC",
+      "name": "Unknown_084693AC_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattlePike",
-      "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.bin"
+      "border_filepath": "data/layouts/Unknown_084693AC/border.bin",
+      "blockdata_filepath": "data/layouts/Unknown_084693AC/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
@@ -4312,74 +4312,74 @@
       "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08480DAC",
-      "name": "UnknownMap_08480DAC_Layout",
+      "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE",
+      "name": "LittlerootTown_ProfessorBirchsLabWithTable_Layout",
       "width": 13,
       "height": 13,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Lab",
-      "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin"
+      "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08480F54",
-      "name": "UnknownMap_08480F54_Layout",
+      "id": "LAYOUT_SKY_PILLAR_1F_CLEAN",
+      "name": "SkyPillar_1F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_1F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_1F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084810FC",
-      "name": "UnknownMap_084810FC_Layout",
+      "id": "LAYOUT_SKY_PILLAR_2F_CLEAN",
+      "name": "SkyPillar_2F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_2F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_2F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084812A4",
-      "name": "UnknownMap_084812A4_Layout",
+      "id": "LAYOUT_SKY_PILLAR_3F_CLEAN",
+      "name": "SkyPillar_3F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_3F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_3F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0848144C",
-      "name": "UnknownMap_0848144C_Layout",
+      "id": "LAYOUT_SKY_PILLAR_4F_CLEAN",
+      "name": "SkyPillar_4F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_4F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_4F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084815F4",
-      "name": "UnknownMap_084815F4_Layout",
+      "id": "LAYOUT_SKY_PILLAR_5F_CLEAN",
+      "name": "SkyPillar_5F_Clean_Layout",
       "width": 14,
       "height": 14,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_5F_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_5F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08481B24",
-      "name": "UnknownMap_08481B24_Layout",
+      "id": "LAYOUT_SKY_PILLAR_TOP_CLEAN",
+      "name": "SkyPillar_Top_Clean_Layout",
       "width": 27,
       "height": 24,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.bin"
+      "border_filepath": "data/layouts/SkyPillar_Top_Clean/border.bin",
+      "blockdata_filepath": "data/layouts/SkyPillar_Top_Clean/map.bin"
     },
     {
       "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
@@ -4402,14 +4402,14 @@
       "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08481DBC",
-      "name": "UnknownMap_08481DBC_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED",
+      "name": "SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked_Layout",
       "width": 11,
       "height": 8,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_MysteryEventsHouse",
-      "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin"
+      "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 558f6e416..43586bba0 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -152,8 +152,8 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
-	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+BattlePyramid_TrainerBattle:: @ 8252C4F
+	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	setvar VAR_0x8004, 10
 	special CallBattlePyramidFunction
 	waitmessage
@@ -162,22 +162,22 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
+BattlePyramid_FindItemBall:: @ 8252C6A
 	setvar VAR_0x8004, 7
 	special CallBattlePyramidFunction
 	callstd STD_FIND_ITEM
 	compare VAR_0x8007, 0
-	goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
+	goto_if_eq BattlePyramid_FindItemBall_End
 	setvar VAR_0x8004, 8
 	special CallBattlePyramidFunction
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87
+BattlePyramid_FindItemBall_End:: @ 8252C87
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88:: @ 8252C88
 	goto BattleFrontier_BattlePyramidTop_EventScript_252B42
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252C8D: @ 8252C8D
+BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D
 	.string "This is a sample message.$"
 
 gText_BattlePyramidConfirmRest:: @ 8252CA7
@@ -189,595 +189,595 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB
 	.string "Are you sure you want to quit your\n"
 	.string "PYRAMID quest?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D
+BattlePyramid_ExitHintUp_Text1:: @ 8252D2D
 	.string "This floor's exit is in\n"
 	.string "that direction: {UP_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57
+BattlePyramid_ExitHintLeft_Text1:: @ 8252D57
 	.string "This floor's exit is in\n"
 	.string "that direction: {LEFT_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81
+BattlePyramid_ExitHintRight_Text1:: @ 8252D81
 	.string "This floor's exit is in\n"
 	.string "that direction: {RIGHT_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB
+BattlePyramid_ExitHintDown_Text1:: @ 8252DAB
 	.string "This floor's exit is in\n"
 	.string "that direction: {DOWN_ARROW}$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5
+BattlePyramid_ExitHintUp_Text2:: @ 8252DD5
 	.string "The exit on this floor is in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E03:: @ 8252E03
+BattlePyramid_ExitHintLeft_Text2:: @ 8252E03
 	.string "The exit on this floor is in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E31:: @ 8252E31
+BattlePyramid_ExitHintRight_Text2:: @ 8252E31
 	.string "The exit on this floor is in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E5F:: @ 8252E5F
+BattlePyramid_ExitHintDown_Text2:: @ 8252E5F
 	.string "The exit on this floor is in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252E8D:: @ 8252E8D
+BattlePyramid_ExitHintUp_Text3:: @ 8252E8D
 	.string "The exit is over\n"
 	.string "that {UP_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252EAA:: @ 8252EAA
+BattlePyramid_ExitHintLeft_Text3:: @ 8252EAA
 	.string "The exit is over\n"
 	.string "that {LEFT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252EC7:: @ 8252EC7
+BattlePyramid_ExitHintRight_Text3:: @ 8252EC7
 	.string "The exit is over\n"
 	.string "that {RIGHT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252EE4:: @ 8252EE4
+BattlePyramid_ExitHintDown_Text3:: @ 8252EE4
 	.string "The exit is over\n"
 	.string "that {DOWN_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252F01:: @ 8252F01
+BattlePyramid_ExitHintUp_Text4:: @ 8252F01
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {UP_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252F3A:: @ 8252F3A
+BattlePyramid_ExitHintLeft_Text4:: @ 8252F3A
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {LEFT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252F73:: @ 8252F73
+BattlePyramid_ExitHintRight_Text4:: @ 8252F73
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {RIGHT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC
+BattlePyramid_ExitHintDown_Text4:: @ 8252FAC
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {DOWN_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5
+BattlePyramid_ExitHintUp_Text5:: @ 8252FE5
 	.string "The exit?\n"
 	.string "It's that {UP_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000
+BattlePyramid_ExitHintLeft_Text5:: @ 8253000
 	.string "The exit?\n"
 	.string "It's that {LEFT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B
+BattlePyramid_ExitHintRight_Text5:: @ 825301B
 	.string "The exit?\n"
 	.string "It's that {RIGHT_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036
+BattlePyramid_ExitHintDown_Text5:: @ 8253036
 	.string "The exit?\n"
 	.string "It's that {DOWN_ARROW} way.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051
+BattlePyramid_ExitHintUp_Text6:: @ 8253051
 	.string "The exit happens to be in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25307C:: @ 825307C
+BattlePyramid_ExitHintLeft_Text6:: @ 825307C
 	.string "The exit happens to be in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2530A7:: @ 82530A7
+BattlePyramid_ExitHintRight_Text6:: @ 82530A7
 	.string "The exit happens to be in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2530D2:: @ 82530D2
+BattlePyramid_ExitHintDown_Text6:: @ 82530D2
 	.string "The exit happens to be in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2530FD:: @ 82530FD
+BattlePyramid_EightItemsRemaining_Text1:: @ 82530FD
 	.string "Are you looking for items?\p"
 	.string "There are eight items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253140:: @ 8253140
+BattlePyramid_SevenItemsRemaining_Text1:: @ 8253140
 	.string "Are you looking for items?\p"
 	.string "There are seven items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253183:: @ 8253183
+BattlePyramid_SixItemsRemaining_Text1:: @ 8253183
 	.string "Are you looking for items?\p"
 	.string "There are six items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2531C4:: @ 82531C4
+BattlePyramid_FiveItemsRemaining_Text1:: @ 82531C4
 	.string "Are you looking for items?\p"
 	.string "There are five items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253206:: @ 8253206
+BattlePyramid_FourItemsRemaining_Text1:: @ 8253206
 	.string "Are you looking for items?\p"
 	.string "There are four items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253248:: @ 8253248
+BattlePyramid_ThreeItemsRemaining_Text1:: @ 8253248
 	.string "Are you looking for items?\p"
 	.string "There are three items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25328B:: @ 825328B
+BattlePyramid_TwoItemsRemaining_Text1:: @ 825328B
 	.string "Are you looking for items?\p"
 	.string "There are two items left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC
+BattlePyramid_OneItemRemaining_Text1:: @ 82532CC
 	.string "Are you looking for items?\p"
 	.string "There is one item left to\n"
 	.string "be found.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B
+BattlePyramid_ZeroItemsRemaining_Text1:: @ 825330B
 	.string "Are you looking for items?\p"
 	.string "There isn't anything left to\n"
 	.string "be found!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D
+BattlePyramid_EightItemsRemaining_Text2:: @ 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
+BattlePyramid_SevenItemsRemaining_Text2:: @ 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
+BattlePyramid_SixItemsRemaining_Text2:: @ 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
+BattlePyramid_FiveItemsRemaining_Text2:: @ 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
+BattlePyramid_FourItemsRemaining_Text2:: @ 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
+BattlePyramid_ThreeItemsRemaining_Text2:: @ 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
+BattlePyramid_TwoItemsRemaining_Text2:: @ 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
+BattlePyramid_OneItemRemaining_Text2:: @ 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
+BattlePyramid_ZeroItemsRemaining_Text2:: @ 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
+BattlePyramid_EightItemsRemaining_Text3:: @ 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
+BattlePyramid_SevenItemsRemaining_Text3:: @ 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
+BattlePyramid_SixItemsRemaining_Text3:: @ 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
+BattlePyramid_FiveItemsRemaining_Text3:: @ 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
+BattlePyramid_FourItemsRemaining_Text3:: @ 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
+BattlePyramid_ThreeItemsRemaining_Text3:: @ 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
+BattlePyramid_TwoItemsRemaining_Text3:: @ 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
+BattlePyramid_OneItemRemaining_Text3:: @ 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
+BattlePyramid_ZeroItemsRemaining_Text3:: @ 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
+BattlePyramid_EightItemsRemaining_Text4:: @ 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
+BattlePyramid_SevenItemsRemaining_Text4:: @ 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
+BattlePyramid_SixItemsRemaining_Text4:: @ 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
+BattlePyramid_FiveItemsRemaining_Text4:: @ 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
+BattlePyramid_FourItemsRemaining_Text4:: @ 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
+BattlePyramid_ThreeItemsRemaining_Text4:: @ 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
+BattlePyramid_TwoItemsRemaining_Text4:: @ 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
+BattlePyramid_OneItemRemaining_Text4:: @ 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
+BattlePyramid_ZeroItemsRemaining_Text4:: @ 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
+BattlePyramid_EightItemsRemaining_Text5:: @ 8253D96
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are eight items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253DD2:: @ 8253DD2
+BattlePyramid_SevenItemsRemaining_Text5:: @ 8253DD2
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are seven items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253E0E:: @ 8253E0E
+BattlePyramid_SixItemsRemaining_Text5:: @ 8253E0E
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are six items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253E48:: @ 8253E48
+BattlePyramid_FiveItemsRemaining_Text5:: @ 8253E48
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are five items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253E83:: @ 8253E83
+BattlePyramid_FourItemsRemaining_Text5:: @ 8253E83
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are four items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253EBE:: @ 8253EBE
+BattlePyramid_ThreeItemsRemaining_Text5:: @ 8253EBE
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are three items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253EFA:: @ 8253EFA
+BattlePyramid_TwoItemsRemaining_Text5:: @ 8253EFA
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are two items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253F34:: @ 8253F34
+BattlePyramid_OneItemRemaining_Text5:: @ 8253F34
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there is one item…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253F6C:: @ 8253F6C
+BattlePyramid_ZeroItemsRemaining_Text5:: @ 8253F6C
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are no items…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_253FA5:: @ 8253FA5
+BattlePyramid_EightItemsRemaining_Text6:: @ 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
+BattlePyramid_SevenItemsRemaining_Text6:: @ 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
+BattlePyramid_SixItemsRemaining_Text6:: @ 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
+BattlePyramid_FiveItemsRemaining_Text6:: @ 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
+BattlePyramid_FourItemsRemaining_Text6:: @ 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
+BattlePyramid_ThreeItemsRemaining_Text6:: @ 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
+BattlePyramid_TwoItemsRemaining_Text6:: @ 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
+BattlePyramid_OneItemRemaining_Text6:: @ 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
+BattlePyramid_ZeroItemsRemaining_Text6:: @ 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
+BattlePyramid_SevenTrainersRemaining_Text1:: @ 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
+BattlePyramid_SixTrainersRemaining_Text1:: @ 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
+BattlePyramid_FiveTrainersRemaining_Text1:: @ 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
+BattlePyramid_FourTrainersRemaining_Text1:: @ 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
+BattlePyramid_ThreeTrainersRemaining_Text1:: @ 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
+BattlePyramid_TwoTrainersRemaining_Text1:: @ 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
+BattlePyramid_OneTrainersRemaining_Text1:: @ 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
+BattlePyramid_ZeroTrainersRemaining_Text1:: @ 82544A6
 	.string "You were really awesome!\p"
 	.string "There's no one left that\n"
 	.string "can beat you!$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6
+BattlePyramid_SevenTrainersRemaining_Text2:: @ 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
+BattlePyramid_SixTrainersRemaining_Text2:: @ 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
+BattlePyramid_FiveTrainersRemaining_Text2:: @ 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
+BattlePyramid_FourTrainersRemaining_Text2:: @ 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
+BattlePyramid_ThreeTrainersRemaining_Text2:: @ 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
+BattlePyramid_TwoTrainersRemaining_Text2:: @ 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
+BattlePyramid_OneTrainersRemaining_Text2:: @ 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
+BattlePyramid_ZeroTrainersRemaining_Text2:: @ 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
+BattlePyramid_SevenTrainersRemaining_Text3:: @ 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
+BattlePyramid_SixTrainersRemaining_Text3:: @ 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
+BattlePyramid_FiveTrainersRemaining_Text3:: @ 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
+BattlePyramid_FourTrainersRemaining_Text3:: @ 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
+BattlePyramid_ThreeTrainersRemaining_Text3:: @ 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
+BattlePyramid_TwoTrainersRemaining_Text3:: @ 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
+BattlePyramid_OneTrainersRemaining_Text3:: @ 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
+BattlePyramid_ZeroTrainersRemaining_Text3:: @ 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
+BattlePyramid_SevenTrainersRemaining_Text4:: @ 8254A59
 	.string "Maybe you could sweep through\n"
 	.string "the seven TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254A9E:: @ 8254A9E
+BattlePyramid_SixTrainersRemaining_Text4:: @ 8254A9E
 	.string "Maybe you could sweep through\n"
 	.string "the six TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254AE1:: @ 8254AE1
+BattlePyramid_FiveTrainersRemaining_Text4:: @ 8254AE1
 	.string "Maybe you could sweep through\n"
 	.string "the five TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254B25:: @ 8254B25
+BattlePyramid_FourTrainersRemaining_Text4:: @ 8254B25
 	.string "Maybe you could sweep through\n"
 	.string "the four TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254B69:: @ 8254B69
+BattlePyramid_ThreeTrainersRemaining_Text4:: @ 8254B69
 	.string "Maybe you could sweep through\n"
 	.string "the three TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254BAE:: @ 8254BAE
+BattlePyramid_TwoTrainersRemaining_Text4:: @ 8254BAE
 	.string "Maybe you could sweep through\n"
 	.string "the two TRAINERS left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1
+BattlePyramid_OneTrainersRemaining_Text4:: @ 8254BF1
 	.string "Maybe you could complete your sweep\n"
 	.string "with the one TRAINER left on this floor.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E
+BattlePyramid_ZeroTrainersRemaining_Text4:: @ 8254C3E
 	.string "There isn't a single person left who\n"
 	.string "can defeat you now…$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77
+BattlePyramid_SevenTrainersRemaining_Text5:: @ 8254C77
 	.string "You may have what it takes to beat\n"
 	.string "the seven expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254CC0:: @ 8254CC0
+BattlePyramid_SixTrainersRemaining_Text5:: @ 8254CC0
 	.string "You may have what it takes to beat\n"
 	.string "the six expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254D07:: @ 8254D07
+BattlePyramid_FiveTrainersRemaining_Text5:: @ 8254D07
 	.string "You may have what it takes to beat\n"
 	.string "the five expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254D4F:: @ 8254D4F
+BattlePyramid_FourTrainersRemaining_Text5:: @ 8254D4F
 	.string "You may have what it takes to beat\n"
 	.string "the four expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254D97:: @ 8254D97
+BattlePyramid_ThreeTrainersRemaining_Text5:: @ 8254D97
 	.string "You may have what it takes to beat\n"
 	.string "the three expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254DE0:: @ 8254DE0
+BattlePyramid_TwoTrainersRemaining_Text5:: @ 8254DE0
 	.string "You may have what it takes to beat\n"
 	.string "the two expert TRAINERS who remain.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254E27:: @ 8254E27
+BattlePyramid_OneTrainersRemaining_Text5:: @ 8254E27
 	.string "You may have what it takes to beat\n"
 	.string "the one expert TRAINER who remains.$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254E6E:: @ 8254E6E
+BattlePyramid_ZeroTrainersRemaining_Text5:: @ 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
+BattlePyramid_SevenTrainersRemaining_Text6:: @ 8254ED3
 	.string "Can you keep winning against\n"
 	.string "the seven remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254F0E:: @ 8254F0E
+BattlePyramid_SixTrainersRemaining_Text6:: @ 8254F0E
 	.string "Can you keep winning against\n"
 	.string "the six remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254F47:: @ 8254F47
+BattlePyramid_FiveTrainersRemaining_Text6:: @ 8254F47
 	.string "Can you keep winning against\n"
 	.string "the five remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254F81:: @ 8254F81
+BattlePyramid_FourTrainersRemaining_Text6:: @ 8254F81
 	.string "Can you keep winning against\n"
 	.string "the four remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254FBB:: @ 8254FBB
+BattlePyramid_ThreeTrainersRemaining_Text6:: @ 8254FBB
 	.string "Can you keep winning against\n"
 	.string "the three remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_254FF6:: @ 8254FF6
+BattlePyramid_TwoTrainersRemaining_Text6:: @ 8254FF6
 	.string "Can you keep winning against\n"
 	.string "the two remaining TRAINERS?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F
+BattlePyramid_OneTrainersRemaining_Text6:: @ 825502F
 	.string "Can you keep winning against\n"
 	.string "the last remaining TRAINER?$"
 
-BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068
+BattlePyramid_ZeroTrainersRemaining_Text6:: @ 8255068
 	.string "There aren't any TRAINERS left that\n"
 	.string "can take you on now…$"
diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json
index 38320ece6..57e51307b 100644
--- a/data/maps/BattlePyramidSquare01/map.json
+++ b/data/maps/BattlePyramidSquare01/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json
index 0dc6f713a..3f3d6ca93 100644
--- a/data/maps/BattlePyramidSquare02/map.json
+++ b/data/maps/BattlePyramidSquare02/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json
index 4e446e24b..104579553 100644
--- a/data/maps/BattlePyramidSquare03/map.json
+++ b/data/maps/BattlePyramidSquare03/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json
index 67dfdaa11..153130999 100644
--- a/data/maps/BattlePyramidSquare04/map.json
+++ b/data/maps/BattlePyramidSquare04/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json
index ac8bd5d7d..d08cc103b 100644
--- a/data/maps/BattlePyramidSquare05/map.json
+++ b/data/maps/BattlePyramidSquare05/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json
index d9fa40ccd..0528d33bd 100644
--- a/data/maps/BattlePyramidSquare06/map.json
+++ b/data/maps/BattlePyramidSquare06/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json
index a097f60ba..23a4874ea 100644
--- a/data/maps/BattlePyramidSquare07/map.json
+++ b/data/maps/BattlePyramidSquare07/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json
index 6939b8a7e..ab7be039c 100644
--- a/data/maps/BattlePyramidSquare08/map.json
+++ b/data/maps/BattlePyramidSquare08/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json
index 56380e991..1add766dc 100644
--- a/data/maps/BattlePyramidSquare09/map.json
+++ b/data/maps/BattlePyramidSquare09/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json
index 33534391b..1450e644c 100644
--- a/data/maps/BattlePyramidSquare10/map.json
+++ b/data/maps/BattlePyramidSquare10/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json
index f22855aa2..d4ebaaa2d 100644
--- a/data/maps/BattlePyramidSquare11/map.json
+++ b/data/maps/BattlePyramidSquare11/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json
index d8e0d45a9..29063c950 100644
--- a/data/maps/BattlePyramidSquare12/map.json
+++ b/data/maps/BattlePyramidSquare12/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json
index 880178e0e..71fb71e5d 100644
--- a/data/maps/BattlePyramidSquare13/map.json
+++ b/data/maps/BattlePyramidSquare13/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json
index 423346532..3398dcd47 100644
--- a/data/maps/BattlePyramidSquare14/map.json
+++ b/data/maps/BattlePyramidSquare14/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json
index 12b1f4cb8..0eb433ae1 100644
--- a/data/maps/BattlePyramidSquare15/map.json
+++ b/data/maps/BattlePyramidSquare15/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json
index 65fa0a361..e6827e1a3 100644
--- a/data/maps/BattlePyramidSquare16/map.json
+++ b/data/maps/BattlePyramidSquare16/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 6,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F",
+      "script": "BattlePyramid_TrainerBattle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A",
+      "script": "BattlePyramid_FindItemBall",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index b47df74b8..5c762743c 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC
+	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC
+	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm 3, 5, 10
 	end
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 819d9e4f3..8ca9dcbb0 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -27,7 +27,7 @@ Route130_MapScript1_1F7365: @ 81F7365
 	end
 
 Route130_EventScript_1F73B1:: @ 81F73B1
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4
+	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
 
 Route130_EventScript_1F73B5:: @ 81F73B5
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index 700ac25f6..e709a14ef 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A
 	end
 
 Route131_EventScript_1F741B:: @ 81F741B
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470
+	setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
 	return
 
 Route131_EventScript_1F741F:: @ 81F741F
diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc
index 2230dad8d..a0b62df25 100644
--- a/data/maps/SkyPillar_1F/scripts.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B
 	end
 
 SkyPillar_1F_EventScript_239627:: @ 8239627
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54
+	setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index fa89f3893..a0a4aeaf3 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B
 	end
 
 SkyPillar_2F_EventScript_23964C:: @ 823964C
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC
+	setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN
 	return
 
 SkyPillar_2F_MapScript1_239650: @ 8239650
diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc
index 015d754eb..d78ee6266 100644
--- a/data/maps/SkyPillar_3F/scripts.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661
 	end
 
 SkyPillar_3F_EventScript_23966D:: @ 823966D
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4
+	setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
index ccab2453c..3904e954f 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681
 	end
 
 SkyPillar_4F_EventScript_239692:: @ 8239692
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C
+	setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN
 	return
 
 SkyPillar_4F_MapScript1_239696: @ 8239696
diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc
index b3e3f6605..20478e77e 100644
--- a/data/maps/SkyPillar_5F/scripts.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
@@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8
 	return
 
 SkyPillar_5F_EventScript_2396B4:: @ 82396B4
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4
+	setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index f764ea79c..4ca4c4681 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6
 	end
 
 SkyPillar_Top_EventScript_2396FD:: @ 82396FD
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24
+	setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 9d554f8eb..1cd4611e9 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800
 	return
 
 SootopolisCity_EventScript_1E5801:: @ 81E5801
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE
 	return
 
 SootopolisCity_EventScript_1E5805:: @ 81E5805
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 252bd1201..5db204293 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 3, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json
index 8f7ac0226..956a68158 100644
--- a/data/maps/UnknownMap_25_29/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_29/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_29",
-  "name": "UnknownMap_25_29",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_29",
+  "name": "UnknownLinkContestRoom_25_29",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_29/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc
diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json
index 5f321e6b5..526c6de2a 100644
--- a/data/maps/UnknownMap_25_30/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_30/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_30",
-  "name": "UnknownMap_25_30",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_30",
+  "name": "UnknownLinkContestRoom_25_30",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_30/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc
diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json
index f7b06ac42..9548c1125 100644
--- a/data/maps/UnknownMap_25_31/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_31/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_31",
-  "name": "UnknownMap_25_31",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_31",
+  "name": "UnknownLinkContestRoom_25_31",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_31/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc
diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json
index c963d0129..27411d28e 100644
--- a/data/maps/UnknownMap_25_32/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_32/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_32",
-  "name": "UnknownMap_25_32",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_32",
+  "name": "UnknownLinkContestRoom_25_32",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_32/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc
diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
index 441f767b6..1a15ae6d6 100644
--- a/data/maps/UnknownMap_25_33/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_33/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_33",
-  "name": "UnknownMap_25_33",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_33",
+  "name": "UnknownLinkContestRoom_25_33",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_33/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc
diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
index 7bdf1d226..4c90858b9 100644
--- a/data/maps/UnknownMap_25_34/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_34/map.json
@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_34",
-  "name": "UnknownMap_25_34",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_34",
+  "name": "UnknownLinkContestRoom_25_34",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
index 8b1378917..8b1378917 100644
--- a/data/maps/UnknownMap_25_34/scripts.inc
+++ b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index e20d1adf2..4088ddbb5 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -461,12 +461,12 @@
     "RecordCorner",
     "DoubleBattleColosseum",
     "LinkContestRoom1",
-    "UnknownMap_25_29",
-    "UnknownMap_25_30",
-    "UnknownMap_25_31",
-    "UnknownMap_25_32",
-    "UnknownMap_25_33",
-    "UnknownMap_25_34",
+    "UnknownLinkContestRoom_25_29",
+    "UnknownLinkContestRoom_25_30",
+    "UnknownLinkContestRoom_25_31",
+    "UnknownLinkContestRoom_25_32",
+    "UnknownLinkContestRoom_25_33",
+    "UnknownLinkContestRoom_25_34",
     "LinkContestRoom2",
     "LinkContestRoom3",
     "LinkContestRoom4",
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index 2083e17df..c56234b13 100644
--- a/data/tilesets/headers.inc
+++ b/data/tilesets/headers.inc
@@ -7,7 +7,7 @@ gTileset_General:: @ 83DF704
 	.4byte gTilesetPalettes_General
 	.4byte gMetatiles_General
 	.4byte gMetatileAttributes_General
-	.4byte TilesetCb_General
+	.4byte InitTilesetAnim_General
 
 	.align 2
 gTileset_Petalburg:: @ 83DF71C
@@ -18,7 +18,7 @@ gTileset_Petalburg:: @ 83DF71C
 	.4byte gTilesetPalettes_Petalburg
 	.4byte gMetatiles_Petalburg
 	.4byte gMetatileAttributes_Petalburg
-	.4byte TilesetCb_Petalburg
+	.4byte InitTilesetAnim_Petalburg
 
 	.align 2
 gTileset_Rustboro:: @ 83DF734
@@ -29,7 +29,7 @@ gTileset_Rustboro:: @ 83DF734
 	.4byte gTilesetPalettes_Rustboro
 	.4byte gMetatiles_Rustboro
 	.4byte gMetatileAttributes_Rustboro
-	.4byte TilesetCb_Rustboro
+	.4byte InitTilesetAnim_Rustboro
 
 	.align 2
 gTileset_Dewford:: @ 83DF74C
@@ -40,7 +40,7 @@ gTileset_Dewford:: @ 83DF74C
 	.4byte gTilesetPalettes_Dewford
 	.4byte gMetatiles_Dewford
 	.4byte gMetatileAttributes_Dewford
-	.4byte TilesetCb_Dewford
+	.4byte InitTilesetAnim_Dewford
 
 	.align 2
 gTileset_Slateport:: @ 83DF764
@@ -51,7 +51,7 @@ gTileset_Slateport:: @ 83DF764
 	.4byte gTilesetPalettes_Slateport
 	.4byte gMetatiles_Slateport
 	.4byte gMetatileAttributes_Slateport
-	.4byte TilesetCb_Slateport
+	.4byte InitTilesetAnim_Slateport
 
 	.align 2
 gTileset_Mauville:: @ 83DF77C
@@ -62,7 +62,7 @@ gTileset_Mauville:: @ 83DF77C
 	.4byte gTilesetPalettes_Mauville
 	.4byte gMetatiles_Mauville
 	.4byte gMetatileAttributes_Mauville
-	.4byte TilesetCb_Mauville
+	.4byte InitTilesetAnim_Mauville
 
 	.align 2
 gTileset_Lavaridge:: @ 83DF794
@@ -73,7 +73,7 @@ gTileset_Lavaridge:: @ 83DF794
 	.4byte gTilesetPalettes_Lavaridge
 	.4byte gMetatiles_Lavaridge
 	.4byte gMetatileAttributes_Lavaridge
-	.4byte TilesetCb_Lavaridge
+	.4byte InitTilesetAnim_Lavaridge
 
 	.align 2
 gTileset_Fallarbor:: @ 83DF7AC
@@ -84,7 +84,7 @@ gTileset_Fallarbor:: @ 83DF7AC
 	.4byte gTilesetPalettes_Fallarbor
 	.4byte gMetatiles_Fallarbor
 	.4byte gMetatileAttributes_Fallarbor
-	.4byte TilesetCb_Fallarbor
+	.4byte InitTilesetAnim_Fallarbor
 
 	.align 2
 gTileset_Fortree:: @ 83DF7C4
@@ -95,7 +95,7 @@ gTileset_Fortree:: @ 83DF7C4
 	.4byte gTilesetPalettes_Fortree
 	.4byte gMetatiles_Fortree
 	.4byte gMetatileAttributes_Fortree
-	.4byte TilesetCb_Fortree
+	.4byte InitTilesetAnim_Fortree
 
 	.align 2
 gTileset_Lilycove:: @ 83DF7DC
@@ -106,7 +106,7 @@ gTileset_Lilycove:: @ 83DF7DC
 	.4byte gTilesetPalettes_Lilycove
 	.4byte gMetatiles_Lilycove
 	.4byte gMetatileAttributes_Lilycove
-	.4byte TilesetCb_Lilycove
+	.4byte InitTilesetAnim_Lilycove
 
 	.align 2
 gTileset_Mossdeep:: @ 83DF7F4
@@ -117,7 +117,7 @@ gTileset_Mossdeep:: @ 83DF7F4
 	.4byte gTilesetPalettes_Mossdeep
 	.4byte gMetatiles_Mossdeep
 	.4byte gMetatileAttributes_Mossdeep
-	.4byte TilesetCb_Mossdeep
+	.4byte InitTilesetAnim_Mossdeep
 
 	.align 2
 gTileset_EverGrande:: @ 83DF80C
@@ -128,7 +128,7 @@ gTileset_EverGrande:: @ 83DF80C
 	.4byte gTilesetPalettes_EverGrande
 	.4byte gMetatiles_EverGrande
 	.4byte gMetatileAttributes_EverGrande
-	.4byte TilesetCb_EverGrande
+	.4byte InitTilesetAnim_EverGrande
 
 	.align 2
 gTileset_Pacifidlog:: @ 83DF824
@@ -139,7 +139,7 @@ gTileset_Pacifidlog:: @ 83DF824
 	.4byte gTilesetPalettes_Pacifidlog
 	.4byte gMetatiles_Pacifidlog
 	.4byte gMetatileAttributes_Pacifidlog
-	.4byte TilesetCb_Pacifidlog
+	.4byte InitTilesetAnim_Pacifidlog
 
 	.align 2
 gTileset_Sootopolis:: @ 83DF83C
@@ -150,7 +150,7 @@ gTileset_Sootopolis:: @ 83DF83C
 	.4byte gTilesetPalettes_Sootopolis
 	.4byte gMetatiles_Sootopolis
 	.4byte gMetatileAttributes_Sootopolis
-	.4byte TilesetCb_Sootopolis
+	.4byte InitTilesetAnim_Sootopolis
 
 	.align 2
 gTileset_BattleFrontierOutsideWest:: @ 83DF854
@@ -161,7 +161,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854
 	.4byte gTilesetPalettes_BattleFrontierOutsideWest
 	.4byte gMetatiles_BattleFrontierOutsideWest
 	.4byte gMetatileAttributes_BattleFrontierOutsideWest
-	.4byte TilesetCb_BattleFrontierOutsideWest
+	.4byte InitTilesetAnim_BattleFrontierOutsideWest
 
 	.align 2
 gTileset_BattleFrontierOutsideEast:: @ 83DF86C
@@ -172,7 +172,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C
 	.4byte gTilesetPalettes_BattleFrontierOutsideEast
 	.4byte gMetatiles_BattleFrontierOutsideEast
 	.4byte gMetatileAttributes_BattleFrontierOutsideEast
-	.4byte TilesetCb_BattleFrontierOutsideEast
+	.4byte InitTilesetAnim_BattleFrontierOutsideEast
 
 	.align 2
 gTileset_Building:: @ 83DF884
@@ -183,7 +183,7 @@ gTileset_Building:: @ 83DF884
 	.4byte gTilesetPalettes_InsideBuilding
 	.4byte gMetatiles_InsideBuilding
 	.4byte gMetatileAttributes_InsideBuilding
-	.4byte TilesetCb_InsideBuilding
+	.4byte InitTilesetAnim_Building
 
 	.align 2
 gTileset_Shop:: @ 83DF89C
@@ -216,7 +216,7 @@ gTileset_Cave:: @ 83DF8CC
 	.4byte gTilesetPalettes_Cave
 	.4byte gMetatiles_Cave
 	.4byte gMetatileAttributes_Cave
-	.4byte TilesetCb_Cave
+	.4byte InitTilesetAnim_Cave
 
 	.align 2
 gTileset_PokemonSchool:: @ 83DF8E4
@@ -337,7 +337,7 @@ gTileset_BikeShop:: @ 83DF9D4
 	.4byte gTilesetPalettes_BikeShop
 	.4byte gMetatiles_BikeShop
 	.4byte gMetatileAttributes_BikeShop
-	.4byte TilesetCb_BikeShop
+	.4byte InitTilesetAnim_BikeShop
 
 	.align 2
 gTileset_RusturfTunnel:: @ 83DF9EC
@@ -491,7 +491,7 @@ gTileset_Underwater:: @ 83DFB24
 	.4byte gTilesetPalettes_Underwater
 	.4byte gMetatiles_Underwater
 	.4byte gMetatileAttributes_Underwater
-	.4byte TilesetCb_Underwater
+	.4byte InitTilesetAnim_Underwater
 
 	.align 2
 gTileset_PetalburgGym:: @ 83DFB3C
@@ -513,7 +513,7 @@ gTileset_SootopolisGym:: @ 83DFB54
 	.4byte gTilesetPalettes_SootopolisGym
 	.4byte gMetatiles_SootopolisGym
 	.4byte gMetatileAttributes_SootopolisGym
-	.4byte TilesetCb_SootopolisGym
+	.4byte InitTilesetAnim_SootopolisGym
 
 	.align 2
 gTileset_GenericBuilding:: @ 83DFB6C
@@ -568,7 +568,7 @@ gTileset_MauvilleGym:: @ 83DFBCC
 	.4byte gTilesetPalettes_MauvilleGym
 	.4byte gMetatiles_MauvilleGym
 	.4byte gMetatileAttributes_MauvilleGym
-	.4byte TilesetCb_MauvilleGym
+	.4byte InitTilesetAnim_MauvilleGym
 
 	.align 2
 gTileset_LavaridgeGym:: @ 83DFBE4
@@ -653,7 +653,7 @@ gTileset_EliteFour:: @ 83DFC7C
 	.4byte gTilesetPalettes_EliteFour
 	.4byte gMetatiles_EliteFour
 	.4byte gMetatileAttributes_EliteFour
-	.4byte TilesetCb_EliteFour
+	.4byte InitTilesetAnim_EliteFour
 
 	.align 2
 gTileset_BattleFrontier:: @ 83DFC94
@@ -686,7 +686,7 @@ gTileset_BattleDome:: @ 83DFCC4
 	.4byte gTilesetPalettes_BattleDome
 	.4byte gMetatiles_BattleDome
 	.4byte gMetatileAttributes_BattleDome
-	.4byte TilesetCb_BattleDome
+	.4byte InitTilesetAnim_BattleDome
 
 	.align 2
 gTileset_BattleFactory:: @ 83DFCDC
@@ -730,7 +730,7 @@ gTileset_BattlePyramid:: @ 83DFD24
 	.4byte gTilesetPalettes_BattlePyramid
 	.4byte gMetatiles_BattlePyramid
 	.4byte gMetatileAttributes_BattlePyramid
-	.4byte TilesetCb_BattlePyramid
+	.4byte InitTilesetAnim_BattlePyramid
 
 	.align 2
 gTileset_MirageTower:: @ 83DFD3C
diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/tv_turned_on/0.png
index 1d98f3621..1d98f3621 100644
--- a/data/tilesets/primary/building/anim/0.png
+++ b/data/tilesets/primary/building/anim/tv_turned_on/0.png
diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/tv_turned_on/1.png
index 6798473b7..6798473b7 100644
--- a/data/tilesets/primary/building/anim/1.png
+++ b/data/tilesets/primary/building/anim/tv_turned_on/1.png
diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/flower/0.png
index 1254a7655..1254a7655 100644
--- a/data/tilesets/primary/general/anim/0/0.png
+++ b/data/tilesets/primary/general/anim/flower/0.png
diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/flower/1.png
index 50bd949f2..50bd949f2 100644
--- a/data/tilesets/primary/general/anim/0/1.png
+++ b/data/tilesets/primary/general/anim/flower/1.png
diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/flower/2.png
index 5d8192c9d..5d8192c9d 100644
--- a/data/tilesets/primary/general/anim/0/2.png
+++ b/data/tilesets/primary/general/anim/flower/2.png
diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/land_water_edge/0.png
index ba160b633..ba160b633 100644
--- a/data/tilesets/primary/general/anim/4/0.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/0.png
diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/land_water_edge/1.png
index 48274c9a0..48274c9a0 100644
--- a/data/tilesets/primary/general/anim/4/1.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/1.png
diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/land_water_edge/2.png
index 9e1f98c1b..9e1f98c1b 100644
--- a/data/tilesets/primary/general/anim/4/2.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/2.png
diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/land_water_edge/3.png
index c5b446f65..c5b446f65 100644
--- a/data/tilesets/primary/general/anim/4/3.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/3.png
diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/sand_water_edge/0.png
index 80c99c473..80c99c473 100644
--- a/data/tilesets/primary/general/anim/2/0.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/0.png
diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/sand_water_edge/1.png
index 52051f056..52051f056 100644
--- a/data/tilesets/primary/general/anim/2/1.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/1.png
diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/sand_water_edge/2.png
index 39c6e2f87..39c6e2f87 100644
--- a/data/tilesets/primary/general/anim/2/2.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/2.png
diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/sand_water_edge/3.png
index abb5ff362..abb5ff362 100644
--- a/data/tilesets/primary/general/anim/2/3.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/3.png
diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/sand_water_edge/4.png
index a7bde9837..a7bde9837 100644
--- a/data/tilesets/primary/general/anim/2/4.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/4.png
diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/sand_water_edge/5.png
index 05f88d81e..05f88d81e 100644
--- a/data/tilesets/primary/general/anim/2/5.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/5.png
diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/sand_water_edge/6.png
index 01f9c203d..01f9c203d 100644
--- a/data/tilesets/primary/general/anim/2/6.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/6.png
diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/water/0.png
index d3f2ea0da..d3f2ea0da 100644
--- a/data/tilesets/primary/general/anim/1/0.png
+++ b/data/tilesets/primary/general/anim/water/0.png
diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/water/1.png
index 86b0ff176..86b0ff176 100644
--- a/data/tilesets/primary/general/anim/1/1.png
+++ b/data/tilesets/primary/general/anim/water/1.png
diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/water/2.png
index d2302180e..d2302180e 100644
--- a/data/tilesets/primary/general/anim/1/2.png
+++ b/data/tilesets/primary/general/anim/water/2.png
diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/water/3.png
index f757f8253..f757f8253 100644
--- a/data/tilesets/primary/general/anim/1/3.png
+++ b/data/tilesets/primary/general/anim/water/3.png
diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/water/4.png
index 950b88585..950b88585 100644
--- a/data/tilesets/primary/general/anim/1/4.png
+++ b/data/tilesets/primary/general/anim/water/4.png
diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/water/5.png
index 4de7d4225..4de7d4225 100644
--- a/data/tilesets/primary/general/anim/1/5.png
+++ b/data/tilesets/primary/general/anim/water/5.png
diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/water/6.png
index 73c1cabdd..73c1cabdd 100644
--- a/data/tilesets/primary/general/anim/1/6.png
+++ b/data/tilesets/primary/general/anim/water/6.png
diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/water/7.png
index 827fd8b74..827fd8b74 100644
--- a/data/tilesets/primary/general/anim/1/7.png
+++ b/data/tilesets/primary/general/anim/water/7.png
diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/waterfall/0.png
index e307d81aa..e307d81aa 100644
--- a/data/tilesets/primary/general/anim/3/0.png
+++ b/data/tilesets/primary/general/anim/waterfall/0.png
diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/waterfall/1.png
index df6aaf3bc..df6aaf3bc 100644
--- a/data/tilesets/primary/general/anim/3/1.png
+++ b/data/tilesets/primary/general/anim/waterfall/1.png
diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/waterfall/2.png
index 560f89d06..560f89d06 100644
--- a/data/tilesets/primary/general/anim/3/2.png
+++ b/data/tilesets/primary/general/anim/waterfall/2.png
diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/waterfall/3.png
index a8db289ae..a8db289ae 100644
--- a/data/tilesets/primary/general/anim/3/3.png
+++ b/data/tilesets/primary/general/anim/waterfall/3.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png
index 98f1a9283..98f1a9283 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png
index d0254e9ee..d0254e9ee 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png
index 1be9641b8..1be9641b8 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png
index 7a536f24c..7a536f24c 100644
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png
index 98f1a9283..98f1a9283 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png
index d0254e9ee..d0254e9ee 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png
index 1be9641b8..1be9641b8 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png
diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png
index 7a536f24c..7a536f24c 100644
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png
index c135df824..c135df824 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/1/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png
index 2588bdac0..2588bdac0 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/1/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png
index fbbf67d2f..fbbf67d2f 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/1/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png
index 04bb8ad84..04bb8ad84 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/0/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png
index e292686f9..e292686f9 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/0/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png
diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png
index fa24db001..fa24db001 100644
--- a/data/tilesets/secondary/battle_pyramid/anim/0/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png
diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png
index 127ed4e47..127ed4e47 100644
--- a/data/tilesets/secondary/bike_shop/anim/0.png
+++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png
diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png
index 71f12a746..71f12a746 100644
--- a/data/tilesets/secondary/bike_shop/anim/1.png
+++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png
diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/lava/0.png
index e98a161eb..e98a161eb 100644
--- a/data/tilesets/secondary/cave/anim/0.png
+++ b/data/tilesets/secondary/cave/anim/lava/0.png
diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/lava/1.png
index 12ffcd12c..12ffcd12c 100644
--- a/data/tilesets/secondary/cave/anim/1.png
+++ b/data/tilesets/secondary/cave/anim/lava/1.png
diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/lava/2.png
index c5be89c00..c5be89c00 100644
--- a/data/tilesets/secondary/cave/anim/2.png
+++ b/data/tilesets/secondary/cave/anim/lava/2.png
diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/lava/3.png
index 635a81154..635a81154 100644
--- a/data/tilesets/secondary/cave/anim/3.png
+++ b/data/tilesets/secondary/cave/anim/lava/3.png
diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/lava/4.png
index cea6ece85..cea6ece85 100644
--- a/data/tilesets/secondary/cave/anim/unused/0.png
+++ b/data/tilesets/secondary/cave/anim/lava/4.png
diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/lava/5.png
index 01d8a300a..01d8a300a 100644
--- a/data/tilesets/secondary/cave/anim/unused/1.png
+++ b/data/tilesets/secondary/cave/anim/lava/5.png
diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/lava/6.png
index ba13bda8c..ba13bda8c 100644
--- a/data/tilesets/secondary/cave/anim/unused/2.png
+++ b/data/tilesets/secondary/cave/anim/lava/6.png
diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/lava/7.png
index 117f04aa4..117f04aa4 100644
--- a/data/tilesets/secondary/cave/anim/unused/3.png
+++ b/data/tilesets/secondary/cave/anim/lava/7.png
diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/flag/0.png
index f80971c45..f80971c45 100644
--- a/data/tilesets/secondary/dewford/anim/0.png
+++ b/data/tilesets/secondary/dewford/anim/flag/0.png
diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/flag/1.png
index b98d9cafb..b98d9cafb 100644
--- a/data/tilesets/secondary/dewford/anim/1.png
+++ b/data/tilesets/secondary/dewford/anim/flag/1.png
diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/flag/2.png
index 6f88f493f..6f88f493f 100644
--- a/data/tilesets/secondary/dewford/anim/2.png
+++ b/data/tilesets/secondary/dewford/anim/flag/2.png
diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/flag/3.png
index b95b4bc9e..b95b4bc9e 100644
--- a/data/tilesets/secondary/dewford/anim/3.png
+++ b/data/tilesets/secondary/dewford/anim/flag/3.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/floor_light/0.png
index 6e508308b..6e508308b 100644
--- a/data/tilesets/secondary/elite_four/anim/1/0.png
+++ b/data/tilesets/secondary/elite_four/anim/floor_light/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/floor_light/1.png
index 794f26195..794f26195 100644
--- a/data/tilesets/secondary/elite_four/anim/1/1.png
+++ b/data/tilesets/secondary/elite_four/anim/floor_light/1.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png
index 108a2099b..108a2099b 100644
--- a/data/tilesets/secondary/elite_four/anim/0/0.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png
index 64b23f061..64b23f061 100644
--- a/data/tilesets/secondary/elite_four/anim/0/1.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png
index 0d9f603fc..0d9f603fc 100644
--- a/data/tilesets/secondary/elite_four/anim/0/2.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png
diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png
index 64b23f061..64b23f061 100644
--- a/data/tilesets/secondary/elite_four/anim/0/3.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png
diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/0.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/0.png
diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/flowers/1.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/1.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/1.png
diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/flowers/2.png
index 4f8baa2a3..4f8baa2a3 100644
--- a/data/tilesets/secondary/ever_grande/anim/2.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/2.png
diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/flowers/3.png
index f120dee16..f120dee16 100644
--- a/data/tilesets/secondary/ever_grande/anim/3.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/3.png
diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/flowers/4.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/4.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/4.png
diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/flowers/5.png
index ac03df40b..ac03df40b 100644
--- a/data/tilesets/secondary/ever_grande/anim/5.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/5.png
diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/flowers/6.png
index d7cfd4529..d7cfd4529 100644
--- a/data/tilesets/secondary/ever_grande/anim/6.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/6.png
diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/flowers/7.png
index d7cfd4529..d7cfd4529 100644
--- a/data/tilesets/secondary/ever_grande/anim/7.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/7.png
diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/steam/0.png
index 434041fbd..434041fbd 100644
--- a/data/tilesets/secondary/lavaridge/anim/0.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/0.png
diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/steam/1.png
index ebc028ed4..ebc028ed4 100644
--- a/data/tilesets/secondary/lavaridge/anim/1.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/1.png
diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/steam/2.png
index aee227f05..aee227f05 100644
--- a/data/tilesets/secondary/lavaridge/anim/2.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/2.png
diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/steam/3.png
index 99149ae62..99149ae62 100644
--- a/data/tilesets/secondary/lavaridge/anim/3.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/3.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/flower_1/0.png
index b20c5470e..b20c5470e 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/0.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/0.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/1.png
index 0587295fc..0587295fc 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/1.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/flower_1/2.png
index af0dd4ffe..af0dd4ffe 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/2.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/2.png
diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/flower_1/3.png
index bc132f2ef..bc132f2ef 100644
--- a/data/tilesets/secondary/mauville/anim/0/a/3.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/3.png
diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/4.png
index 911b980a3..911b980a3 100644
--- a/data/tilesets/secondary/mauville/anim/1/a/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/4.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/flower_2/0.png
index b20c5470e..b20c5470e 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/0.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/0.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/1.png
index 0587295fc..0587295fc 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/1.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/flower_2/2.png
index af0dd4ffe..af0dd4ffe 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/2.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/2.png
diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/flower_2/3.png
index bc132f2ef..bc132f2ef 100644
--- a/data/tilesets/secondary/mauville/anim/0/b/3.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/3.png
diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/4.png
index 911b980a3..911b980a3 100644
--- a/data/tilesets/secondary/mauville/anim/1/b/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/4.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png
index ebf603978..ebf603978 100644
--- a/data/tilesets/secondary/mauville_gym/anim/0.png
+++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png
diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png
index 34072707f..34072707f 100644
--- a/data/tilesets/secondary/mauville_gym/anim/1.png
+++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png
index 316eb500e..316eb500e 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png
index ee9d4316e..ee9d4316e 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png
index 221a71585..221a71585 100644
--- a/data/tilesets/secondary/pacifidlog/anim/0/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png
index 6d432eb25..6d432eb25 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png
index 7588b8a72..7588b8a72 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png
index 2a11e5065..2a11e5065 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png
index be4089ff4..be4089ff4 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/3.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png
index 4c16111de..4c16111de 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/4.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png
index 93bbc6375..93bbc6375 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/5.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png
index b08f5a0d9..b08f5a0d9 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/6.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png
diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png
index 1a5f0ae5c..1a5f0ae5c 100644
--- a/data/tilesets/secondary/pacifidlog/anim/1/7.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/fountain/0.png
index 07471595b..07471595b 100644
--- a/data/tilesets/secondary/rustboro/anim/1/0.png
+++ b/data/tilesets/secondary/rustboro/anim/fountain/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/fountain/1.png
index 408f2b03a..408f2b03a 100644
--- a/data/tilesets/secondary/rustboro/anim/1/1.png
+++ b/data/tilesets/secondary/rustboro/anim/fountain/1.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/windy_water/0.png
index af00b97c7..af00b97c7 100644
--- a/data/tilesets/secondary/rustboro/anim/0/0.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/0.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/windy_water/1.png
index 20b1ef630..20b1ef630 100644
--- a/data/tilesets/secondary/rustboro/anim/0/1.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/1.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/windy_water/2.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/2.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/2.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/windy_water/3.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/3.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/3.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/windy_water/4.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/4.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/4.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/windy_water/5.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/5.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/5.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/windy_water/6.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/6.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/6.png
diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/windy_water/7.png
index 44c4b2cdc..44c4b2cdc 100644
--- a/data/tilesets/secondary/rustboro/anim/0/7.png
+++ b/data/tilesets/secondary/rustboro/anim/windy_water/7.png
diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/balloons/0.png
index 28bf60f26..28bf60f26 100644
--- a/data/tilesets/secondary/slateport/anim/0.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/0.png
diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/balloons/1.png
index 31d22f697..31d22f697 100644
--- a/data/tilesets/secondary/slateport/anim/1.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/1.png
diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/balloons/2.png
index 83b0e3940..83b0e3940 100644
--- a/data/tilesets/secondary/slateport/anim/2.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/2.png
diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/balloons/3.png
index 31d22f697..31d22f697 100644
--- a/data/tilesets/secondary/slateport/anim/3.png
+++ b/data/tilesets/secondary/slateport/anim/balloons/3.png
diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png
index 6ae032652..6ae032652 100644
--- a/data/tilesets/secondary/sootopolis/anim/0.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png
diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png
index 5bf8f7a98..5bf8f7a98 100644
--- a/data/tilesets/secondary/sootopolis/anim/1.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png
diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png
index 85598e145..85598e145 100644
--- a/data/tilesets/secondary/sootopolis/anim/2.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png
diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png
index c7aad10c7..c7aad10c7 100644
--- a/data/tilesets/secondary/sootopolis/anim/3.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png
diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png
index ec446b9db..ec446b9db 100644
--- a/data/tilesets/secondary/sootopolis/anim/4.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png
diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png
index cbe1769c0..cbe1769c0 100644
--- a/data/tilesets/secondary/sootopolis/anim/5.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png
diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png
index 690c5fd8e..690c5fd8e 100644
--- a/data/tilesets/secondary/sootopolis/anim/6.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png
diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png
index e4026a02f..e4026a02f 100644
--- a/data/tilesets/secondary/sootopolis/anim/7.png
+++ b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png
index dc6cf500e..dc6cf500e 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png
index 93dd79753..93dd79753 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png
index 30961482c..30961482c 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png
index 180b5522e..180b5522e 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png
index af3ab12d2..af3ab12d2 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png
diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png
index 8481c0cde..8481c0cde 100644
--- a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png
+++ b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png
diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/seaweed/0.png
index fab28e54f..fab28e54f 100644
--- a/data/tilesets/secondary/underwater/anim/0.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/0.png
diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/seaweed/1.png
index 869bc6060..869bc6060 100644
--- a/data/tilesets/secondary/underwater/anim/1.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/1.png
diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/seaweed/2.png
index 64e4b267d..64e4b267d 100644
--- a/data/tilesets/secondary/underwater/anim/2.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/2.png
diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/seaweed/3.png
index 0c1392011..0c1392011 100644
--- a/data/tilesets/secondary/underwater/anim/3.png
+++ b/data/tilesets/secondary/underwater/anim/seaweed/3.png