Merge branch 'master' of github.com:pret/pokeemerald

Makefile

@@ -38,7 +38,7 @@ ASFLAGS := -mcpu=arm7tdmi
 CC1             := tools/agbcc/bin/agbcc$(EXE)
 override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
 
-CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include
+CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -Wno-trigraphs
 
 LDFLAGS = -Map ../../$(MAP)
 

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/UnknownLinkContestRoom_25_29/scripts.inc"
-	.include "data/maps/UnknownMap_25_30/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
-	.include "data/maps/UnknownMap_25_31/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc"
-	.include "data/maps/UnknownMap_25_32/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc"
-	.include "data/maps/UnknownMap_25_33/scripts.inc"
+	.include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc"
-	.include "data/maps/UnknownMap_25_34/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

data/layouts/layouts.json

@@ -452,14 +452,14 @@
       "blockdata_filepath": "data/layouts/Route129/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08417FC4",
+      "id": "LAYOUT_ROUTE130_MIRAGE_ISLAND",
-      "name": "UnknownMap_08417FC4_Layout",
+      "name": "Route130_MirageIsland_Layout",
       "width": 80,
       "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin",
+      "border_filepath": "data/layouts/Route130_MirageIsland/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.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",
+      "id": "LAYOUT_UNKNOWN_08428450",
-      "name": "UnknownMap_08428450_Layout",
+      "name": "Unknown_08428450_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_08428450/border.bin",
+      "border_filepath": "data/layouts/Unknown_08428450/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.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",
+      "id": "LAYOUT_UNKNOWN_084294C4",
-      "name": "UnknownMap_084294C4_Layout",
+      "name": "Unknown_084294C4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin",
+      "border_filepath": "data/layouts/Unknown_084294C4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084294E8",
+      "id": "LAYOUT_UNKNOWN_084294E8",
-      "name": "UnknownMap_084294E8_Layout",
+      "name": "Unknown_084294E8_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Contest",
-      "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin",
+      "border_filepath": "data/layouts/Unknown_084294E8/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.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",
+      "id": "LAYOUT_UNKNOWN_0843E6C0",
-      "name": "UnknownMap_0843E6C0_Layout",
+      "name": "Unknown_0843E6C0_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E6C0/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E6E4",
+      "id": "LAYOUT_UNKNOWN_0843E6E4",
-      "name": "UnknownMap_0843E6E4_Layout",
+      "name": "Unknown_0843E6E4_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E6E4/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E708",
+      "id": "LAYOUT_UNKNOWN_0843E708",
-      "name": "UnknownMap_0843E708_Layout",
+      "name": "Unknown_0843E708_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E708/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E72C",
+      "id": "LAYOUT_UNKNOWN_0843E72C",
-      "name": "UnknownMap_0843E72C_Layout",
+      "name": "Unknown_0843E72C_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E72C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E750",
+      "id": "LAYOUT_UNKNOWN_0843E750",
-      "name": "UnknownMap_0843E750_Layout",
+      "name": "Unknown_0843E750_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E750/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E774",
+      "id": "LAYOUT_UNKNOWN_0843E774",
-      "name": "UnknownMap_0843E774_Layout",
+      "name": "Unknown_0843E774_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E774/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E798",
+      "id": "LAYOUT_UNKNOWN_0843E798",
-      "name": "UnknownMap_0843E798_Layout",
+      "name": "Unknown_0843E798_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E798/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E7BC",
+      "id": "LAYOUT_UNKNOWN_0843E7BC",
-      "name": "UnknownMap_0843E7BC_Layout",
+      "name": "Unknown_0843E7BC_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E7BC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E7E0",
+      "id": "LAYOUT_UNKNOWN_0843E7E0",
-      "name": "UnknownMap_0843E7E0_Layout",
+      "name": "Unknown_0843E7E0_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E7E0/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E804",
+      "id": "LAYOUT_UNKNOWN_0843E804",
-      "name": "UnknownMap_0843E804_Layout",
+      "name": "Unknown_0843E804_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E804/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E828",
+      "id": "LAYOUT_UNKNOWN_0843E828",
-      "name": "UnknownMap_0843E828_Layout",
+      "name": "Unknown_0843E828_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E828/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E84C",
+      "id": "LAYOUT_UNKNOWN_0843E84C",
-      "name": "UnknownMap_0843E84C_Layout",
+      "name": "Unknown_0843E84C_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E84C/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E870",
+      "id": "LAYOUT_UNKNOWN_0843E870",
-      "name": "UnknownMap_0843E870_Layout",
+      "name": "Unknown_0843E870_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E870/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin"
+      "blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0843E894",
+      "id": "LAYOUT_UNKNOWN_0843E894",
-      "name": "UnknownMap_0843E894_Layout",
+      "name": "Unknown_0843E894_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Cave",
-      "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin",
+      "border_filepath": "data/layouts/Unknown_0843E894/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.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",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
-      "name": "UnknownMap_25_29_Layout",
+      "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",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin"
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_30",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
-      "name": "UnknownMap_25_30_Layout",
+      "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",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin"
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_31",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
-      "name": "UnknownMap_25_31_Layout",
+      "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",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin"
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_32",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
-      "name": "UnknownMap_25_32_Layout",
+      "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",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin"
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_33",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
-      "name": "UnknownMap_25_33_Layout",
+      "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",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin"
+      "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_25_34",
+      "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
-      "name": "UnknownMap_25_34_Layout",
+      "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",
+      "border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.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",
+      "id": "LAYOUT_UNKNOWN_08447028",
-      "name": "UnknownMap_08447028_Layout",
+      "name": "Unknown_08447028_Layout",
       "width": 58,
       "height": 26,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "0",
-      "border_filepath": "data/layouts/UnknownMap_08447028/border.bin",
+      "border_filepath": "data/layouts/Unknown_08447028/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.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",
+      "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA",
-      "name": "UnknownMap_0845A394_Layout",
+      "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",
+      "border_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.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",
+      "id": "LAYOUT_ROUTE131_SKY_PILLAR",
-      "name": "UnknownMap_0845D470_Layout",
+      "name": "Route131_SkyPillar_Layout",
       "width": 60,
       "height": 40,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Pacifidlog",
-      "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin",
+      "border_filepath": "data/layouts/Route131_SkyPillar/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.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",
+      "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA",
-      "name": "UnknownMap_0845ECB4_Layout",
+      "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",
+      "border_filepath": "data/layouts/SeafloorCavern_Room9_Lava/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.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",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE",
-      "name": "UnknownMap_08469200_Layout",
+      "name": "SootopolisCity_LegendsBattle_Layout",
       "width": 60,
       "height": 60,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_Sootopolis",
-      "border_filepath": "data/layouts/UnknownMap_08469200/border.bin",
+      "border_filepath": "data/layouts/SootopolisCity_LegendsBattle/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.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",
+      "id": "LAYOUT_UNKNOWN_084693AC",
-      "name": "UnknownMap_084693AC_Layout",
+      "name": "Unknown_084693AC_Layout",
       "width": 1,
       "height": 1,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_BattlePike",
-      "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin",
+      "border_filepath": "data/layouts/Unknown_084693AC/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.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",
+      "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE",
-      "name": "UnknownMap_08480DAC_Layout",
+      "name": "LittlerootTown_ProfessorBirchsLabWithTable_Layout",
       "width": 13,
       "height": 13,
       "primary_tileset": "gTileset_Building",
       "secondary_tileset": "gTileset_Lab",
-      "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin",
+      "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin"
+      "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08480F54",
+      "id": "LAYOUT_SKY_PILLAR_1F_CLEAN",
-      "name": "UnknownMap_08480F54_Layout",
+      "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",
+      "border_filepath": "data/layouts/SkyPillar_1F_Clean/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin"
+      "blockdata_filepath": "data/layouts/SkyPillar_1F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084810FC",
+      "id": "LAYOUT_SKY_PILLAR_2F_CLEAN",
-      "name": "UnknownMap_084810FC_Layout",
+      "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",
+      "border_filepath": "data/layouts/SkyPillar_2F_Clean/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin"
+      "blockdata_filepath": "data/layouts/SkyPillar_2F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084812A4",
+      "id": "LAYOUT_SKY_PILLAR_3F_CLEAN",
-      "name": "UnknownMap_084812A4_Layout",
+      "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",
+      "border_filepath": "data/layouts/SkyPillar_3F_Clean/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin"
+      "blockdata_filepath": "data/layouts/SkyPillar_3F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_0848144C",
+      "id": "LAYOUT_SKY_PILLAR_4F_CLEAN",
-      "name": "UnknownMap_0848144C_Layout",
+      "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",
+      "border_filepath": "data/layouts/SkyPillar_4F_Clean/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin"
+      "blockdata_filepath": "data/layouts/SkyPillar_4F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_084815F4",
+      "id": "LAYOUT_SKY_PILLAR_5F_CLEAN",
-      "name": "UnknownMap_084815F4_Layout",
+      "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",
+      "border_filepath": "data/layouts/SkyPillar_5F_Clean/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin"
+      "blockdata_filepath": "data/layouts/SkyPillar_5F_Clean/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_08481B24",
+      "id": "LAYOUT_SKY_PILLAR_TOP_CLEAN",
-      "name": "UnknownMap_08481B24_Layout",
+      "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",
+      "border_filepath": "data/layouts/SkyPillar_Top_Clean/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.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",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED",
-      "name": "UnknownMap_08481DBC_Layout",
+      "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",
+      "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin"
+      "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin"
     }
   ]
 }

data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc

@@ -152,8 +152,8 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
+BattlePyramid_TrainerBattle:: @ 8252C4F
-	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
+	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…$"

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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"
     }
   ],

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

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

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

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