Merge with master

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

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/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
 

data/maps/SkyPillar_2F/scripts.inc

@@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B
 	end
 
 SkyPillar_2F_EventScript_23964C:: @ 823964C
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC
+	setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN
 	return
 
 SkyPillar_2F_MapScript1_239650: @ 8239650

data/maps/SkyPillar_3F/scripts.inc

@@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661
 	end
 
 SkyPillar_3F_EventScript_23966D:: @ 823966D
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4
+	setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN
 	return
 

data/maps/SkyPillar_4F/scripts.inc

@@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681
 	end
 
 SkyPillar_4F_EventScript_239692:: @ 8239692
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C
+	setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN
 	return
 
 SkyPillar_4F_MapScript1_239696: @ 8239696

data/maps/SkyPillar_5F/scripts.inc

@@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8
 	return
 
 SkyPillar_5F_EventScript_2396B4:: @ 82396B4
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4
+	setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN
 	return
 

data/maps/SkyPillar_Top/scripts.inc

@@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6
 	end
 
 SkyPillar_Top_EventScript_2396FD:: @ 82396FD
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24
+	setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	return
 

data/maps/SootopolisCity/scripts.inc

@@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800
 	return
 
 SootopolisCity_EventScript_1E5801:: @ 81E5801
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE
 	return
 
 SootopolisCity_EventScript_1E5805:: @ 81E5805

data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc

@@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 3, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
-	setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC
+	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991

data/maps/UnknownLinkContestRoom_25_29/map.json

@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_29",
-  "name": "UnknownMap_25_29",
+  "name": "UnknownLinkContestRoom_25_29",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_29",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,

data/maps/UnknownLinkContestRoom_25_30/map.json

@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_30",
-  "name": "UnknownMap_25_30",
+  "name": "UnknownLinkContestRoom_25_30",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_30",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,

data/maps/UnknownLinkContestRoom_25_31/map.json

@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_31",
-  "name": "UnknownMap_25_31",
+  "name": "UnknownLinkContestRoom_25_31",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_31",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,

data/maps/UnknownLinkContestRoom_25_32/map.json

@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_32",
-  "name": "UnknownMap_25_32",
+  "name": "UnknownLinkContestRoom_25_32",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_32",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,

data/maps/UnknownLinkContestRoom_25_33/map.json

@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_33",
-  "name": "UnknownMap_25_33",
+  "name": "UnknownLinkContestRoom_25_33",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_33",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,

data/maps/UnknownLinkContestRoom_25_34/map.json

@@ -1,7 +1,7 @@
 {
   "id": "MAP_UNKNOWN_MAP_25_34",
-  "name": "UnknownMap_25_34",
+  "name": "UnknownLinkContestRoom_25_34",
-  "layout": "LAYOUT_UNKNOWN_MAP_25_34",
+  "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,