2820 files changed, 20348 insertions, 20374 deletions

diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl
index 8ee02036d..8ee02036d 100755..100644
--- a/.travis/calcrom/calcrom.pl
+++ b/.travis/calcrom/calcrom.pl
diff --git a/.travis/calcrom/webhook.sh b/.travis/calcrom/webhook.sh
index 86da74c87..86da74c87 100755..100644
--- a/.travis/calcrom/webhook.sh
+++ b/.travis/calcrom/webhook.sh
diff --git a/asmdiff.sh b/asmdiff.sh
index a4b465b6e..a4b465b6e 100755..100644
--- a/asmdiff.sh
+++ b/asmdiff.sh
diff --git a/asmdiff_de.sh b/asmdiff_de.sh
index aa42daa5e..aa42daa5e 100755..100644
--- a/asmdiff_de.sh
+++ b/asmdiff_de.sh
diff --git a/asmdiff_de_debug.sh b/asmdiff_de_debug.sh
index 837b88cd2..837b88cd2 100755..100644
--- a/asmdiff_de_debug.sh
+++ b/asmdiff_de_debug.sh
diff --git a/build_tools.sh b/build_tools.sh
index 26f1f35b3..26f1f35b3 100755..100644
--- a/build_tools.sh
+++ b/build_tools.sh
diff --git a/build_tools_mac.sh b/build_tools_mac.sh
index 126f9f023..126f9f023 100755..100644
--- a/build_tools_mac.sh
+++ b/build_tools_mac.sh
diff --git a/charmap.txt b/charmap.txt
index e6ad2c05b..252f04607 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -523,124 +523,124 @@ SE_TB_START    = 72 00
 SE_TB_KON      = 73 00
 SE_TB_KARA     = 74 00
 SE_BIDORO      = 75 00
-BGM_STOP       = 5D 01
-BGM_TETSUJI    = 5E 01
-BGM_FIELD13    = 5F 01
-BGM_KACHI22    = 60 01
-BGM_KACHI2     = 61 01
-BGM_KACHI3     = 62 01
-BGM_KACHI5     = 63 01
-BGM_PCC        = 64 01
-BGM_NIBI       = 65 01
-BGM_SUIKUN     = 66 01
-BGM_DOORO1     = 67 01
-BGM_DOORO_X1   = 68 01
-BGM_DOORO_X3   = 69 01
-BGM_MACHI_S2   = 6A 01
-BGM_MACHI_S4   = 6B 01
-BGM_GIM        = 6C 01
-BGM_NAMINORI   = 6D 01
-BGM_DAN01      = 6E 01
-BGM_FANFA1     = 6F 01
-BGM_ME_ASA     = 70 01
-BGM_ME_BACHI   = 71 01
-BGM_FANFA4     = 72 01
-BGM_FANFA5     = 73 01
-BGM_ME_WAZA    = 74 01
-BGM_BIJYUTU    = 75 01
-BGM_DOORO_X4   = 76 01
-BGM_FUNE_KAN   = 77 01
-BGM_ME_SHINKA  = 78 01
-BGM_SHINKA     = 79 01
-BGM_ME_WASURE  = 7A 01
-BGM_SYOUJOEYE  = 7B 01
-BGM_BOYEYE     = 7C 01
-BGM_DAN02      = 7D 01
-BGM_MACHI_S3   = 7E 01
-BGM_ODAMAKI    = 7F 01
-BGM_B_TOWER    = 80 01
-BGM_SWIMEYE    = 81 01
-BGM_DAN03      = 82 01
-BGM_ME_KINOMI  = 83 01
-BGM_ME_TAMA    = 84 01
-BGM_ME_B_BIG   = 85 01
-BGM_ME_B_SMALL = 86 01
-BGM_ME_ZANNEN  = 87 01
-BGM_BD_TIME    = 88 01
-BGM_TEST1      = 89 01
-BGM_TEST2      = 8A 01
-BGM_TEST3      = 8B 01
-BGM_TEST4      = 8C 01
-BGM_TEST       = 8D 01
-BGM_GOMACHI0   = 8E 01
-BGM_GOTOWN     = 8F 01
-BGM_POKECEN    = 90 01
-BGM_NEXTROAD   = 91 01
-BGM_GRANROAD   = 92 01
-BGM_CYCLING    = 93 01
-BGM_FRIENDLY   = 94 01
-BGM_MISHIRO    = 95 01
-BGM_TOZAN      = 96 01
-BGM_GIRLEYE    = 97 01
-BGM_MINAMO     = 98 01
-BGM_ASHROAD    = 99 01
-BGM_EVENT0     = 9A 01
-BGM_DEEPDEEP   = 9B 01
-BGM_KACHI1     = 9C 01
-BGM_TITLE3     = 9D 01
-BGM_DEMO1      = 9E 01
-BGM_GIRL_SUP   = 9F 01
-BGM_HAGESHII   = A0 01
-BGM_KAKKOII    = A1 01
-BGM_KAZANBAI   = A2 01
-BGM_AQA_0      = A3 01
-BGM_TSURETEK   = A4 01
-BGM_BOY_SUP    = A5 01
-BGM_RAINBOW    = A6 01
-BGM_AYASII     = A7 01
-BGM_KACHI4     = A8 01
-BGM_ROPEWAY    = A9 01
-BGM_CASINO     = AA 01
-BGM_HIGHTOWN   = AB 01
-BGM_SAFARI     = AC 01
-BGM_C_ROAD     = AD 01
-BGM_AJITO      = AE 01
-BGM_M_BOAT     = AF 01
-BGM_M_DUNGON   = B0 01
-BGM_FINECITY   = B1 01
-BGM_MACHUPI    = B2 01
-BGM_P_SCHOOL   = B3 01
-BGM_DENDOU     = B4 01
-BGM_TONEKUSA   = B5 01
-BGM_MABOROSI   = B6 01
-BGM_CON_FAN    = B7 01
-BGM_CONTEST0   = B8 01
-BGM_MGM0       = B9 01
-BGM_T_BATTLE   = BA 01
-BGM_OOAME      = BB 01
-BGM_HIDERI     = BC 01
-BGM_RUNECITY   = BD 01
-BGM_CON_K      = BE 01
-BGM_EIKOU_R    = BF 01
-BGM_KARAKURI   = C0 01
-BGM_HUTAGO     = C1 01
-BGM_SITENNOU   = C2 01
-BGM_YAMA_EYE   = C3 01
-BGM_CONLOBBY   = C4 01
-BGM_INTER_V    = C5 01
-BGM_DAIGO      = C6 01
-BGM_THANKFOR   = C7 01
-BGM_END        = C8 01
-BGM_BATTLE27   = C9 01
-BGM_BATTLE31   = CA 01
-BGM_BATTLE20   = CB 01
-BGM_BATTLE32   = CC 01
-BGM_BATTLE33   = CD 01
-BGM_BATTLE36   = CE 01
-BGM_BATTLE34   = CF 01
-BGM_BATTLE35   = D0 01
-BGM_BATTLE38   = D1 01
-BGM_BATTLE30   = D2 01
+MUS_STOP       = 5D 01
+MUS_TETSUJI    = 5E 01
+MUS_FIELD13    = 5F 01
+MUS_KACHI22    = 60 01
+MUS_KACHI2     = 61 01
+MUS_KACHI3     = 62 01
+MUS_KACHI5     = 63 01
+MUS_PCC        = 64 01
+MUS_NIBI       = 65 01
+MUS_SUIKUN     = 66 01
+MUS_DOORO1     = 67 01
+MUS_DOORO_X1   = 68 01
+MUS_DOORO_X3   = 69 01
+MUS_MACHI_S2   = 6A 01
+MUS_MACHI_S4   = 6B 01
+MUS_GIM        = 6C 01
+MUS_NAMINORI   = 6D 01
+MUS_DAN01      = 6E 01
+MUS_FANFA1     = 6F 01
+MUS_ME_ASA     = 70 01
+MUS_ME_BACHI   = 71 01
+MUS_FANFA4     = 72 01
+MUS_FANFA5     = 73 01
+MUS_ME_WAZA    = 74 01
+MUS_BIJYUTU    = 75 01
+MUS_DOORO_X4   = 76 01
+MUS_FUNE_KAN   = 77 01
+MUS_ME_SHINKA  = 78 01
+MUS_SHINKA     = 79 01
+MUS_ME_WASURE  = 7A 01
+MUS_SYOUJOEYE  = 7B 01
+MUS_BOYEYE     = 7C 01
+MUS_DAN02      = 7D 01
+MUS_MACHI_S3   = 7E 01
+MUS_ODAMAKI    = 7F 01
+MUS_B_TOWER    = 80 01
+MUS_SWIMEYE    = 81 01
+MUS_DAN03      = 82 01
+MUS_ME_KINOMI  = 83 01
+MUS_ME_TAMA    = 84 01
+MUS_ME_B_BIG   = 85 01
+MUS_ME_B_SMALL = 86 01
+MUS_ME_ZANNEN  = 87 01
+MUS_BD_TIME    = 88 01
+MUS_TEST1      = 89 01
+MUS_TEST2      = 8A 01
+MUS_TEST3      = 8B 01
+MUS_TEST4      = 8C 01
+MUS_TEST       = 8D 01
+MUS_GOMACHI0   = 8E 01
+MUS_GOTOWN     = 8F 01
+MUS_POKECEN    = 90 01
+MUS_NEXTROAD   = 91 01
+MUS_GRANROAD   = 92 01
+MUS_CYCLING    = 93 01
+MUS_FRIENDLY   = 94 01
+MUS_MISHIRO    = 95 01
+MUS_TOZAN      = 96 01
+MUS_GIRLEYE    = 97 01
+MUS_MINAMO     = 98 01
+MUS_ASHROAD    = 99 01
+MUS_EVENT0     = 9A 01
+MUS_DEEPDEEP   = 9B 01
+MUS_KACHI1     = 9C 01
+MUS_TITLE3     = 9D 01
+MUS_DEMO1      = 9E 01
+MUS_GIRL_SUP   = 9F 01
+MUS_HAGESHII   = A0 01
+MUS_KAKKOII    = A1 01
+MUS_KAZANBAI   = A2 01
+MUS_AQA_0      = A3 01
+MUS_TSURETEK   = A4 01
+MUS_BOY_SUP    = A5 01
+MUS_RAINBOW    = A6 01
+MUS_AYASII     = A7 01
+MUS_KACHI4     = A8 01
+MUS_ROPEWAY    = A9 01
+MUS_CASINO     = AA 01
+MUS_HIGHTOWN   = AB 01
+MUS_SAFARI     = AC 01
+MUS_C_ROAD     = AD 01
+MUS_AJITO      = AE 01
+MUS_M_BOAT     = AF 01
+MUS_M_DUNGON   = B0 01
+MUS_FINECITY   = B1 01
+MUS_MACHUPI    = B2 01
+MUS_P_SCHOOL   = B3 01
+MUS_DENDOU     = B4 01
+MUS_TONEKUSA   = B5 01
+MUS_MABOROSI   = B6 01
+MUS_CON_FAN    = B7 01
+MUS_CONTEST0   = B8 01
+MUS_MGM0       = B9 01
+MUS_T_BATTLE   = BA 01
+MUS_OOAME      = BB 01
+MUS_HIDERI     = BC 01
+MUS_RUNECITY   = BD 01
+MUS_CON_K      = BE 01
+MUS_EIKOU_R    = BF 01
+MUS_KARAKURI   = C0 01
+MUS_HUTAGO     = C1 01
+MUS_SITENNOU   = C2 01
+MUS_YAMA_EYE   = C3 01
+MUS_CONLOBBY   = C4 01
+MUS_INTER_V    = C5 01
+MUS_DAIGO      = C6 01
+MUS_THANKFOR   = C7 01
+MUS_END        = C8 01
+MUS_BATTLE27   = C9 01
+MUS_BATTLE31   = CA 01
+MUS_BATTLE20   = CB 01
+MUS_BATTLE32   = CC 01
+MUS_BATTLE33   = CD 01
+MUS_BATTLE36   = CE 01
+MUS_BATTLE34   = CF 01
+MUS_BATTLE35   = D0 01
+MUS_BATTLE38   = D1 01
+MUS_BATTLE30   = D2 01
 
 '\l' = FA @ scroll up window text
 '\p' = FB @ new paragraph
diff --git a/clean_tools.sh b/clean_tools.sh
index 7062a2124..7062a2124 100755..100644
--- a/clean_tools.sh
+++ b/clean_tools.sh
diff --git a/compare-ruby.sh b/compare-ruby.sh
index 5fbd2a1c8..5fbd2a1c8 100755..100644
--- a/compare-ruby.sh
+++ b/compare-ruby.sh
diff --git a/compare-sapphire.sh b/compare-sapphire.sh
index b4047e81d..b4047e81d 100755..100644
--- a/compare-sapphire.sh
+++ b/compare-sapphire.sh
diff --git a/compare.sh b/compare.sh
index 2206943da..2206943da 100755..100644
--- a/compare.sh
+++ b/compare.sh
diff --git a/constants/version.inc b/constants/version.inc
index c93e439f4..271b46dd3 100644
--- a/constants/version.inc
+++ b/constants/version.inc
@@ -5,11 +5,11 @@
 	.endif
 
 	.ifdef SAPPHIRE
-	.set BGM_EVIL_TEAM, BGM_AQA_0
-	.set BGM_GOOD_TEAM, BGM_MGM0
+	.set MUS_EVIL_TEAM, MUS_AQA_0
+	.set MUS_GOOD_TEAM, MUS_MGM0
 	.else
-	.set BGM_EVIL_TEAM, BGM_MGM0
-	.set BGM_GOOD_TEAM, BGM_AQA_0
+	.set MUS_EVIL_TEAM, MUS_MGM0
+	.set MUS_GOOD_TEAM, MUS_AQA_0
 	.endc
 
 	.ifdef SAPPHIRE
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index f8733305e..a10c2ddb0 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -55,346 +55,346 @@ gStdScripts::
 	.4byte Std_ObtainDecoration
 gStdScripts_End::
 
-	.include "data/scripts/maps/PetalburgCity.inc"
-	.include "data/scripts/maps/SlateportCity.inc"
-	.include "data/scripts/maps/MauvilleCity.inc"
-	.include "data/scripts/maps/RustboroCity.inc"
-	.include "data/scripts/maps/FortreeCity.inc"
-	.include "data/scripts/maps/LilycoveCity.inc"
-	.include "data/scripts/maps/MossdeepCity.inc"
-	.include "data/scripts/maps/SootopolisCity.inc"
-	.include "data/scripts/maps/EverGrandeCity.inc"
-	.include "data/scripts/maps/LittlerootTown.inc"
-	.include "data/scripts/maps/OldaleTown.inc"
-	.include "data/scripts/maps/DewfordTown.inc"
-	.include "data/scripts/maps/LavaridgeTown.inc"
-	.include "data/scripts/maps/FallarborTown.inc"
-	.include "data/scripts/maps/VerdanturfTown.inc"
-	.include "data/scripts/maps/PacifidlogTown.inc"
-	.include "data/scripts/maps/Route101.inc"
-	.include "data/scripts/maps/Route102.inc"
-	.include "data/scripts/maps/Route103.inc"
-	.include "data/scripts/maps/Route104.inc"
-	.include "data/scripts/maps/Route105.inc"
-	.include "data/scripts/maps/Route106.inc"
-	.include "data/scripts/maps/Route107.inc"
-	.include "data/scripts/maps/Route108.inc"
-	.include "data/scripts/maps/Route109.inc"
-	.include "data/scripts/maps/Route110.inc"
-	.include "data/scripts/maps/Route111.inc"
-	.include "data/scripts/maps/Route112.inc"
-	.include "data/scripts/maps/Route113.inc"
-	.include "data/scripts/maps/Route114.inc"
-	.include "data/scripts/maps/Route115.inc"
-	.include "data/scripts/maps/Route116.inc"
-	.include "data/scripts/maps/Route117.inc"
-	.include "data/scripts/maps/Route118.inc"
-	.include "data/scripts/maps/Route119.inc"
-	.include "data/scripts/maps/Route120.inc"
-	.include "data/scripts/maps/Route121.inc"
-	.include "data/scripts/maps/Route122.inc"
-	.include "data/scripts/maps/Route123.inc"
-	.include "data/scripts/maps/Route124.inc"
-	.include "data/scripts/maps/Route125.inc"
-	.include "data/scripts/maps/Route126.inc"
-	.include "data/scripts/maps/Route127.inc"
-	.include "data/scripts/maps/Route128.inc"
-	.include "data/scripts/maps/Route129.inc"
-	.include "data/scripts/maps/Route130.inc"
-	.include "data/scripts/maps/Route131.inc"
-	.include "data/scripts/maps/Route132.inc"
-	.include "data/scripts/maps/Route133.inc"
-	.include "data/scripts/maps/Route134.inc"
-	.include "data/scripts/maps/Underwater1.inc"
-	.include "data/scripts/maps/Underwater2.inc"
-	.include "data/scripts/maps/Underwater3.inc"
-	.include "data/scripts/maps/Underwater4.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/scripts/maps/OldaleTown_House1.inc"
-	.include "data/scripts/maps/OldaleTown_House2.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/OldaleTown_Mart.inc"
-	.include "data/scripts/maps/DewfordTown_House1.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/DewfordTown_Gym.inc"
-	.include "data/scripts/maps/DewfordTown_Hall.inc"
-	.include "data/scripts/maps/DewfordTown_House2.inc"
-	.include "data/scripts/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_House.inc"
-	.include "data/scripts/maps/LavaridgeTown_Mart.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_Mart.inc"
-	.include "data/scripts/maps/FallarborTown_ContestLobby.inc"
-	.include "data/scripts/maps/FallarborTown_ContestHall.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_House1.inc"
-	.include "data/scripts/maps/FallarborTown_House2.inc"
-	.include "data/scripts/maps/VerdanturfTown_ContestLobby.inc"
-	.include "data/scripts/maps/VerdanturfTown_ContestHall.inc"
-	.include "data/scripts/maps/VerdanturfTown_Mart.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_House.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PacifidlogTown_House1.inc"
-	.include "data/scripts/maps/PacifidlogTown_House2.inc"
-	.include "data/scripts/maps/PacifidlogTown_House3.inc"
-	.include "data/scripts/maps/PacifidlogTown_House4.inc"
-	.include "data/scripts/maps/PacifidlogTown_House5.inc"
-	.include "data/scripts/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/scripts/maps/PetalburgCity_Gym.inc"
-	.include "data/scripts/maps/PetalburgCity_House1.inc"
-	.include "data/scripts/maps/PetalburgCity_House2.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PetalburgCity_Mart.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/scripts/maps/SlateportCity_ContestLobby.inc"
-	.include "data/scripts/maps/SlateportCity_ContestHall.inc"
-	.include "data/scripts/maps/SlateportCity_House1.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Harbor.inc"
-	.include "data/scripts/maps/SlateportCity_House2.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Mart.inc"
-	.include "data/scripts/maps/MauvilleCity_Gym.inc"
-	.include "data/scripts/maps/MauvilleCity_BikeShop.inc"
-	.include "data/scripts/maps/MauvilleCity_House1.inc"
-	.include "data/scripts/maps/MauvilleCity_GameCorner.inc"
-	.include "data/scripts/maps/MauvilleCity_House2.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MauvilleCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/scripts/maps/RustboroCity_Gym.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/scripts/maps/RustboroCity_House1.inc"
-	.include "data/scripts/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/scripts/maps/RustboroCity_House2.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/scripts/maps/RustboroCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House1.inc"
-	.include "data/scripts/maps/FortreeCity_Gym.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FortreeCity_Mart.inc"
-	.include "data/scripts/maps/FortreeCity_House2.inc"
-	.include "data/scripts/maps/FortreeCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House4.inc"
-	.include "data/scripts/maps/FortreeCity_House5.inc"
-	.include "data/scripts/maps/FortreeCity_DecorationShop.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestHall.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_UnusedMart.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/scripts/maps/LilycoveCity_Harbor.inc"
-	.include "data/scripts/maps/LilycoveCity_EmptyMap.inc"
-	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/scripts/maps/LilycoveCity_House1.inc"
-	.include "data/scripts/maps/LilycoveCity_House2.inc"
-	.include "data/scripts/maps/LilycoveCity_House3.inc"
-	.include "data/scripts/maps/LilycoveCity_House4.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/scripts/maps/MossdeepCity_Gym.inc"
-	.include "data/scripts/maps/MossdeepCity_House1.inc"
-	.include "data/scripts/maps/MossdeepCity_House2.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_Mart.inc"
-	.include "data/scripts/maps/MossdeepCity_House3.inc"
-	.include "data/scripts/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/scripts/maps/MossdeepCity_House4.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SootopolisCity_Mart.inc"
-	.include "data/scripts/maps/SootopolisCity_House1.inc"
-	.include "data/scripts/maps/SootopolisCity_House2.inc"
-	.include "data/scripts/maps/SootopolisCity_House3.inc"
-	.include "data/scripts/maps/SootopolisCity_House4.inc"
-	.include "data/scripts/maps/SootopolisCity_House5.inc"
-	.include "data/scripts/maps/SootopolisCity_House6.inc"
-	.include "data/scripts/maps/SootopolisCity_House7.inc"
-	.include "data/scripts/maps/SootopolisCity_House8.inc"
-	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor1.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor2.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor3.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor4.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor5.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague.inc"
-	.include "data/scripts/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/Route104_MrBrineysHouse.inc"
-	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/scripts/maps/Route111_OldLadysRestStop.inc"
-	.include "data/scripts/maps/Route112_CableCarStation.inc"
-	.include "data/scripts/maps/MtChimney_CableCarStation.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/scripts/maps/Route114_LanettesHouse.inc"
-	.include "data/scripts/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/scripts/maps/Route117_PokemonDayCare.inc"
-	.include "data/scripts/maps/Route121_SafariZoneEntrance.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_2R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_2R.inc"
-	.include "data/scripts/maps/RusturfTunnel.inc"
-	.include "data/scripts/maps/Underwater_SootopolisCity.inc"
-	.include "data/scripts/maps/DesertRuins.inc"
-	.include "data/scripts/maps/GraniteCave_1F.inc"
-	.include "data/scripts/maps/GraniteCave_B1F.inc"
-	.include "data/scripts/maps/GraniteCave_B2F.inc"
-	.include "data/scripts/maps/GraniteCave_StevensRoom.inc"
-	.include "data/scripts/maps/PetalburgWoods.inc"
-	.include "data/scripts/maps/MtChimney.inc"
-	.include "data/scripts/maps/JaggedPass.inc"
-	.include "data/scripts/maps/FieryPath.inc"
-	.include "data/scripts/maps/MtPyre_1F.inc"
-	.include "data/scripts/maps/MtPyre_2F.inc"
-	.include "data/scripts/maps/MtPyre_3F.inc"
-	.include "data/scripts/maps/MtPyre_4F.inc"
-	.include "data/scripts/maps/MtPyre_5F.inc"
-	.include "data/scripts/maps/MtPyre_6F.inc"
-	.include "data/scripts/maps/MtPyre_Exterior.inc"
-	.include "data/scripts/maps/MtPyre_Summit.inc"
-	.include "data/scripts/maps/AquaHideout_1F.inc"
-	.include "data/scripts/maps/AquaHideout_B1F.inc"
-	.include "data/scripts/maps/AquaHideout_B2F.inc"
-	.include "data/scripts/maps/Underwater_SeafloorCavern.inc"
-	.include "data/scripts/maps/SeafloorCavern_Entrance.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room1.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room2.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room3.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room4.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room5.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room6.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room7.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room8.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room9.inc"
-	.include "data/scripts/maps/CaveOfOrigin_Entrance.inc"
-	.include "data/scripts/maps/CaveOfOrigin_1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B2F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B3F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B4F.inc"
-	.include "data/scripts/maps/VictoryRoad_1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B2F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/scripts/maps/NewMauville_Entrance.inc"
-	.include "data/scripts/maps/NewMauville_Inside.inc"
-	.include "data/scripts/maps/AbandonedShip_Deck.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater1.inc"
-	.include "data/scripts/maps/AbandonedShip_Room_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater2.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/scripts/maps/IslandCave.inc"
-	.include "data/scripts/maps/AncientTomb.inc"
-	.include "data/scripts/maps/Underwater_Route134.inc"
-	.include "data/scripts/maps/Underwater_SealedChamber.inc"
-	.include "data/scripts/maps/SealedChamber_OuterRoom.inc"
-	.include "data/scripts/maps/SealedChamber_InnerRoom.inc"
-	.include "data/scripts/maps/ScorchedSlab.inc"
-	.include "data/scripts/maps/MagmaHideout_1F.inc"
-	.include "data/scripts/maps/MagmaHideout_B1F.inc"
-	.include "data/scripts/maps/MagmaHideout_B2F.inc"
-	.include "data/scripts/maps/SkyPillar_Entrance.inc"
-	.include "data/scripts/maps/SkyPillar_Outside.inc"
-	.include "data/scripts/maps/SkyPillar_1F.inc"
-	.include "data/scripts/maps/SkyPillar_2F.inc"
-	.include "data/scripts/maps/SkyPillar_3F.inc"
-	.include "data/scripts/maps/SkyPillar_4F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc"
-	.include "data/scripts/maps/SkyPillar_5F.inc"
-	.include "data/scripts/maps/SkyPillar_Top.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave1.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave2.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave3.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave4.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave1.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave2.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave3.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave4.inc"
-	.include "data/scripts/maps/SecretBase_RedCave1.inc"
-	.include "data/scripts/maps/SecretBase_RedCave2.inc"
-	.include "data/scripts/maps/SecretBase_RedCave3.inc"
-	.include "data/scripts/maps/SecretBase_RedCave4.inc"
-	.include "data/scripts/maps/SecretBase_Shrub1.inc"
-	.include "data/scripts/maps/SecretBase_Shrub2.inc"
-	.include "data/scripts/maps/SecretBase_Shrub3.inc"
-	.include "data/scripts/maps/SecretBase_Shrub4.inc"
-	.include "data/scripts/maps/SecretBase_Tree1.inc"
-	.include "data/scripts/maps/SecretBase_Tree2.inc"
-	.include "data/scripts/maps/SecretBase_Tree3.inc"
-	.include "data/scripts/maps/SecretBase_Tree4.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave1.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave2.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave3.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave4.inc"
+	.include "data/maps/PetalburgCity/scripts.inc"
+	.include "data/maps/SlateportCity/scripts.inc"
+	.include "data/maps/MauvilleCity/scripts.inc"
+	.include "data/maps/RustboroCity/scripts.inc"
+	.include "data/maps/FortreeCity/scripts.inc"
+	.include "data/maps/LilycoveCity/scripts.inc"
+	.include "data/maps/MossdeepCity/scripts.inc"
+	.include "data/maps/SootopolisCity/scripts.inc"
+	.include "data/maps/EverGrandeCity/scripts.inc"
+	.include "data/maps/LittlerootTown/scripts.inc"
+	.include "data/maps/OldaleTown/scripts.inc"
+	.include "data/maps/DewfordTown/scripts.inc"
+	.include "data/maps/LavaridgeTown/scripts.inc"
+	.include "data/maps/FallarborTown/scripts.inc"
+	.include "data/maps/VerdanturfTown/scripts.inc"
+	.include "data/maps/PacifidlogTown/scripts.inc"
+	.include "data/maps/Route101/scripts.inc"
+	.include "data/maps/Route102/scripts.inc"
+	.include "data/maps/Route103/scripts.inc"
+	.include "data/maps/Route104/scripts.inc"
+	.include "data/maps/Route105/scripts.inc"
+	.include "data/maps/Route106/scripts.inc"
+	.include "data/maps/Route107/scripts.inc"
+	.include "data/maps/Route108/scripts.inc"
+	.include "data/maps/Route109/scripts.inc"
+	.include "data/maps/Route110/scripts.inc"
+	.include "data/maps/Route111/scripts.inc"
+	.include "data/maps/Route112/scripts.inc"
+	.include "data/maps/Route113/scripts.inc"
+	.include "data/maps/Route114/scripts.inc"
+	.include "data/maps/Route115/scripts.inc"
+	.include "data/maps/Route116/scripts.inc"
+	.include "data/maps/Route117/scripts.inc"
+	.include "data/maps/Route118/scripts.inc"
+	.include "data/maps/Route119/scripts.inc"
+	.include "data/maps/Route120/scripts.inc"
+	.include "data/maps/Route121/scripts.inc"
+	.include "data/maps/Route122/scripts.inc"
+	.include "data/maps/Route123/scripts.inc"
+	.include "data/maps/Route124/scripts.inc"
+	.include "data/maps/Route125/scripts.inc"
+	.include "data/maps/Route126/scripts.inc"
+	.include "data/maps/Route127/scripts.inc"
+	.include "data/maps/Route128/scripts.inc"
+	.include "data/maps/Route129/scripts.inc"
+	.include "data/maps/Route130/scripts.inc"
+	.include "data/maps/Route131/scripts.inc"
+	.include "data/maps/Route132/scripts.inc"
+	.include "data/maps/Route133/scripts.inc"
+	.include "data/maps/Route134/scripts.inc"
+	.include "data/maps/Underwater1/scripts.inc"
+	.include "data/maps/Underwater2/scripts.inc"
+	.include "data/maps/Underwater3/scripts.inc"
+	.include "data/maps/Underwater4/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc"
+	.include "data/maps/OldaleTown_House1/scripts.inc"
+	.include "data/maps/OldaleTown_House2/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/OldaleTown_Mart/scripts.inc"
+	.include "data/maps/DewfordTown_House1/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/DewfordTown_Gym/scripts.inc"
+	.include "data/maps/DewfordTown_Hall/scripts.inc"
+	.include "data/maps/DewfordTown_House2/scripts.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_House/scripts.inc"
+	.include "data/maps/LavaridgeTown_Mart/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_Mart/scripts.inc"
+	.include "data/maps/FallarborTown_ContestLobby/scripts.inc"
+	.include "data/maps/FallarborTown_ContestHall/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_House1/scripts.inc"
+	.include "data/maps/FallarborTown_House2/scripts.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/scripts.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/scripts.inc"
+	.include "data/maps/VerdanturfTown_Mart/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_House/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PacifidlogTown_House1/scripts.inc"
+	.include "data/maps/PacifidlogTown_House2/scripts.inc"
+	.include "data/maps/PacifidlogTown_House3/scripts.inc"
+	.include "data/maps/PacifidlogTown_House4/scripts.inc"
+	.include "data/maps/PacifidlogTown_House5/scripts.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/scripts.inc"
+	.include "data/maps/PetalburgCity_Gym/scripts.inc"
+	.include "data/maps/PetalburgCity_House1/scripts.inc"
+	.include "data/maps/PetalburgCity_House2/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PetalburgCity_Mart/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc"
+	.include "data/maps/SlateportCity_ContestLobby/scripts.inc"
+	.include "data/maps/SlateportCity_ContestHall/scripts.inc"
+	.include "data/maps/SlateportCity_House1/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Harbor/scripts.inc"
+	.include "data/maps/SlateportCity_House2/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Mart/scripts.inc"
+	.include "data/maps/MauvilleCity_Gym/scripts.inc"
+	.include "data/maps/MauvilleCity_BikeShop/scripts.inc"
+	.include "data/maps/MauvilleCity_House1/scripts.inc"
+	.include "data/maps/MauvilleCity_GameCorner/scripts.inc"
+	.include "data/maps/MauvilleCity_House2/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MauvilleCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc"
+	.include "data/maps/RustboroCity_Gym/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/scripts.inc"
+	.include "data/maps/RustboroCity_House1/scripts.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/scripts.inc"
+	.include "data/maps/RustboroCity_House2/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/scripts.inc"
+	.include "data/maps/RustboroCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House1/scripts.inc"
+	.include "data/maps/FortreeCity_Gym/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FortreeCity_Mart/scripts.inc"
+	.include "data/maps/FortreeCity_House2/scripts.inc"
+	.include "data/maps/FortreeCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House4/scripts.inc"
+	.include "data/maps/FortreeCity_House5/scripts.inc"
+	.include "data/maps/FortreeCity_DecorationShop/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestHall/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc"
+	.include "data/maps/LilycoveCity_Harbor/scripts.inc"
+	.include "data/maps/LilycoveCity_EmptyMap/scripts.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc"
+	.include "data/maps/LilycoveCity_House1/scripts.inc"
+	.include "data/maps/LilycoveCity_House2/scripts.inc"
+	.include "data/maps/LilycoveCity_House3/scripts.inc"
+	.include "data/maps/LilycoveCity_House4/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc"
+	.include "data/maps/MossdeepCity_Gym/scripts.inc"
+	.include "data/maps/MossdeepCity_House1/scripts.inc"
+	.include "data/maps/MossdeepCity_House2/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_Mart/scripts.inc"
+	.include "data/maps/MossdeepCity_House3/scripts.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/scripts.inc"
+	.include "data/maps/MossdeepCity_House4/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SootopolisCity_Mart/scripts.inc"
+	.include "data/maps/SootopolisCity_House1/scripts.inc"
+	.include "data/maps/SootopolisCity_House2/scripts.inc"
+	.include "data/maps/SootopolisCity_House3/scripts.inc"
+	.include "data/maps/SootopolisCity_House4/scripts.inc"
+	.include "data/maps/SootopolisCity_House5/scripts.inc"
+	.include "data/maps/SootopolisCity_House6/scripts.inc"
+	.include "data/maps/SootopolisCity_House7/scripts.inc"
+	.include "data/maps/SootopolisCity_House8/scripts.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor1/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor2/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor3/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor4/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor5/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/scripts.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/Route104_MrBrineysHouse/scripts.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc"
+	.include "data/maps/Route111_OldLadysRestStop/scripts.inc"
+	.include "data/maps/Route112_CableCarStation/scripts.inc"
+	.include "data/maps/MtChimney_CableCarStation/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/scripts.inc"
+	.include "data/maps/Route114_LanettesHouse/scripts.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/scripts.inc"
+	.include "data/maps/Route117_PokemonDayCare/scripts.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_2R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/scripts.inc"
+	.include "data/maps/RusturfTunnel/scripts.inc"
+	.include "data/maps/Underwater_SootopolisCity/scripts.inc"
+	.include "data/maps/DesertRuins/scripts.inc"
+	.include "data/maps/GraniteCave_1F/scripts.inc"
+	.include "data/maps/GraniteCave_B1F/scripts.inc"
+	.include "data/maps/GraniteCave_B2F/scripts.inc"
+	.include "data/maps/GraniteCave_StevensRoom/scripts.inc"
+	.include "data/maps/PetalburgWoods/scripts.inc"
+	.include "data/maps/MtChimney/scripts.inc"
+	.include "data/maps/JaggedPass/scripts.inc"
+	.include "data/maps/FieryPath/scripts.inc"
+	.include "data/maps/MtPyre_1F/scripts.inc"
+	.include "data/maps/MtPyre_2F/scripts.inc"
+	.include "data/maps/MtPyre_3F/scripts.inc"
+	.include "data/maps/MtPyre_4F/scripts.inc"
+	.include "data/maps/MtPyre_5F/scripts.inc"
+	.include "data/maps/MtPyre_6F/scripts.inc"
+	.include "data/maps/MtPyre_Exterior/scripts.inc"
+	.include "data/maps/MtPyre_Summit/scripts.inc"
+	.include "data/maps/AquaHideout_1F/scripts.inc"
+	.include "data/maps/AquaHideout_B1F/scripts.inc"
+	.include "data/maps/AquaHideout_B2F/scripts.inc"
+	.include "data/maps/Underwater_SeafloorCavern/scripts.inc"
+	.include "data/maps/SeafloorCavern_Entrance/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room1/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room2/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room3/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room4/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room5/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room6/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room7/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room8/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room9/scripts.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/scripts.inc"
+	.include "data/maps/CaveOfOrigin_1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B2F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B3F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B4F/scripts.inc"
+	.include "data/maps/VictoryRoad_1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B2F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc"
+	.include "data/maps/NewMauville_Entrance/scripts.inc"
+	.include "data/maps/NewMauville_Inside/scripts.inc"
+	.include "data/maps/AbandonedShip_Deck/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater1/scripts.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater2/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc"
+	.include "data/maps/IslandCave/scripts.inc"
+	.include "data/maps/AncientTomb/scripts.inc"
+	.include "data/maps/Underwater_Route134/scripts.inc"
+	.include "data/maps/Underwater_SealedChamber/scripts.inc"
+	.include "data/maps/SealedChamber_OuterRoom/scripts.inc"
+	.include "data/maps/SealedChamber_InnerRoom/scripts.inc"
+	.include "data/maps/ScorchedSlab/scripts.inc"
+	.include "data/maps/MagmaHideout_1F/scripts.inc"
+	.include "data/maps/MagmaHideout_B1F/scripts.inc"
+	.include "data/maps/MagmaHideout_B2F/scripts.inc"
+	.include "data/maps/SkyPillar_Entrance/scripts.inc"
+	.include "data/maps/SkyPillar_Outside/scripts.inc"
+	.include "data/maps/SkyPillar_1F/scripts.inc"
+	.include "data/maps/SkyPillar_2F/scripts.inc"
+	.include "data/maps/SkyPillar_3F/scripts.inc"
+	.include "data/maps/SkyPillar_4F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc"
+	.include "data/maps/SkyPillar_5F/scripts.inc"
+	.include "data/maps/SkyPillar_Top/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave1/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave2/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave3/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave4/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave1/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave2/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave3/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave4/scripts.inc"
+	.include "data/maps/SecretBase_RedCave1/scripts.inc"
+	.include "data/maps/SecretBase_RedCave2/scripts.inc"
+	.include "data/maps/SecretBase_RedCave3/scripts.inc"
+	.include "data/maps/SecretBase_RedCave4/scripts.inc"
+	.include "data/maps/SecretBase_Shrub1/scripts.inc"
+	.include "data/maps/SecretBase_Shrub2/scripts.inc"
+	.include "data/maps/SecretBase_Shrub3/scripts.inc"
+	.include "data/maps/SecretBase_Shrub4/scripts.inc"
+	.include "data/maps/SecretBase_Tree1/scripts.inc"
+	.include "data/maps/SecretBase_Tree2/scripts.inc"
+	.include "data/maps/SecretBase_Tree3/scripts.inc"
+	.include "data/maps/SecretBase_Tree4/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave1/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave2/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave3/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave4/scripts.inc"
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
@@ -563,305 +563,305 @@ EventScript_15F573:
 	msgbox UnknownString_81A3C31, 3
 	end
 
-	.include "data/scripts/maps/SingleBattleColosseum.inc"
-	.include "data/scripts/maps/TradeCenter.inc"
-	.include "data/scripts/maps/RecordCorner.inc"
-	.include "data/scripts/maps/DoubleBattleColosseum.inc"
-	.include "data/scripts/maps/LinkContestRoom1.inc"
-	.include "data/scripts/maps/LinkContestRoom2.inc"
-	.include "data/scripts/maps/LinkContestRoom3.inc"
-	.include "data/scripts/maps/LinkContestRoom4.inc"
-	.include "data/scripts/maps/LinkContestRoom5.inc"
-	.include "data/scripts/maps/LinkContestRoom6.inc"
-	.include "data/scripts/maps/UnknownMap_25_29.inc"
-	.include "data/scripts/maps/UnknownMap_25_30.inc"
-	.include "data/scripts/maps/UnknownMap_25_31.inc"
-	.include "data/scripts/maps/UnknownMap_25_32.inc"
-	.include "data/scripts/maps/UnknownMap_25_33.inc"
-	.include "data/scripts/maps/UnknownMap_25_34.inc"
-	.include "data/scripts/maps/InsideOfTruck.inc"
-	.include "data/scripts/maps/SSTidalCorridor.inc"
-	.include "data/scripts/maps/SSTidalLowerDeck.inc"
-	.include "data/scripts/maps/SSTidalRooms.inc"
-	.include "data/scripts/maps/SafariZone_Northwest.inc"
-	.include "data/scripts/maps/SafariZone_Northeast.inc"
-	.include "data/scripts/maps/SafariZone_Southwest.inc"
-	.include "data/scripts/maps/SafariZone_Southeast.inc"
-	.include "data/scripts/maps/BattleTower_Outside.inc"
-	.include "data/scripts/maps/BattleTower_Lobby.inc"
-	.include "data/scripts/maps/BattleTower_Elevator.inc"
-	.include "data/scripts/maps/BattleTower_Corridor.inc"
-	.include "data/scripts/maps/BattleTower_BattleRoom.inc"
-	.include "data/scripts/maps/SouthernIsland_Exterior.inc"
-	.include "data/scripts/maps/SouthernIsland_Interior.inc"
-	.include "data/scripts/maps/SafariZone_RestHouse.inc"
-	.include "data/scripts/maps/Route104_Prototype.inc"
-	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route109_SeashoreHouse.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEntrance.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEnd.inc"
-	.include "data/scripts/maps/Route110_TrickHouseCorridor.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/scripts/maps/Route113_GlassWorkshop.inc"
-	.include "data/scripts/maps/Route123_BerryMastersHouse.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/scripts/maps/Route119_House.inc"
-	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc"
-
-	.include "data/text/maps/PetalburgCity.inc"
-	.include "data/text/maps/SlateportCity.inc"
-	.include "data/text/maps/MauvilleCity.inc"
-	.include "data/text/maps/RustboroCity.inc"
-	.include "data/text/maps/FortreeCity.inc"
-	.include "data/text/maps/LilycoveCity.inc"
-	.include "data/text/maps/MossdeepCity.inc"
-	.include "data/text/maps/SootopolisCity.inc"
-	.include "data/text/maps/EverGrandeCity.inc"
-	.include "data/text/maps/LittlerootTown.inc"
-	.include "data/text/maps/OldaleTown.inc"
-	.include "data/text/maps/DewfordTown.inc"
-	.include "data/text/maps/LavaridgeTown.inc"
-	.include "data/text/maps/FallarborTown.inc"
-	.include "data/text/maps/VerdanturfTown.inc"
-	.include "data/text/maps/PacifidlogTown.inc"
-	.include "data/text/maps/Route101.inc"
-	.include "data/text/maps/Route102.inc"
-	.include "data/text/maps/Route103.inc"
-	.include "data/text/maps/Route104.inc"
-	.include "data/text/maps/Route105.inc"
-	.include "data/text/maps/Route106.inc"
-	.include "data/text/maps/Route107.inc"
-	.include "data/text/maps/Route108.inc"
-	.include "data/text/maps/Route109.inc"
-	.include "data/text/maps/Route110.inc"
-	.include "data/text/maps/Route111.inc"
-	.include "data/text/maps/Route112.inc"
-	.include "data/text/maps/Route113.inc"
-	.include "data/text/maps/Route114.inc"
-	.include "data/text/maps/Route115.inc"
-	.include "data/text/maps/Route116.inc"
-	.include "data/text/maps/Route117.inc"
-	.include "data/text/maps/Route118.inc"
-	.include "data/text/maps/Route119.inc"
-	.include "data/text/maps/Route120.inc"
-	.include "data/text/maps/Route121.inc"
-	.include "data/text/maps/Route123.inc"
-	.include "data/text/maps/Route124.inc"
-	.include "data/text/maps/Route128.inc"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/text/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/text/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/text/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/text/maps/OldaleTown_House1.inc"
-	.include "data/text/maps/OldaleTown_House2.inc"
-	.include "data/text/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/OldaleTown_Mart.inc"
-	.include "data/text/maps/DewfordTown_House1.inc"
-	.include "data/text/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/DewfordTown_Gym.inc"
-	.include "data/text/maps/DewfordTown_Hall.inc"
-	.include "data/text/maps/DewfordTown_House2.inc"
-	.include "data/text/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/text/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/text/maps/LavaridgeTown_House.inc"
-	.include "data/text/maps/LavaridgeTown_Mart.inc"
-	.include "data/text/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/FallarborTown_Mart.inc"
-	.include "data/text/maps/FallarborTown_ContestLobby.inc"
-	.include "data/text/maps/FallarborTown_ContestHall.inc"
-	.include "data/text/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/FallarborTown_House1.inc"
-	.include "data/text/maps/FallarborTown_House2.inc"
-	.include "data/text/maps/VerdanturfTown_ContestLobby.inc"
-	.include "data/text/maps/VerdanturfTown_ContestHall.inc"
-	.include "data/text/maps/VerdanturfTown_Mart.inc"
-	.include "data/text/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/text/maps/VerdanturfTown_House.inc"
-	.include "data/text/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/PacifidlogTown_House1.inc"
-	.include "data/text/maps/PacifidlogTown_House2.inc"
-	.include "data/text/maps/PacifidlogTown_House3.inc"
-	.include "data/text/maps/PacifidlogTown_House4.inc"
-	.include "data/text/maps/PacifidlogTown_House5.inc"
-	.include "data/text/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/text/maps/PetalburgCity_Gym.inc"
-	.include "data/text/maps/PetalburgCity_House1.inc"
-	.include "data/text/maps/PetalburgCity_House2.inc"
-	.include "data/text/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/PetalburgCity_Mart.inc"
-	.include "data/text/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/text/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/text/maps/SlateportCity_ContestLobby.inc"
-	.include "data/text/maps/SlateportCity_ContestHall.inc"
-	.include "data/text/maps/SlateportCity_House1.inc"
-	.include "data/text/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/text/maps/SlateportCity_Harbor.inc"
-	.include "data/text/maps/SlateportCity_House2.inc"
-	.include "data/text/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/SlateportCity_Mart.inc"
-	.include "data/text/maps/MauvilleCity_Gym.inc"
-	.include "data/text/maps/MauvilleCity_BikeShop.inc"
-	.include "data/text/maps/MauvilleCity_House1.inc"
-	.include "data/text/maps/MauvilleCity_GameCorner.inc"
-	.include "data/text/maps/MauvilleCity_House2.inc"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/text/maps/MauvilleCity_Mart.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/text/maps/RustboroCity_Gym.inc"
-	.include "data/text/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/text/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/RustboroCity_Mart.inc"
-	.include "data/text/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/text/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/text/maps/RustboroCity_House1.inc"
-	.include "data/text/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/text/maps/RustboroCity_House2.inc"
-	.include "data/text/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/text/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/text/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/text/maps/RustboroCity_House3.inc"
-	.include "data/text/maps/FortreeCity_House1.inc"
-	.include "data/text/maps/FortreeCity_Gym.inc"
-	.include "data/text/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/FortreeCity_Mart.inc"
-	.include "data/text/maps/FortreeCity_House2.inc"
-	.include "data/text/maps/FortreeCity_House3.inc"
-	.include "data/text/maps/FortreeCity_House4.inc"
-	.include "data/text/maps/FortreeCity_House5.inc"
-	.include "data/text/maps/FortreeCity_DecorationShop.inc"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/text/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/text/maps/LilycoveCity_ContestHall.inc"
-	.include "data/text/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/text/maps/LilycoveCity_Harbor.inc"
-	.include "data/text/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/text/maps/LilycoveCity_House1.inc"
-	.include "data/text/maps/LilycoveCity_House2.inc"
-	.include "data/text/maps/LilycoveCity_House3.inc"
-	.include "data/text/maps/LilycoveCity_House4.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/text/maps/MossdeepCity_Gym.inc"
-	.include "data/text/maps/MossdeepCity_House1.inc"
-	.include "data/text/maps/MossdeepCity_House2.inc"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/text/maps/MossdeepCity_Mart.inc"
-	.include "data/text/maps/MossdeepCity_House3.inc"
-	.include "data/text/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/text/maps/MossdeepCity_House4.inc"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/text/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/text/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/text/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/text/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/text/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/SootopolisCity_Mart.inc"
-	.include "data/text/maps/SootopolisCity_House1.inc"
-	.include "data/text/maps/SootopolisCity_House2.inc"
-	.include "data/text/maps/SootopolisCity_House3.inc"
-	.include "data/text/maps/SootopolisCity_House4.inc"
-	.include "data/text/maps/SootopolisCity_House5.inc"
-	.include "data/text/maps/SootopolisCity_House6.inc"
-	.include "data/text/maps/SootopolisCity_House7.inc"
-	.include "data/text/maps/SootopolisCity_House8.inc"
-	.include "data/text/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/text/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/text/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/text/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/text/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/text/maps/EverGrandeCity_PokemonLeague.inc"
-	.include "data/text/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/text/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/Route104_MrBrineysHouse.inc"
-	.include "data/text/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/text/maps/Route111_OldLadysRestStop.inc"
-	.include "data/text/maps/Route112_CableCarStation.inc"
-	.include "data/text/maps/MtChimney_CableCarStation.inc"
-	.include "data/text/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/text/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/text/maps/Route114_LanettesHouse.inc"
-	.include "data/text/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/text/maps/MeteorFalls_1F_1R.inc"
-	.include "data/text/maps/MeteorFalls_1F_2R.inc"
-	.include "data/text/maps/RusturfTunnel.inc"
-	.include "data/text/maps/GraniteCave_1F.inc"
-	.include "data/text/maps/GraniteCave_StevensRoom.inc"
-	.include "data/text/maps/PetalburgWoods.inc"
-	.include "data/text/maps/MtChimney.inc"
-	.include "data/text/maps/JaggedPass.inc"
-	.include "data/text/maps/MtPyre_1F.inc"
-	.include "data/text/maps/MtPyre_2F.inc"
-	.include "data/text/maps/MtPyre_3F.inc"
-	.include "data/text/maps/MtPyre_4F.inc"
-	.include "data/text/maps/MtPyre_5F.inc"
-	.include "data/text/maps/MtPyre_6F.inc"
-	.include "data/text/maps/AquaHideout_1F.inc"
-	.include "data/text/maps/AquaHideout_B1F.inc"
-	.include "data/text/maps/AquaHideout_B2F.inc"
-	.include "data/text/maps/Underwater_SeafloorCavern.inc"
-	.include "data/text/maps/SeafloorCavern_Room1.inc"
-	.include "data/text/maps/SeafloorCavern_Room3.inc"
-	.include "data/text/maps/SeafloorCavern_Room4.inc"
-	.include "data/text/maps/VictoryRoad_1F.inc"
-	.include "data/text/maps/VictoryRoad_B1F.inc"
-	.include "data/text/maps/VictoryRoad_B2F.inc"
-	.include "data/text/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/text/maps/NewMauville_Entrance.inc"
-	.include "data/text/maps/NewMauville_Inside.inc"
-	.include "data/text/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/text/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/text/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/text/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/text/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/text/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/text/maps/SecretBase_RedCave1.inc"
-	.include "data/text/maps/InsideOfTruck.inc"
-	.include "data/text/maps/SSTidalCorridor.inc"
-	.include "data/text/maps/SSTidalLowerDeck.inc"
-	.include "data/text/maps/SSTidalRooms.inc"
-	.include "data/text/maps/BattleTower_Outside.inc"
-	.include "data/text/maps/BattleTower_Lobby.inc"
-	.include "data/text/maps/BattleTower_BattleRoom.inc"
-	.include "data/text/maps/SouthernIsland_Exterior.inc"
-	.include "data/text/maps/SouthernIsland_Interior.inc"
-	.include "data/text/maps/Route104_Prototype.inc"
-	.include "data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/text/maps/Route109_SeashoreHouse.inc"
-	.include "data/text/maps/Route110_TrickHouseEntrance.inc"
+	.include "data/maps/SingleBattleColosseum/scripts.inc"
+	.include "data/maps/TradeCenter/scripts.inc"
+	.include "data/maps/RecordCorner/scripts.inc"
+	.include "data/maps/DoubleBattleColosseum/scripts.inc"
+	.include "data/maps/LinkContestRoom1/scripts.inc"
+	.include "data/maps/LinkContestRoom2/scripts.inc"
+	.include "data/maps/LinkContestRoom3/scripts.inc"
+	.include "data/maps/LinkContestRoom4/scripts.inc"
+	.include "data/maps/LinkContestRoom5/scripts.inc"
+	.include "data/maps/LinkContestRoom6/scripts.inc"
+	.include "data/maps/UnknownMap_25_29/scripts.inc"
+	.include "data/maps/UnknownMap_25_30/scripts.inc"
+	.include "data/maps/UnknownMap_25_31/scripts.inc"
+	.include "data/maps/UnknownMap_25_32/scripts.inc"
+	.include "data/maps/UnknownMap_25_33/scripts.inc"
+	.include "data/maps/UnknownMap_25_34/scripts.inc"
+	.include "data/maps/InsideOfTruck/scripts.inc"
+	.include "data/maps/SSTidalCorridor/scripts.inc"
+	.include "data/maps/SSTidalLowerDeck/scripts.inc"
+	.include "data/maps/SSTidalRooms/scripts.inc"
+	.include "data/maps/SafariZone_Northwest/scripts.inc"
+	.include "data/maps/SafariZone_Northeast/scripts.inc"
+	.include "data/maps/SafariZone_Southwest/scripts.inc"
+	.include "data/maps/SafariZone_Southeast/scripts.inc"
+	.include "data/maps/BattleTower_Outside/scripts.inc"
+	.include "data/maps/BattleTower_Lobby/scripts.inc"
+	.include "data/maps/BattleTower_Elevator/scripts.inc"
+	.include "data/maps/BattleTower_Corridor/scripts.inc"
+	.include "data/maps/BattleTower_BattleRoom/scripts.inc"
+	.include "data/maps/SouthernIsland_Exterior/scripts.inc"
+	.include "data/maps/SouthernIsland_Interior/scripts.inc"
+	.include "data/maps/SafariZone_RestHouse/scripts.inc"
+	.include "data/maps/Route104_Prototype/scripts.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route109_SeashoreHouse/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEnd/scripts.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc"
+	.include "data/maps/Route113_GlassWorkshop/scripts.inc"
+	.include "data/maps/Route123_BerryMastersHouse/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/scripts.inc"
+	.include "data/maps/Route119_House/scripts.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
+
+	.include "data/maps/PetalburgCity/text.inc"
+	.include "data/maps/SlateportCity/text.inc"
+	.include "data/maps/MauvilleCity/text.inc"
+	.include "data/maps/RustboroCity/text.inc"
+	.include "data/maps/FortreeCity/text.inc"
+	.include "data/maps/LilycoveCity/text.inc"
+	.include "data/maps/MossdeepCity/text.inc"
+	.include "data/maps/SootopolisCity/text.inc"
+	.include "data/maps/EverGrandeCity/text.inc"
+	.include "data/maps/LittlerootTown/text.inc"
+	.include "data/maps/OldaleTown/text.inc"
+	.include "data/maps/DewfordTown/text.inc"
+	.include "data/maps/LavaridgeTown/text.inc"
+	.include "data/maps/FallarborTown/text.inc"
+	.include "data/maps/VerdanturfTown/text.inc"
+	.include "data/maps/PacifidlogTown/text.inc"
+	.include "data/maps/Route101/text.inc"
+	.include "data/maps/Route102/text.inc"
+	.include "data/maps/Route103/text.inc"
+	.include "data/maps/Route104/text.inc"
+	.include "data/maps/Route105/text.inc"
+	.include "data/maps/Route106/text.inc"
+	.include "data/maps/Route107/text.inc"
+	.include "data/maps/Route108/text.inc"
+	.include "data/maps/Route109/text.inc"
+	.include "data/maps/Route110/text.inc"
+	.include "data/maps/Route111/text.inc"
+	.include "data/maps/Route112/text.inc"
+	.include "data/maps/Route113/text.inc"
+	.include "data/maps/Route114/text.inc"
+	.include "data/maps/Route115/text.inc"
+	.include "data/maps/Route116/text.inc"
+	.include "data/maps/Route117/text.inc"
+	.include "data/maps/Route118/text.inc"
+	.include "data/maps/Route119/text.inc"
+	.include "data/maps/Route120/text.inc"
+	.include "data/maps/Route121/text.inc"
+	.include "data/maps/Route123/text.inc"
+	.include "data/maps/Route124/text.inc"
+	.include "data/maps/Route128/text.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/text.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/text.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/text.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/text.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/text.inc"
+	.include "data/maps/OldaleTown_House1/text.inc"
+	.include "data/maps/OldaleTown_House2/text.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/OldaleTown_Mart/text.inc"
+	.include "data/maps/DewfordTown_House1/text.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/DewfordTown_Gym/text.inc"
+	.include "data/maps/DewfordTown_Hall/text.inc"
+	.include "data/maps/DewfordTown_House2/text.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/text.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/text.inc"
+	.include "data/maps/LavaridgeTown_House/text.inc"
+	.include "data/maps/LavaridgeTown_Mart/text.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/FallarborTown_Mart/text.inc"
+	.include "data/maps/FallarborTown_ContestLobby/text.inc"
+	.include "data/maps/FallarborTown_ContestHall/text.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/FallarborTown_House1/text.inc"
+	.include "data/maps/FallarborTown_House2/text.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/text.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/text.inc"
+	.include "data/maps/VerdanturfTown_Mart/text.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/text.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc"
+	.include "data/maps/VerdanturfTown_House/text.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/PacifidlogTown_House1/text.inc"
+	.include "data/maps/PacifidlogTown_House2/text.inc"
+	.include "data/maps/PacifidlogTown_House3/text.inc"
+	.include "data/maps/PacifidlogTown_House4/text.inc"
+	.include "data/maps/PacifidlogTown_House5/text.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/text.inc"
+	.include "data/maps/PetalburgCity_Gym/text.inc"
+	.include "data/maps/PetalburgCity_House1/text.inc"
+	.include "data/maps/PetalburgCity_House2/text.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/PetalburgCity_Mart/text.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/text.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/text.inc"
+	.include "data/maps/SlateportCity_ContestLobby/text.inc"
+	.include "data/maps/SlateportCity_ContestHall/text.inc"
+	.include "data/maps/SlateportCity_House1/text.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/text.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/text.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/text.inc"
+	.include "data/maps/SlateportCity_Harbor/text.inc"
+	.include "data/maps/SlateportCity_House2/text.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/SlateportCity_Mart/text.inc"
+	.include "data/maps/MauvilleCity_Gym/text.inc"
+	.include "data/maps/MauvilleCity_BikeShop/text.inc"
+	.include "data/maps/MauvilleCity_House1/text.inc"
+	.include "data/maps/MauvilleCity_GameCorner/text.inc"
+	.include "data/maps/MauvilleCity_House2/text.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/text.inc"
+	.include "data/maps/MauvilleCity_Mart/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/text.inc"
+	.include "data/maps/RustboroCity_Gym/text.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/text.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/RustboroCity_Mart/text.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/text.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/text.inc"
+	.include "data/maps/RustboroCity_House1/text.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/text.inc"
+	.include "data/maps/RustboroCity_House2/text.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/text.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/text.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/text.inc"
+	.include "data/maps/RustboroCity_House3/text.inc"
+	.include "data/maps/FortreeCity_House1/text.inc"
+	.include "data/maps/FortreeCity_Gym/text.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/FortreeCity_Mart/text.inc"
+	.include "data/maps/FortreeCity_House2/text.inc"
+	.include "data/maps/FortreeCity_House3/text.inc"
+	.include "data/maps/FortreeCity_House4/text.inc"
+	.include "data/maps/FortreeCity_House5/text.inc"
+	.include "data/maps/FortreeCity_DecorationShop/text.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/text.inc"
+	.include "data/maps/LilycoveCity_ContestHall/text.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc"
+	.include "data/maps/LilycoveCity_Harbor/text.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/text.inc"
+	.include "data/maps/LilycoveCity_House1/text.inc"
+	.include "data/maps/LilycoveCity_House2/text.inc"
+	.include "data/maps/LilycoveCity_House3/text.inc"
+	.include "data/maps/LilycoveCity_House4/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc"
+	.include "data/maps/MossdeepCity_Gym/text.inc"
+	.include "data/maps/MossdeepCity_House1/text.inc"
+	.include "data/maps/MossdeepCity_House2/text.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/text.inc"
+	.include "data/maps/MossdeepCity_Mart/text.inc"
+	.include "data/maps/MossdeepCity_House3/text.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/text.inc"
+	.include "data/maps/MossdeepCity_House4/text.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/text.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/text.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/text.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/text.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/text.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/text.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/SootopolisCity_Mart/text.inc"
+	.include "data/maps/SootopolisCity_House1/text.inc"
+	.include "data/maps/SootopolisCity_House2/text.inc"
+	.include "data/maps/SootopolisCity_House3/text.inc"
+	.include "data/maps/SootopolisCity_House4/text.inc"
+	.include "data/maps/SootopolisCity_House5/text.inc"
+	.include "data/maps/SootopolisCity_House6/text.inc"
+	.include "data/maps/SootopolisCity_House7/text.inc"
+	.include "data/maps/SootopolisCity_House8/text.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/text.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/text.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/text.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/text.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/text.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/text.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/text.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/Route104_MrBrineysHouse/text.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/text.inc"
+	.include "data/maps/Route111_OldLadysRestStop/text.inc"
+	.include "data/maps/Route112_CableCarStation/text.inc"
+	.include "data/maps/MtChimney_CableCarStation/text.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/text.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/text.inc"
+	.include "data/maps/Route114_LanettesHouse/text.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/text.inc"
+	.include "data/maps/MeteorFalls_1F_1R/text.inc"
+	.include "data/maps/MeteorFalls_1F_2R/text.inc"
+	.include "data/maps/RusturfTunnel/text.inc"
+	.include "data/maps/GraniteCave_1F/text.inc"
+	.include "data/maps/GraniteCave_StevensRoom/text.inc"
+	.include "data/maps/PetalburgWoods/text.inc"
+	.include "data/maps/MtChimney/text.inc"
+	.include "data/maps/JaggedPass/text.inc"
+	.include "data/maps/MtPyre_1F/text.inc"
+	.include "data/maps/MtPyre_2F/text.inc"
+	.include "data/maps/MtPyre_3F/text.inc"
+	.include "data/maps/MtPyre_4F/text.inc"
+	.include "data/maps/MtPyre_5F/text.inc"
+	.include "data/maps/MtPyre_6F/text.inc"
+	.include "data/maps/AquaHideout_1F/text.inc"
+	.include "data/maps/AquaHideout_B1F/text.inc"
+	.include "data/maps/AquaHideout_B2F/text.inc"
+	.include "data/maps/Underwater_SeafloorCavern/text.inc"
+	.include "data/maps/SeafloorCavern_Room1/text.inc"
+	.include "data/maps/SeafloorCavern_Room3/text.inc"
+	.include "data/maps/SeafloorCavern_Room4/text.inc"
+	.include "data/maps/VictoryRoad_1F/text.inc"
+	.include "data/maps/VictoryRoad_B1F/text.inc"
+	.include "data/maps/VictoryRoad_B2F/text.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/text.inc"
+	.include "data/maps/NewMauville_Entrance/text.inc"
+	.include "data/maps/NewMauville_Inside/text.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/text.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/text.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/text.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/text.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/text.inc"
+	.include "data/maps/SecretBase_RedCave1/text.inc"
+	.include "data/maps/InsideOfTruck/text.inc"
+	.include "data/maps/SSTidalCorridor/text.inc"
+	.include "data/maps/SSTidalLowerDeck/text.inc"
+	.include "data/maps/SSTidalRooms/text.inc"
+	.include "data/maps/BattleTower_Outside/text.inc"
+	.include "data/maps/BattleTower_Lobby/text.inc"
+	.include "data/maps/BattleTower_BattleRoom/text.inc"
+	.include "data/maps/SouthernIsland_Exterior/text.inc"
+	.include "data/maps/SouthernIsland_Interior/text.inc"
+	.include "data/maps/Route104_Prototype/text.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc"
+	.include "data/maps/Route109_SeashoreHouse/text.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/text.inc"
 
 Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8
 	.string "{PLAYER} findet eine Schriftrolle.$"
@@ -879,23 +879,23 @@ UnknownString_819C21F: @ 819C21F
 	.string "ein Hinweis. “Schreibe hier den\l"
 	.string "geheimen Code auf.”$"
 
-	.include "data/text/maps/Route110_TrickHouseEnd.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/text/maps/Route113_GlassWorkshop.inc"
-	.include "data/text/maps/Route123_BerryMastersHouse.inc"
-	.include "data/text/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/text/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/text/maps/Route119_House.inc"
-	.include "data/text/maps/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/Route110_TrickHouseEnd/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/text.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc"
+	.include "data/maps/Route113_GlassWorkshop/text.inc"
+	.include "data/maps/Route123_BerryMastersHouse/text.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/text.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/text.inc"
+	.include "data/maps/Route119_House/text.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/text.inc"
 
 
 Std_2:
@@ -1561,11 +1561,11 @@ Std_ObtainItem_Fail: @ 819FECC
 	return
 
 PlayGetItemFanfare:
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	return
 
 PlayGetTMHMFanfare:
-	playfanfare BGM_ME_WAZA
+	playfanfare MUS_ME_WAZA
 	return
 
 Std_ObtainDecoration: @ 819FEDA
@@ -1583,7 +1583,7 @@ Std_ObtainDecoration_: @ 819FEE8
 	return
 
 Std_ObtainDecoration_Success: @ 819FF03
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	message Message_ObtainedDecoration
 	waitfanfare
 	waitmessage
@@ -2097,7 +2097,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
-	playfanfare BGM_ME_BACHI
+	playfanfare MUS_ME_BACHI
 	waitfanfare
 	return
 
@@ -2106,7 +2106,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
 Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
 SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 1
-	playfanfare BGM_ME_ASA
+	playfanfare MUS_ME_ASA
 	waitfanfare
 	special ScrSpecial_HealPlayerParty
 	fadescreen 0
@@ -2125,7 +2125,7 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7
 Route104_EventScript_1A02E7:: @ 81A02E7
 Route109_EventScript_1A02E7:: @ 81A02E7
 	setflag FLAG_SPECIAL_FLAG_1
-	playbgm BGM_M_BOAT, FALSE
+	playbgm MUS_M_BOAT, FALSE
 	return
 
 DewfordTown_EventScript_1A02EF:: @ 81A02EF
@@ -2539,7 +2539,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
 MtPyre_Summit_EventScript_1A067F:: @ 81A067F
 SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
 	bufferitemname 0, VAR_SPECIAL_4
-	playfanfare BGM_ME_WAZA
+	playfanfare MUS_ME_WAZA
 	message FallarborTown_House1_Text_1A1498
 	waitmessage
 	waitfanfare
diff --git a/data-de/maps/VictoryRoad_B1F/map.bin b/data-de/layouts/VictoryRoad_B1F/map.bin
index bd5f9065f..bd5f9065f 100644
--- a/data-de/maps/VictoryRoad_B1F/map.bin
+++ b/data-de/layouts/VictoryRoad_B1F/map.bin
diff --git a/data-de/maps/VictoryRoad_B2F/map.bin b/data-de/layouts/VictoryRoad_B2F/map.bin
index 24c4f646a..24c4f646a 100644
--- a/data-de/maps/VictoryRoad_B2F/map.bin
+++ b/data-de/layouts/VictoryRoad_B2F/map.bin
diff --git a/data-de/text/maps/AbandonedShip_CaptainsOffice.inc b/data-de/maps/AbandonedShip_CaptainsOffice/text.inc
index 8d5c30655..8d5c30655 100644
--- a/data-de/text/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data-de/maps/AbandonedShip_CaptainsOffice/text.inc
diff --git a/data-de/text/maps/AbandonedShip_Corridors_1F.inc b/data-de/maps/AbandonedShip_Corridors_1F/text.inc
index 90091e04f..90091e04f 100644
--- a/data-de/text/maps/AbandonedShip_Corridors_1F.inc
+++ b/data-de/maps/AbandonedShip_Corridors_1F/text.inc
diff --git a/data-de/text/maps/AbandonedShip_Corridors_B1F.inc b/data-de/maps/AbandonedShip_Corridors_B1F/text.inc
index 56edc9491..56edc9491 100644
--- a/data-de/text/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data-de/maps/AbandonedShip_Corridors_B1F/text.inc
diff --git a/data-de/text/maps/AbandonedShip_HiddenFloorCorridors.inc b/data-de/maps/AbandonedShip_HiddenFloorCorridors/text.inc
index af957c711..af957c711 100644
--- a/data-de/text/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data-de/maps/AbandonedShip_HiddenFloorCorridors/text.inc
diff --git a/data-de/text/maps/AbandonedShip_HiddenFloorRooms.inc b/data-de/maps/AbandonedShip_HiddenFloorRooms/text.inc
index a2e40f5a5..a2e40f5a5 100644
--- a/data-de/text/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data-de/maps/AbandonedShip_HiddenFloorRooms/text.inc
diff --git a/data-de/text/maps/AbandonedShip_Rooms2_1F.inc b/data-de/maps/AbandonedShip_Rooms2_1F/text.inc
index 39c1dd614..39c1dd614 100644
--- a/data-de/text/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data-de/maps/AbandonedShip_Rooms2_1F/text.inc
diff --git a/data-de/text/maps/AbandonedShip_Rooms2_B1F.inc b/data-de/maps/AbandonedShip_Rooms2_B1F/text.inc
index 1eeb3c110..1eeb3c110 100644
--- a/data-de/text/maps/AbandonedShip_Rooms2_B1F.inc
+++ b/data-de/maps/AbandonedShip_Rooms2_B1F/text.inc
diff --git a/data-de/text/maps/AbandonedShip_Rooms_1F.inc b/data-de/maps/AbandonedShip_Rooms_1F/text.inc
index 8e5c0f910..8e5c0f910 100644
--- a/data-de/text/maps/AbandonedShip_Rooms_1F.inc
+++ b/data-de/maps/AbandonedShip_Rooms_1F/text.inc
diff --git a/data-de/text/maps/AbandonedShip_Rooms_B1F.inc b/data-de/maps/AbandonedShip_Rooms_B1F/text.inc
index 6bf155e54..6bf155e54 100644
--- a/data-de/text/maps/AbandonedShip_Rooms_B1F.inc
+++ b/data-de/maps/AbandonedShip_Rooms_B1F/text.inc
diff --git a/data-de/text/maps/AquaHideout_1F.inc b/data-de/maps/AquaHideout_1F/text.inc
index 5d702b1c9..5d702b1c9 100644
--- a/data-de/text/maps/AquaHideout_1F.inc
+++ b/data-de/maps/AquaHideout_1F/text.inc
diff --git a/data-de/text/maps/AquaHideout_B1F.inc b/data-de/maps/AquaHideout_B1F/text.inc
index 7a8ea0395..7a8ea0395 100644
--- a/data-de/text/maps/AquaHideout_B1F.inc
+++ b/data-de/maps/AquaHideout_B1F/text.inc
diff --git a/data-de/text/maps/AquaHideout_B2F.inc b/data-de/maps/AquaHideout_B2F/text.inc
index 649d33696..649d33696 100644
--- a/data-de/text/maps/AquaHideout_B2F.inc
+++ b/data-de/maps/AquaHideout_B2F/text.inc
diff --git a/data-de/text/maps/BattleTower_BattleRoom.inc b/data-de/maps/BattleTower_BattleRoom/text.inc
index 0c1714f08..0c1714f08 100644
--- a/data-de/text/maps/BattleTower_BattleRoom.inc
+++ b/data-de/maps/BattleTower_BattleRoom/text.inc
diff --git a/data-de/text/maps/BattleTower_Lobby.inc b/data-de/maps/BattleTower_Lobby/text.inc
index 6b2a8431b..6b2a8431b 100644
--- a/data-de/text/maps/BattleTower_Lobby.inc
+++ b/data-de/maps/BattleTower_Lobby/text.inc
diff --git a/data-de/text/maps/BattleTower_Outside.inc b/data-de/maps/BattleTower_Outside/text.inc
index 3be50176f..3be50176f 100644
--- a/data-de/text/maps/BattleTower_Outside.inc
+++ b/data-de/maps/BattleTower_Outside/text.inc
diff --git a/data-de/text/maps/DewfordTown.inc b/data-de/maps/DewfordTown/text.inc
index 65eba572d..65eba572d 100644
--- a/data-de/text/maps/DewfordTown.inc
+++ b/data-de/maps/DewfordTown/text.inc
diff --git a/data-de/text/maps/DewfordTown_Gym.inc b/data-de/maps/DewfordTown_Gym/text.inc
index 3cc2fb9f4..3cc2fb9f4 100644
--- a/data-de/text/maps/DewfordTown_Gym.inc
+++ b/data-de/maps/DewfordTown_Gym/text.inc
diff --git a/data-de/text/maps/DewfordTown_Hall.inc b/data-de/maps/DewfordTown_Hall/text.inc
index 4921793d7..4921793d7 100644
--- a/data-de/text/maps/DewfordTown_Hall.inc
+++ b/data-de/maps/DewfordTown_Hall/text.inc
diff --git a/data-de/text/maps/DewfordTown_House1.inc b/data-de/maps/DewfordTown_House1/text.inc
index fa93711e4..fa93711e4 100644
--- a/data-de/text/maps/DewfordTown_House1.inc
+++ b/data-de/maps/DewfordTown_House1/text.inc
diff --git a/data-de/text/maps/DewfordTown_House2.inc b/data-de/maps/DewfordTown_House2/text.inc
index 8f3c5218a..8f3c5218a 100644
--- a/data-de/text/maps/DewfordTown_House2.inc
+++ b/data-de/maps/DewfordTown_House2/text.inc
diff --git a/data-de/text/maps/DewfordTown_PokemonCenter_1F.inc b/data-de/maps/DewfordTown_PokemonCenter_1F/text.inc
index 5d7b555f0..5d7b555f0 100644
--- a/data-de/text/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data-de/maps/DewfordTown_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/EverGrandeCity.inc b/data-de/maps/EverGrandeCity/text.inc
index 6d1a09d16..6d1a09d16 100644
--- a/data-de/text/maps/EverGrandeCity.inc
+++ b/data-de/maps/EverGrandeCity/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_ChampionsRoom.inc b/data-de/maps/EverGrandeCity_ChampionsRoom/text.inc
index d8787a895..d8787a895 100644
--- a/data-de/text/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data-de/maps/EverGrandeCity_ChampionsRoom/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_DrakesRoom.inc b/data-de/maps/EverGrandeCity_DrakesRoom/text.inc
index 484aefc14..484aefc14 100644
--- a/data-de/text/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data-de/maps/EverGrandeCity_DrakesRoom/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_GlaciasRoom.inc b/data-de/maps/EverGrandeCity_GlaciasRoom/text.inc
index 8bb9b3427..8bb9b3427 100644
--- a/data-de/text/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data-de/maps/EverGrandeCity_GlaciasRoom/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_HallOfFame.inc b/data-de/maps/EverGrandeCity_HallOfFame/text.inc
index 4806915c9..4806915c9 100644
--- a/data-de/text/maps/EverGrandeCity_HallOfFame.inc
+++ b/data-de/maps/EverGrandeCity_HallOfFame/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_PhoebesRoom.inc b/data-de/maps/EverGrandeCity_PhoebesRoom/text.inc
index e844262c2..e844262c2 100644
--- a/data-de/text/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data-de/maps/EverGrandeCity_PhoebesRoom/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_PokemonCenter_1F.inc b/data-de/maps/EverGrandeCity_PokemonCenter_1F/text.inc
index 6bf6c9803..6bf6c9803 100644
--- a/data-de/text/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data-de/maps/EverGrandeCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_PokemonLeague.inc b/data-de/maps/EverGrandeCity_PokemonLeague/text.inc
index b2e8a76f1..b2e8a76f1 100644
--- a/data-de/text/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data-de/maps/EverGrandeCity_PokemonLeague/text.inc
diff --git a/data-de/text/maps/EverGrandeCity_SidneysRoom.inc b/data-de/maps/EverGrandeCity_SidneysRoom/text.inc
index 76871909d..76871909d 100644
--- a/data-de/text/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data-de/maps/EverGrandeCity_SidneysRoom/text.inc
diff --git a/data-de/text/maps/FallarborTown.inc b/data-de/maps/FallarborTown/text.inc
index a695f5d83..a695f5d83 100644
--- a/data-de/text/maps/FallarborTown.inc
+++ b/data-de/maps/FallarborTown/text.inc
diff --git a/data-de/text/maps/FallarborTown_ContestHall.inc b/data-de/maps/FallarborTown_ContestHall/text.inc
index 43c34e295..43c34e295 100644
--- a/data-de/text/maps/FallarborTown_ContestHall.inc
+++ b/data-de/maps/FallarborTown_ContestHall/text.inc
diff --git a/data-de/text/maps/FallarborTown_ContestLobby.inc b/data-de/maps/FallarborTown_ContestLobby/text.inc
index 085d43e7d..085d43e7d 100644
--- a/data-de/text/maps/FallarborTown_ContestLobby.inc
+++ b/data-de/maps/FallarborTown_ContestLobby/text.inc
diff --git a/data-de/text/maps/FallarborTown_House1.inc b/data-de/maps/FallarborTown_House1/text.inc
index c19ee545d..c19ee545d 100644
--- a/data-de/text/maps/FallarborTown_House1.inc
+++ b/data-de/maps/FallarborTown_House1/text.inc
diff --git a/data-de/text/maps/FallarborTown_House2.inc b/data-de/maps/FallarborTown_House2/text.inc
index b0450c136..b0450c136 100644
--- a/data-de/text/maps/FallarborTown_House2.inc
+++ b/data-de/maps/FallarborTown_House2/text.inc
diff --git a/data-de/text/maps/FallarborTown_Mart.inc b/data-de/maps/FallarborTown_Mart/text.inc
index 6f6ebef5c..6f6ebef5c 100644
--- a/data-de/text/maps/FallarborTown_Mart.inc
+++ b/data-de/maps/FallarborTown_Mart/text.inc
diff --git a/data-de/text/maps/FallarborTown_PokemonCenter_1F.inc b/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc
index 66a21c458..66a21c458 100644
--- a/data-de/text/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data-de/maps/FallarborTown_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/FortreeCity.inc b/data-de/maps/FortreeCity/text.inc
index 9f12b016e..9f12b016e 100644
--- a/data-de/text/maps/FortreeCity.inc
+++ b/data-de/maps/FortreeCity/text.inc
diff --git a/data-de/text/maps/FortreeCity_DecorationShop.inc b/data-de/maps/FortreeCity_DecorationShop/text.inc
index 07c3b3379..07c3b3379 100644
--- a/data-de/text/maps/FortreeCity_DecorationShop.inc
+++ b/data-de/maps/FortreeCity_DecorationShop/text.inc
diff --git a/data-de/text/maps/FortreeCity_Gym.inc b/data-de/maps/FortreeCity_Gym/text.inc
index 5c1696822..5c1696822 100644
--- a/data-de/text/maps/FortreeCity_Gym.inc
+++ b/data-de/maps/FortreeCity_Gym/text.inc
diff --git a/data-de/text/maps/FortreeCity_House1.inc b/data-de/maps/FortreeCity_House1/text.inc
index 0f22af768..0f22af768 100644
--- a/data-de/text/maps/FortreeCity_House1.inc
+++ b/data-de/maps/FortreeCity_House1/text.inc
diff --git a/data-de/text/maps/FortreeCity_House2.inc b/data-de/maps/FortreeCity_House2/text.inc
index c257d6c5b..c257d6c5b 100644
--- a/data-de/text/maps/FortreeCity_House2.inc
+++ b/data-de/maps/FortreeCity_House2/text.inc
diff --git a/data-de/text/maps/FortreeCity_House3.inc b/data-de/maps/FortreeCity_House3/text.inc
index 8370d6692..8370d6692 100644
--- a/data-de/text/maps/FortreeCity_House3.inc
+++ b/data-de/maps/FortreeCity_House3/text.inc
diff --git a/data-de/text/maps/FortreeCity_House4.inc b/data-de/maps/FortreeCity_House4/text.inc
index c1491ae96..c1491ae96 100644
--- a/data-de/text/maps/FortreeCity_House4.inc
+++ b/data-de/maps/FortreeCity_House4/text.inc
diff --git a/data-de/text/maps/FortreeCity_House5.inc b/data-de/maps/FortreeCity_House5/text.inc
index 26c5b21ad..26c5b21ad 100644
--- a/data-de/text/maps/FortreeCity_House5.inc
+++ b/data-de/maps/FortreeCity_House5/text.inc
diff --git a/data-de/text/maps/FortreeCity_Mart.inc b/data-de/maps/FortreeCity_Mart/text.inc
index da371d141..da371d141 100644
--- a/data-de/text/maps/FortreeCity_Mart.inc
+++ b/data-de/maps/FortreeCity_Mart/text.inc
diff --git a/data-de/text/maps/FortreeCity_PokemonCenter_1F.inc b/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc
index f38a010bc..f38a010bc 100644
--- a/data-de/text/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data-de/maps/FortreeCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/GraniteCave_1F.inc b/data-de/maps/GraniteCave_1F/text.inc
index 16c943455..16c943455 100644
--- a/data-de/text/maps/GraniteCave_1F.inc
+++ b/data-de/maps/GraniteCave_1F/text.inc
diff --git a/data-de/text/maps/GraniteCave_StevensRoom.inc b/data-de/maps/GraniteCave_StevensRoom/text.inc
index 19d4ac0ca..19d4ac0ca 100644
--- a/data-de/text/maps/GraniteCave_StevensRoom.inc
+++ b/data-de/maps/GraniteCave_StevensRoom/text.inc
diff --git a/data-de/text/maps/InsideOfTruck.inc b/data-de/maps/InsideOfTruck/text.inc
index 3c92c3cc0..3c92c3cc0 100644
--- a/data-de/text/maps/InsideOfTruck.inc
+++ b/data-de/maps/InsideOfTruck/text.inc
diff --git a/data-de/text/maps/JaggedPass.inc b/data-de/maps/JaggedPass/text.inc
index 4411ff4f1..4411ff4f1 100644
--- a/data-de/text/maps/JaggedPass.inc
+++ b/data-de/maps/JaggedPass/text.inc
diff --git a/data-de/text/maps/LavaridgeTown.inc b/data-de/maps/LavaridgeTown/text.inc
index 3fa8668e5..3fa8668e5 100644
--- a/data-de/text/maps/LavaridgeTown.inc
+++ b/data-de/maps/LavaridgeTown/text.inc
diff --git a/data-de/text/maps/LavaridgeTown_Gym_1F.inc b/data-de/maps/LavaridgeTown_Gym_1F/text.inc
index cb2eca809..cb2eca809 100644
--- a/data-de/text/maps/LavaridgeTown_Gym_1F.inc
+++ b/data-de/maps/LavaridgeTown_Gym_1F/text.inc
diff --git a/data-de/text/maps/LavaridgeTown_HerbShop.inc b/data-de/maps/LavaridgeTown_HerbShop/text.inc
index 612d4e9a4..612d4e9a4 100644
--- a/data-de/text/maps/LavaridgeTown_HerbShop.inc
+++ b/data-de/maps/LavaridgeTown_HerbShop/text.inc
diff --git a/data-de/text/maps/LavaridgeTown_House.inc b/data-de/maps/LavaridgeTown_House/text.inc
index 6a6a3663c..6a6a3663c 100644
--- a/data-de/text/maps/LavaridgeTown_House.inc
+++ b/data-de/maps/LavaridgeTown_House/text.inc
diff --git a/data-de/text/maps/LavaridgeTown_Mart.inc b/data-de/maps/LavaridgeTown_Mart/text.inc
index fc957492c..fc957492c 100644
--- a/data-de/text/maps/LavaridgeTown_Mart.inc
+++ b/data-de/maps/LavaridgeTown_Mart/text.inc
diff --git a/data-de/text/maps/LavaridgeTown_PokemonCenter_1F.inc b/data-de/maps/LavaridgeTown_PokemonCenter_1F/text.inc
index e0425c1ee..e0425c1ee 100644
--- a/data-de/text/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data-de/maps/LavaridgeTown_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/LilycoveCity.inc b/data-de/maps/LilycoveCity/text.inc
index eb11d39b5..eb11d39b5 100644
--- a/data-de/text/maps/LilycoveCity.inc
+++ b/data-de/maps/LilycoveCity/text.inc
diff --git a/data-de/text/maps/LilycoveCity_ContestHall.inc b/data-de/maps/LilycoveCity_ContestHall/text.inc
index 11b422ec7..11b422ec7 100644
--- a/data-de/text/maps/LilycoveCity_ContestHall.inc
+++ b/data-de/maps/LilycoveCity_ContestHall/text.inc
diff --git a/data-de/text/maps/LilycoveCity_ContestLobby.inc b/data-de/maps/LilycoveCity_ContestLobby/text.inc
index aca01301b..aca01301b 100644
--- a/data-de/text/maps/LilycoveCity_ContestLobby.inc
+++ b/data-de/maps/LilycoveCity_ContestLobby/text.inc
diff --git a/data-de/text/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data-de/maps/LilycoveCity_CoveLilyMotel_1F/text.inc
index 3bce2592b..3bce2592b 100644
--- a/data-de/text/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data-de/maps/LilycoveCity_CoveLilyMotel_1F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data-de/maps/LilycoveCity_CoveLilyMotel_2F/text.inc
index 648e1d684..648e1d684 100644
--- a/data-de/text/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data-de/maps/LilycoveCity_CoveLilyMotel_2F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data-de/maps/LilycoveCity_DepartmentStoreRooftop/text.inc
index f09c4aa08..f09c4aa08 100644
--- a/data-de/text/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data-de/maps/LilycoveCity_DepartmentStoreRooftop/text.inc
diff --git a/data-de/text/maps/LilycoveCity_DepartmentStore_1F.inc b/data-de/maps/LilycoveCity_DepartmentStore_1F/text.inc
index fb4d5b589..fb4d5b589 100644
--- a/data-de/text/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data-de/maps/LilycoveCity_DepartmentStore_1F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_DepartmentStore_2F.inc b/data-de/maps/LilycoveCity_DepartmentStore_2F/text.inc
index 721974796..721974796 100644
--- a/data-de/text/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data-de/maps/LilycoveCity_DepartmentStore_2F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_DepartmentStore_3F.inc b/data-de/maps/LilycoveCity_DepartmentStore_3F/text.inc
index eb430e21c..eb430e21c 100644
--- a/data-de/text/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data-de/maps/LilycoveCity_DepartmentStore_3F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_DepartmentStore_4F.inc b/data-de/maps/LilycoveCity_DepartmentStore_4F/text.inc
index 86a1438a2..86a1438a2 100644
--- a/data-de/text/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data-de/maps/LilycoveCity_DepartmentStore_4F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_DepartmentStore_5F.inc b/data-de/maps/LilycoveCity_DepartmentStore_5F/text.inc
index 821a85431..821a85431 100644
--- a/data-de/text/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data-de/maps/LilycoveCity_DepartmentStore_5F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_Harbor.inc b/data-de/maps/LilycoveCity_Harbor/text.inc
index 1282cb3b9..1282cb3b9 100644
--- a/data-de/text/maps/LilycoveCity_Harbor.inc
+++ b/data-de/maps/LilycoveCity_Harbor/text.inc
diff --git a/data-de/text/maps/LilycoveCity_House1.inc b/data-de/maps/LilycoveCity_House1/text.inc
index c374ed813..c374ed813 100644
--- a/data-de/text/maps/LilycoveCity_House1.inc
+++ b/data-de/maps/LilycoveCity_House1/text.inc
diff --git a/data-de/text/maps/LilycoveCity_House2.inc b/data-de/maps/LilycoveCity_House2/text.inc
index f5aae781d..f5aae781d 100644
--- a/data-de/text/maps/LilycoveCity_House2.inc
+++ b/data-de/maps/LilycoveCity_House2/text.inc
diff --git a/data-de/text/maps/LilycoveCity_House3.inc b/data-de/maps/LilycoveCity_House3/text.inc
index b9f243868..b9f243868 100644
--- a/data-de/text/maps/LilycoveCity_House3.inc
+++ b/data-de/maps/LilycoveCity_House3/text.inc
diff --git a/data-de/text/maps/LilycoveCity_House4.inc b/data-de/maps/LilycoveCity_House4/text.inc
index ee6b0fa8b..ee6b0fa8b 100644
--- a/data-de/text/maps/LilycoveCity_House4.inc
+++ b/data-de/maps/LilycoveCity_House4/text.inc
diff --git a/data-de/text/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data-de/maps/LilycoveCity_LilycoveMuseum_1F/text.inc
index 93f9d2f7e..93f9d2f7e 100644
--- a/data-de/text/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data-de/maps/LilycoveCity_LilycoveMuseum_1F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data-de/maps/LilycoveCity_LilycoveMuseum_2F/text.inc
index 4fc29ee73..4fc29ee73 100644
--- a/data-de/text/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data-de/maps/LilycoveCity_LilycoveMuseum_2F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_MoveDeletersHouse.inc b/data-de/maps/LilycoveCity_MoveDeletersHouse/text.inc
index 0898d7e2a..0898d7e2a 100644
--- a/data-de/text/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data-de/maps/LilycoveCity_MoveDeletersHouse/text.inc
diff --git a/data-de/text/maps/LilycoveCity_PokemonCenter_1F.inc b/data-de/maps/LilycoveCity_PokemonCenter_1F/text.inc
index b1f676671..b1f676671 100644
--- a/data-de/text/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data-de/maps/LilycoveCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data-de/maps/LilycoveCity_PokemonTrainerFanClub/text.inc
index 09b4d59b5..09b4d59b5 100644
--- a/data-de/text/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data-de/maps/LilycoveCity_PokemonTrainerFanClub/text.inc
diff --git a/data-de/text/maps/LittlerootTown.inc b/data-de/maps/LittlerootTown/text.inc
index e41038b1c..e41038b1c 100644
--- a/data-de/text/maps/LittlerootTown.inc
+++ b/data-de/maps/LittlerootTown/text.inc
diff --git a/data-de/text/maps/LittlerootTown_BrendansHouse_1F.inc b/data-de/maps/LittlerootTown_BrendansHouse_1F/text.inc
index 9952028d1..9952028d1 100644
--- a/data-de/text/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data-de/maps/LittlerootTown_BrendansHouse_1F/text.inc
diff --git a/data-de/text/maps/LittlerootTown_BrendansHouse_2F.inc b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc
index 102eb6664..102eb6664 100644
--- a/data-de/text/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data-de/maps/LittlerootTown_BrendansHouse_2F/text.inc
diff --git a/data-de/text/maps/LittlerootTown_MaysHouse_1F.inc b/data-de/maps/LittlerootTown_MaysHouse_1F/text.inc
index a4fab5261..a4fab5261 100644
--- a/data-de/text/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data-de/maps/LittlerootTown_MaysHouse_1F/text.inc
diff --git a/data-de/text/maps/LittlerootTown_MaysHouse_2F.inc b/data-de/maps/LittlerootTown_MaysHouse_2F/text.inc
index 6cad66063..6cad66063 100644
--- a/data-de/text/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data-de/maps/LittlerootTown_MaysHouse_2F/text.inc
diff --git a/data-de/text/maps/LittlerootTown_ProfessorBirchsLab.inc b/data-de/maps/LittlerootTown_ProfessorBirchsLab/text.inc
index a142a3b2f..a142a3b2f 100644
--- a/data-de/text/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data-de/maps/LittlerootTown_ProfessorBirchsLab/text.inc
diff --git a/data-de/text/maps/MauvilleCity.inc b/data-de/maps/MauvilleCity/text.inc
index 4a06fff34..4a06fff34 100644
--- a/data-de/text/maps/MauvilleCity.inc
+++ b/data-de/maps/MauvilleCity/text.inc
diff --git a/data-de/text/maps/MauvilleCity_BikeShop.inc b/data-de/maps/MauvilleCity_BikeShop/text.inc
index 6587535ef..6587535ef 100644
--- a/data-de/text/maps/MauvilleCity_BikeShop.inc
+++ b/data-de/maps/MauvilleCity_BikeShop/text.inc
diff --git a/data-de/text/maps/MauvilleCity_GameCorner.inc b/data-de/maps/MauvilleCity_GameCorner/text.inc
index a8756771a..a8756771a 100644
--- a/data-de/text/maps/MauvilleCity_GameCorner.inc
+++ b/data-de/maps/MauvilleCity_GameCorner/text.inc
diff --git a/data-de/text/maps/MauvilleCity_Gym.inc b/data-de/maps/MauvilleCity_Gym/text.inc
index 9d002ba9e..9d002ba9e 100644
--- a/data-de/text/maps/MauvilleCity_Gym.inc
+++ b/data-de/maps/MauvilleCity_Gym/text.inc
diff --git a/data-de/text/maps/MauvilleCity_House1.inc b/data-de/maps/MauvilleCity_House1/text.inc
index 2f0067526..2f0067526 100644
--- a/data-de/text/maps/MauvilleCity_House1.inc
+++ b/data-de/maps/MauvilleCity_House1/text.inc
diff --git a/data-de/text/maps/MauvilleCity_House2.inc b/data-de/maps/MauvilleCity_House2/text.inc
index 6de1ff1d9..6de1ff1d9 100644
--- a/data-de/text/maps/MauvilleCity_House2.inc
+++ b/data-de/maps/MauvilleCity_House2/text.inc
diff --git a/data-de/text/maps/MauvilleCity_Mart.inc b/data-de/maps/MauvilleCity_Mart/text.inc
index b8bf2ebb5..b8bf2ebb5 100644
--- a/data-de/text/maps/MauvilleCity_Mart.inc
+++ b/data-de/maps/MauvilleCity_Mart/text.inc
diff --git a/data-de/text/maps/MauvilleCity_PokemonCenter_1F.inc b/data-de/maps/MauvilleCity_PokemonCenter_1F/text.inc
index bb09903b0..bb09903b0 100644
--- a/data-de/text/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data-de/maps/MauvilleCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/MauvilleCity_PokemonCenter_2F.inc b/data-de/maps/MauvilleCity_PokemonCenter_2F/text.inc
index 27f3ae66e..27f3ae66e 100644
--- a/data-de/text/maps/MauvilleCity_PokemonCenter_2F.inc
+++ b/data-de/maps/MauvilleCity_PokemonCenter_2F/text.inc
diff --git a/data-de/text/maps/MeteorFalls_1F_1R.inc b/data-de/maps/MeteorFalls_1F_1R/text.inc
index 3efe7ff39..3efe7ff39 100644
--- a/data-de/text/maps/MeteorFalls_1F_1R.inc
+++ b/data-de/maps/MeteorFalls_1F_1R/text.inc
diff --git a/data-de/text/maps/MeteorFalls_1F_2R.inc b/data-de/maps/MeteorFalls_1F_2R/text.inc
index ee685eb0c..ee685eb0c 100644
--- a/data-de/text/maps/MeteorFalls_1F_2R.inc
+++ b/data-de/maps/MeteorFalls_1F_2R/text.inc
diff --git a/data-de/text/maps/MossdeepCity.inc b/data-de/maps/MossdeepCity/text.inc
index 48d0e95d0..48d0e95d0 100644
--- a/data-de/text/maps/MossdeepCity.inc
+++ b/data-de/maps/MossdeepCity/text.inc
diff --git a/data-de/text/maps/MossdeepCity_GameCorner_1F.inc b/data-de/maps/MossdeepCity_GameCorner_1F/text.inc
index 277f8008a..277f8008a 100644
--- a/data-de/text/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data-de/maps/MossdeepCity_GameCorner_1F/text.inc
diff --git a/data-de/text/maps/MossdeepCity_Gym.inc b/data-de/maps/MossdeepCity_Gym/text.inc
index a5b692603..a5b692603 100644
--- a/data-de/text/maps/MossdeepCity_Gym.inc
+++ b/data-de/maps/MossdeepCity_Gym/text.inc
diff --git a/data-de/text/maps/MossdeepCity_House1.inc b/data-de/maps/MossdeepCity_House1/text.inc
index bb6520f6f..bb6520f6f 100644
--- a/data-de/text/maps/MossdeepCity_House1.inc
+++ b/data-de/maps/MossdeepCity_House1/text.inc
diff --git a/data-de/text/maps/MossdeepCity_House2.inc b/data-de/maps/MossdeepCity_House2/text.inc
index 2a3774ad7..2a3774ad7 100644
--- a/data-de/text/maps/MossdeepCity_House2.inc
+++ b/data-de/maps/MossdeepCity_House2/text.inc
diff --git a/data-de/text/maps/MossdeepCity_House3.inc b/data-de/maps/MossdeepCity_House3/text.inc
index c4dc6f0d3..c4dc6f0d3 100644
--- a/data-de/text/maps/MossdeepCity_House3.inc
+++ b/data-de/maps/MossdeepCity_House3/text.inc
diff --git a/data-de/text/maps/MossdeepCity_House4.inc b/data-de/maps/MossdeepCity_House4/text.inc
index 0738d9563..0738d9563 100644
--- a/data-de/text/maps/MossdeepCity_House4.inc
+++ b/data-de/maps/MossdeepCity_House4/text.inc
diff --git a/data-de/text/maps/MossdeepCity_Mart.inc b/data-de/maps/MossdeepCity_Mart/text.inc
index 7f1761efc..7f1761efc 100644
--- a/data-de/text/maps/MossdeepCity_Mart.inc
+++ b/data-de/maps/MossdeepCity_Mart/text.inc
diff --git a/data-de/text/maps/MossdeepCity_PokemonCenter_1F.inc b/data-de/maps/MossdeepCity_PokemonCenter_1F/text.inc
index 397b90178..397b90178 100644
--- a/data-de/text/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data-de/maps/MossdeepCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/MossdeepCity_PokemonCenter_2F.inc b/data-de/maps/MossdeepCity_PokemonCenter_2F/text.inc
index 3e8f190e9..3e8f190e9 100644
--- a/data-de/text/maps/MossdeepCity_PokemonCenter_2F.inc
+++ b/data-de/maps/MossdeepCity_PokemonCenter_2F/text.inc
diff --git a/data-de/text/maps/MossdeepCity_SpaceCenter_1F.inc b/data-de/maps/MossdeepCity_SpaceCenter_1F/text.inc
index 4c5703222..4c5703222 100644
--- a/data-de/text/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data-de/maps/MossdeepCity_SpaceCenter_1F/text.inc
diff --git a/data-de/text/maps/MossdeepCity_SpaceCenter_2F.inc b/data-de/maps/MossdeepCity_SpaceCenter_2F/text.inc
index e6b42eef1..e6b42eef1 100644
--- a/data-de/text/maps/MossdeepCity_SpaceCenter_2F.inc
+++ b/data-de/maps/MossdeepCity_SpaceCenter_2F/text.inc
diff --git a/data-de/text/maps/MossdeepCity_StevensHouse.inc b/data-de/maps/MossdeepCity_StevensHouse/text.inc
index abf80ddda..abf80ddda 100644
--- a/data-de/text/maps/MossdeepCity_StevensHouse.inc
+++ b/data-de/maps/MossdeepCity_StevensHouse/text.inc
diff --git a/data-de/text/maps/MtChimney.inc b/data-de/maps/MtChimney/text.inc
index 949a74ffd..949a74ffd 100644
--- a/data-de/text/maps/MtChimney.inc
+++ b/data-de/maps/MtChimney/text.inc
diff --git a/data-de/text/maps/MtChimney_CableCarStation.inc b/data-de/maps/MtChimney_CableCarStation/text.inc
index 38393fb2d..38393fb2d 100644
--- a/data-de/text/maps/MtChimney_CableCarStation.inc
+++ b/data-de/maps/MtChimney_CableCarStation/text.inc
diff --git a/data-de/text/maps/MtPyre_1F.inc b/data-de/maps/MtPyre_1F/text.inc
index 27402c5c7..27402c5c7 100644
--- a/data-de/text/maps/MtPyre_1F.inc
+++ b/data-de/maps/MtPyre_1F/text.inc
diff --git a/data-de/text/maps/MtPyre_2F.inc b/data-de/maps/MtPyre_2F/text.inc
index 88d5a5546..88d5a5546 100644
--- a/data-de/text/maps/MtPyre_2F.inc
+++ b/data-de/maps/MtPyre_2F/text.inc
diff --git a/data-de/text/maps/MtPyre_3F.inc b/data-de/maps/MtPyre_3F/text.inc
index c1fa592e1..c1fa592e1 100644
--- a/data-de/text/maps/MtPyre_3F.inc
+++ b/data-de/maps/MtPyre_3F/text.inc
diff --git a/data-de/text/maps/MtPyre_4F.inc b/data-de/maps/MtPyre_4F/text.inc
index 46ec64d44..46ec64d44 100644
--- a/data-de/text/maps/MtPyre_4F.inc
+++ b/data-de/maps/MtPyre_4F/text.inc
diff --git a/data-de/text/maps/MtPyre_5F.inc b/data-de/maps/MtPyre_5F/text.inc
index d42949f30..d42949f30 100644
--- a/data-de/text/maps/MtPyre_5F.inc
+++ b/data-de/maps/MtPyre_5F/text.inc
diff --git a/data-de/text/maps/MtPyre_6F.inc b/data-de/maps/MtPyre_6F/text.inc
index 50419c363..50419c363 100644
--- a/data-de/text/maps/MtPyre_6F.inc
+++ b/data-de/maps/MtPyre_6F/text.inc
diff --git a/data-de/text/maps/NewMauville_Entrance.inc b/data-de/maps/NewMauville_Entrance/text.inc
index f6f8ad75f..f6f8ad75f 100644
--- a/data-de/text/maps/NewMauville_Entrance.inc
+++ b/data-de/maps/NewMauville_Entrance/text.inc
diff --git a/data-de/text/maps/NewMauville_Inside.inc b/data-de/maps/NewMauville_Inside/text.inc
index 2c7325674..2c7325674 100644
--- a/data-de/text/maps/NewMauville_Inside.inc
+++ b/data-de/maps/NewMauville_Inside/text.inc
diff --git a/data-de/text/maps/OldaleTown.inc b/data-de/maps/OldaleTown/text.inc
index 39d3f8142..39d3f8142 100644
--- a/data-de/text/maps/OldaleTown.inc
+++ b/data-de/maps/OldaleTown/text.inc
diff --git a/data-de/text/maps/OldaleTown_House1.inc b/data-de/maps/OldaleTown_House1/text.inc
index d12e86fb7..d12e86fb7 100644
--- a/data-de/text/maps/OldaleTown_House1.inc
+++ b/data-de/maps/OldaleTown_House1/text.inc
diff --git a/data-de/text/maps/OldaleTown_House2.inc b/data-de/maps/OldaleTown_House2/text.inc
index c14c3803a..c14c3803a 100644
--- a/data-de/text/maps/OldaleTown_House2.inc
+++ b/data-de/maps/OldaleTown_House2/text.inc
diff --git a/data-de/text/maps/OldaleTown_Mart.inc b/data-de/maps/OldaleTown_Mart/text.inc
index 19e1e600f..19e1e600f 100644
--- a/data-de/text/maps/OldaleTown_Mart.inc
+++ b/data-de/maps/OldaleTown_Mart/text.inc
diff --git a/data-de/text/maps/OldaleTown_PokemonCenter_1F.inc b/data-de/maps/OldaleTown_PokemonCenter_1F/text.inc
index 4396e8638..4396e8638 100644
--- a/data-de/text/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data-de/maps/OldaleTown_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/PacifidlogTown.inc b/data-de/maps/PacifidlogTown/text.inc
index f9cf80a48..f9cf80a48 100644
--- a/data-de/text/maps/PacifidlogTown.inc
+++ b/data-de/maps/PacifidlogTown/text.inc
diff --git a/data-de/text/maps/PacifidlogTown_House1.inc b/data-de/maps/PacifidlogTown_House1/text.inc
index deed4a0f6..deed4a0f6 100644
--- a/data-de/text/maps/PacifidlogTown_House1.inc
+++ b/data-de/maps/PacifidlogTown_House1/text.inc
diff --git a/data-de/text/maps/PacifidlogTown_House2.inc b/data-de/maps/PacifidlogTown_House2/text.inc
index d5d93ae24..d5d93ae24 100644
--- a/data-de/text/maps/PacifidlogTown_House2.inc
+++ b/data-de/maps/PacifidlogTown_House2/text.inc
diff --git a/data-de/text/maps/PacifidlogTown_House3.inc b/data-de/maps/PacifidlogTown_House3/text.inc
index 2e0e34d9e..2e0e34d9e 100644
--- a/data-de/text/maps/PacifidlogTown_House3.inc
+++ b/data-de/maps/PacifidlogTown_House3/text.inc
diff --git a/data-de/text/maps/PacifidlogTown_House4.inc b/data-de/maps/PacifidlogTown_House4/text.inc
index 6e1dfb1db..6e1dfb1db 100644
--- a/data-de/text/maps/PacifidlogTown_House4.inc
+++ b/data-de/maps/PacifidlogTown_House4/text.inc
diff --git a/data-de/text/maps/PacifidlogTown_House5.inc b/data-de/maps/PacifidlogTown_House5/text.inc
index eaba254c7..eaba254c7 100644
--- a/data-de/text/maps/PacifidlogTown_House5.inc
+++ b/data-de/maps/PacifidlogTown_House5/text.inc
diff --git a/data-de/text/maps/PacifidlogTown_PokemonCenter_1F.inc b/data-de/maps/PacifidlogTown_PokemonCenter_1F/text.inc
index 648c562fe..648c562fe 100644
--- a/data-de/text/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data-de/maps/PacifidlogTown_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/PetalburgCity.inc b/data-de/maps/PetalburgCity/text.inc
index 2e8d02124..2e8d02124 100644
--- a/data-de/text/maps/PetalburgCity.inc
+++ b/data-de/maps/PetalburgCity/text.inc
diff --git a/data-de/text/maps/PetalburgCity_Gym.inc b/data-de/maps/PetalburgCity_Gym/text.inc
index 1d1ca9db7..1d1ca9db7 100644
--- a/data-de/text/maps/PetalburgCity_Gym.inc
+++ b/data-de/maps/PetalburgCity_Gym/text.inc
diff --git a/data-de/text/maps/PetalburgCity_House1.inc b/data-de/maps/PetalburgCity_House1/text.inc
index 84bc33fed..84bc33fed 100644
--- a/data-de/text/maps/PetalburgCity_House1.inc
+++ b/data-de/maps/PetalburgCity_House1/text.inc
diff --git a/data-de/text/maps/PetalburgCity_House2.inc b/data-de/maps/PetalburgCity_House2/text.inc
index 35af2bb8b..35af2bb8b 100644
--- a/data-de/text/maps/PetalburgCity_House2.inc
+++ b/data-de/maps/PetalburgCity_House2/text.inc
diff --git a/data-de/text/maps/PetalburgCity_Mart.inc b/data-de/maps/PetalburgCity_Mart/text.inc
index 988502492..988502492 100644
--- a/data-de/text/maps/PetalburgCity_Mart.inc
+++ b/data-de/maps/PetalburgCity_Mart/text.inc
diff --git a/data-de/text/maps/PetalburgCity_PokemonCenter_1F.inc b/data-de/maps/PetalburgCity_PokemonCenter_1F/text.inc
index 15235279a..15235279a 100644
--- a/data-de/text/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data-de/maps/PetalburgCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/PetalburgCity_WallysHouse.inc b/data-de/maps/PetalburgCity_WallysHouse/text.inc
index 6eade6f20..6eade6f20 100644
--- a/data-de/text/maps/PetalburgCity_WallysHouse.inc
+++ b/data-de/maps/PetalburgCity_WallysHouse/text.inc
diff --git a/data-de/text/maps/PetalburgWoods.inc b/data-de/maps/PetalburgWoods/text.inc
index da1f43b40..da1f43b40 100644
--- a/data-de/text/maps/PetalburgWoods.inc
+++ b/data-de/maps/PetalburgWoods/text.inc
diff --git a/data-de/text/maps/Route101.inc b/data-de/maps/Route101/text.inc
index bbdbb034d..bbdbb034d 100644
--- a/data-de/text/maps/Route101.inc
+++ b/data-de/maps/Route101/text.inc
diff --git a/data-de/text/maps/Route102.inc b/data-de/maps/Route102/text.inc
index c544db7d5..c544db7d5 100644
--- a/data-de/text/maps/Route102.inc
+++ b/data-de/maps/Route102/text.inc
diff --git a/data-de/text/maps/Route103.inc b/data-de/maps/Route103/text.inc
index e6e6481b3..e6e6481b3 100644
--- a/data-de/text/maps/Route103.inc
+++ b/data-de/maps/Route103/text.inc
diff --git a/data-de/text/maps/Route104.inc b/data-de/maps/Route104/text.inc
index e8378ca4b..e8378ca4b 100644
--- a/data-de/text/maps/Route104.inc
+++ b/data-de/maps/Route104/text.inc
diff --git a/data-de/text/maps/Route104_MrBrineysHouse.inc b/data-de/maps/Route104_MrBrineysHouse/text.inc
index 8d3e36750..8d3e36750 100644
--- a/data-de/text/maps/Route104_MrBrineysHouse.inc
+++ b/data-de/maps/Route104_MrBrineysHouse/text.inc
diff --git a/data-de/text/maps/Route104_Prototype.inc b/data-de/maps/Route104_Prototype/text.inc
index 447d6a1ea..447d6a1ea 100644
--- a/data-de/text/maps/Route104_Prototype.inc
+++ b/data-de/maps/Route104_Prototype/text.inc
diff --git a/data-de/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data-de/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc
index 240f903cc..240f903cc 100644
--- a/data-de/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data-de/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc
diff --git a/data-de/text/maps/Route106.inc b/data-de/maps/Route106/text.inc
index c40321971..c40321971 100644
--- a/data-de/text/maps/Route106.inc
+++ b/data-de/maps/Route106/text.inc
diff --git a/data-de/text/maps/Route109.inc b/data-de/maps/Route109/text.inc
index 61e48788c..61e48788c 100644
--- a/data-de/text/maps/Route109.inc
+++ b/data-de/maps/Route109/text.inc
diff --git a/data-de/text/maps/Route109_SeashoreHouse.inc b/data-de/maps/Route109_SeashoreHouse/text.inc
index 7d830c12c..7d830c12c 100644
--- a/data-de/text/maps/Route109_SeashoreHouse.inc
+++ b/data-de/maps/Route109_SeashoreHouse/text.inc
diff --git a/data-de/text/maps/Route110.inc b/data-de/maps/Route110/text.inc
index 9ebf3507b..9ebf3507b 100644
--- a/data-de/text/maps/Route110.inc
+++ b/data-de/maps/Route110/text.inc
diff --git a/data-de/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data-de/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc
index 1179fa0ce..1179fa0ce 100644
--- a/data-de/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data-de/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc
diff --git a/data-de/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data-de/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc
index d2cd1bd34..d2cd1bd34 100644
--- a/data-de/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data-de/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc
diff --git a/data-de/text/maps/Route110_TrickHouseEnd.inc b/data-de/maps/Route110_TrickHouseEnd/text.inc
index 508e52b85..508e52b85 100644
--- a/data-de/text/maps/Route110_TrickHouseEnd.inc
+++ b/data-de/maps/Route110_TrickHouseEnd/text.inc
diff --git a/data-de/text/maps/Route110_TrickHouseEntrance.inc b/data-de/maps/Route110_TrickHouseEntrance/text.inc
index 5d218bc1a..5d218bc1a 100644
--- a/data-de/text/maps/Route110_TrickHouseEntrance.inc
+++ b/data-de/maps/Route110_TrickHouseEntrance/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle1.inc b/data-de/maps/Route110_TrickHousePuzzle1/text.inc
index 96eb9115e..96eb9115e 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle1.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle1/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle2.inc b/data-de/maps/Route110_TrickHousePuzzle2/text.inc
index a737ec0cf..a737ec0cf 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle2.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle2/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle3.inc b/data-de/maps/Route110_TrickHousePuzzle3/text.inc
index de3c0116d..de3c0116d 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle3.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle3/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle4.inc b/data-de/maps/Route110_TrickHousePuzzle4/text.inc
index 126a27eab..126a27eab 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle4.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle4/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle5.inc b/data-de/maps/Route110_TrickHousePuzzle5/text.inc
index 69870f2c8..69870f2c8 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle5.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle5/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle6.inc b/data-de/maps/Route110_TrickHousePuzzle6/text.inc
index 0bf347297..0bf347297 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle6.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle6/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle7.inc b/data-de/maps/Route110_TrickHousePuzzle7/text.inc
index 3111fcb65..3111fcb65 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle7.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle7/text.inc
diff --git a/data-de/text/maps/Route110_TrickHousePuzzle8.inc b/data-de/maps/Route110_TrickHousePuzzle8/text.inc
index 74a7c868b..74a7c868b 100644
--- a/data-de/text/maps/Route110_TrickHousePuzzle8.inc
+++ b/data-de/maps/Route110_TrickHousePuzzle8/text.inc
diff --git a/data-de/text/maps/Route111.inc b/data-de/maps/Route111/text.inc
index fc7eba19a..fc7eba19a 100644
--- a/data-de/text/maps/Route111.inc
+++ b/data-de/maps/Route111/text.inc
diff --git a/data-de/text/maps/Route111_OldLadysRestStop.inc b/data-de/maps/Route111_OldLadysRestStop/text.inc
index e65bb57e7..e65bb57e7 100644
--- a/data-de/text/maps/Route111_OldLadysRestStop.inc
+++ b/data-de/maps/Route111_OldLadysRestStop/text.inc
diff --git a/data-de/text/maps/Route111_WinstrateFamilysHouse.inc b/data-de/maps/Route111_WinstrateFamilysHouse/text.inc
index b7342721a..b7342721a 100644
--- a/data-de/text/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data-de/maps/Route111_WinstrateFamilysHouse/text.inc
diff --git a/data-de/text/maps/Route112.inc b/data-de/maps/Route112/text.inc
index dfda876ce..dfda876ce 100644
--- a/data-de/text/maps/Route112.inc
+++ b/data-de/maps/Route112/text.inc
diff --git a/data-de/text/maps/Route112_CableCarStation.inc b/data-de/maps/Route112_CableCarStation/text.inc
index bce76d721..bce76d721 100644
--- a/data-de/text/maps/Route112_CableCarStation.inc
+++ b/data-de/maps/Route112_CableCarStation/text.inc
diff --git a/data-de/text/maps/Route113.inc b/data-de/maps/Route113/text.inc
index e9b3abeb5..e9b3abeb5 100644
--- a/data-de/text/maps/Route113.inc
+++ b/data-de/maps/Route113/text.inc
diff --git a/data-de/text/maps/Route113_GlassWorkshop.inc b/data-de/maps/Route113_GlassWorkshop/text.inc
index 37fa22f70..37fa22f70 100644
--- a/data-de/text/maps/Route113_GlassWorkshop.inc
+++ b/data-de/maps/Route113_GlassWorkshop/text.inc
diff --git a/data-de/text/maps/Route114.inc b/data-de/maps/Route114/text.inc
index 059389be3..059389be3 100644
--- a/data-de/text/maps/Route114.inc
+++ b/data-de/maps/Route114/text.inc
diff --git a/data-de/text/maps/Route114_FossilManiacsHouse.inc b/data-de/maps/Route114_FossilManiacsHouse/text.inc
index afc141338..afc141338 100644
--- a/data-de/text/maps/Route114_FossilManiacsHouse.inc
+++ b/data-de/maps/Route114_FossilManiacsHouse/text.inc
diff --git a/data-de/text/maps/Route114_FossilManiacsTunnel.inc b/data-de/maps/Route114_FossilManiacsTunnel/text.inc
index 82bd7cb5f..82bd7cb5f 100644
--- a/data-de/text/maps/Route114_FossilManiacsTunnel.inc
+++ b/data-de/maps/Route114_FossilManiacsTunnel/text.inc
diff --git a/data-de/text/maps/Route114_LanettesHouse.inc b/data-de/maps/Route114_LanettesHouse/text.inc
index d4f0e155d..d4f0e155d 100644
--- a/data-de/text/maps/Route114_LanettesHouse.inc
+++ b/data-de/maps/Route114_LanettesHouse/text.inc
diff --git a/data-de/text/maps/Route115.inc b/data-de/maps/Route115/text.inc
index d7b8bb4b2..d7b8bb4b2 100644
--- a/data-de/text/maps/Route115.inc
+++ b/data-de/maps/Route115/text.inc
diff --git a/data-de/text/maps/Route116.inc b/data-de/maps/Route116/text.inc
index 286879807..286879807 100644
--- a/data-de/text/maps/Route116.inc
+++ b/data-de/maps/Route116/text.inc
diff --git a/data-de/text/maps/Route116_TunnelersRestHouse.inc b/data-de/maps/Route116_TunnelersRestHouse/text.inc
index 2245b81ff..2245b81ff 100644
--- a/data-de/text/maps/Route116_TunnelersRestHouse.inc
+++ b/data-de/maps/Route116_TunnelersRestHouse/text.inc
diff --git a/data-de/text/maps/Route117.inc b/data-de/maps/Route117/text.inc
index f115fe782..f115fe782 100644
--- a/data-de/text/maps/Route117.inc
+++ b/data-de/maps/Route117/text.inc
diff --git a/data-de/text/maps/Route118.inc b/data-de/maps/Route118/text.inc
index 5ff87f473..5ff87f473 100644
--- a/data-de/text/maps/Route118.inc
+++ b/data-de/maps/Route118/text.inc
diff --git a/data-de/text/maps/Route119.inc b/data-de/maps/Route119/text.inc
index 81df1b8ea..81df1b8ea 100644
--- a/data-de/text/maps/Route119.inc
+++ b/data-de/maps/Route119/text.inc
diff --git a/data-de/text/maps/Route119_House.inc b/data-de/maps/Route119_House/text.inc
index 33fa9fe32..33fa9fe32 100644
--- a/data-de/text/maps/Route119_House.inc
+++ b/data-de/maps/Route119_House/text.inc
diff --git a/data-de/text/maps/Route119_WeatherInstitute_1F.inc b/data-de/maps/Route119_WeatherInstitute_1F/text.inc
index d2c2165cb..d2c2165cb 100644
--- a/data-de/text/maps/Route119_WeatherInstitute_1F.inc
+++ b/data-de/maps/Route119_WeatherInstitute_1F/text.inc
diff --git a/data-de/text/maps/Route119_WeatherInstitute_2F.inc b/data-de/maps/Route119_WeatherInstitute_2F/text.inc
index 27dabca33..27dabca33 100644
--- a/data-de/text/maps/Route119_WeatherInstitute_2F.inc
+++ b/data-de/maps/Route119_WeatherInstitute_2F/text.inc
diff --git a/data-de/text/maps/Route120.inc b/data-de/maps/Route120/text.inc
index e19a22949..e19a22949 100644
--- a/data-de/text/maps/Route120.inc
+++ b/data-de/maps/Route120/text.inc
diff --git a/data-de/text/maps/Route121.inc b/data-de/maps/Route121/text.inc
index 61a70040c..61a70040c 100644
--- a/data-de/text/maps/Route121.inc
+++ b/data-de/maps/Route121/text.inc
diff --git a/data-de/text/maps/Route123.inc b/data-de/maps/Route123/text.inc
index fca4e9d2d..fca4e9d2d 100644
--- a/data-de/text/maps/Route123.inc
+++ b/data-de/maps/Route123/text.inc
diff --git a/data-de/text/maps/Route124.inc b/data-de/maps/Route124/text.inc
index a349672ed..a349672ed 100644
--- a/data-de/text/maps/Route124.inc
+++ b/data-de/maps/Route124/text.inc
diff --git a/data-de/text/maps/Route124_DivingTreasureHuntersHouse.inc b/data-de/maps/Route124_DivingTreasureHuntersHouse/text.inc
index ac9b18a23..ac9b18a23 100644
--- a/data-de/text/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data-de/maps/Route124_DivingTreasureHuntersHouse/text.inc
diff --git a/data-de/text/maps/Route128.inc b/data-de/maps/Route128/text.inc
index bf2e5b424..bf2e5b424 100644
--- a/data-de/text/maps/Route128.inc
+++ b/data-de/maps/Route128/text.inc
diff --git a/data-de/text/maps/RustboroCity.inc b/data-de/maps/RustboroCity/text.inc
index 6248b9e30..6248b9e30 100644
--- a/data-de/text/maps/RustboroCity.inc
+++ b/data-de/maps/RustboroCity/text.inc
diff --git a/data-de/text/maps/RustboroCity_CuttersHouse.inc b/data-de/maps/RustboroCity_CuttersHouse/text.inc
index 7e8448070..7e8448070 100644
--- a/data-de/text/maps/RustboroCity_CuttersHouse.inc
+++ b/data-de/maps/RustboroCity_CuttersHouse/text.inc
diff --git a/data-de/text/maps/RustboroCity_DevonCorp_1F.inc b/data-de/maps/RustboroCity_DevonCorp_1F/text.inc
index c7b4b4028..c7b4b4028 100644
--- a/data-de/text/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data-de/maps/RustboroCity_DevonCorp_1F/text.inc
diff --git a/data-de/text/maps/RustboroCity_DevonCorp_2F.inc b/data-de/maps/RustboroCity_DevonCorp_2F/text.inc
index 3e672ab46..3e672ab46 100644
--- a/data-de/text/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data-de/maps/RustboroCity_DevonCorp_2F/text.inc
diff --git a/data-de/text/maps/RustboroCity_DevonCorp_3F.inc b/data-de/maps/RustboroCity_DevonCorp_3F/text.inc
index 01bca10d4..01bca10d4 100644
--- a/data-de/text/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data-de/maps/RustboroCity_DevonCorp_3F/text.inc
diff --git a/data-de/text/maps/RustboroCity_Flat1_1F.inc b/data-de/maps/RustboroCity_Flat1_1F/text.inc
index 44a6d8800..44a6d8800 100644
--- a/data-de/text/maps/RustboroCity_Flat1_1F.inc
+++ b/data-de/maps/RustboroCity_Flat1_1F/text.inc
diff --git a/data-de/text/maps/RustboroCity_Flat1_2F.inc b/data-de/maps/RustboroCity_Flat1_2F/text.inc
index d744b8484..d744b8484 100644
--- a/data-de/text/maps/RustboroCity_Flat1_2F.inc
+++ b/data-de/maps/RustboroCity_Flat1_2F/text.inc
diff --git a/data-de/text/maps/RustboroCity_Flat2_1F.inc b/data-de/maps/RustboroCity_Flat2_1F/text.inc
index d6cb53734..d6cb53734 100644
--- a/data-de/text/maps/RustboroCity_Flat2_1F.inc
+++ b/data-de/maps/RustboroCity_Flat2_1F/text.inc
diff --git a/data-de/text/maps/RustboroCity_Flat2_2F.inc b/data-de/maps/RustboroCity_Flat2_2F/text.inc
index 13d9b9f93..13d9b9f93 100644
--- a/data-de/text/maps/RustboroCity_Flat2_2F.inc
+++ b/data-de/maps/RustboroCity_Flat2_2F/text.inc
diff --git a/data-de/text/maps/RustboroCity_Flat2_3F.inc b/data-de/maps/RustboroCity_Flat2_3F/text.inc
index 3bb2affc0..3bb2affc0 100644
--- a/data-de/text/maps/RustboroCity_Flat2_3F.inc
+++ b/data-de/maps/RustboroCity_Flat2_3F/text.inc
diff --git a/data-de/text/maps/RustboroCity_Gym.inc b/data-de/maps/RustboroCity_Gym/text.inc
index 88e0e01f2..88e0e01f2 100644
--- a/data-de/text/maps/RustboroCity_Gym.inc
+++ b/data-de/maps/RustboroCity_Gym/text.inc
diff --git a/data-de/text/maps/RustboroCity_House1.inc b/data-de/maps/RustboroCity_House1/text.inc
index e47e4a727..e47e4a727 100644
--- a/data-de/text/maps/RustboroCity_House1.inc
+++ b/data-de/maps/RustboroCity_House1/text.inc
diff --git a/data-de/text/maps/RustboroCity_House2.inc b/data-de/maps/RustboroCity_House2/text.inc
index 2d9e4ab4d..2d9e4ab4d 100644
--- a/data-de/text/maps/RustboroCity_House2.inc
+++ b/data-de/maps/RustboroCity_House2/text.inc
diff --git a/data-de/text/maps/RustboroCity_House3.inc b/data-de/maps/RustboroCity_House3/text.inc
index 1da0876d9..1da0876d9 100644
--- a/data-de/text/maps/RustboroCity_House3.inc
+++ b/data-de/maps/RustboroCity_House3/text.inc
diff --git a/data-de/text/maps/RustboroCity_Mart.inc b/data-de/maps/RustboroCity_Mart/text.inc
index 5288402dc..5288402dc 100644
--- a/data-de/text/maps/RustboroCity_Mart.inc
+++ b/data-de/maps/RustboroCity_Mart/text.inc
diff --git a/data-de/text/maps/RustboroCity_PokemonCenter_1F.inc b/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc
index 8c73d883e..8c73d883e 100644
--- a/data-de/text/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data-de/maps/RustboroCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/RustboroCity_PokemonSchool.inc b/data-de/maps/RustboroCity_PokemonSchool/text.inc
index 9e477deaa..9e477deaa 100644
--- a/data-de/text/maps/RustboroCity_PokemonSchool.inc
+++ b/data-de/maps/RustboroCity_PokemonSchool/text.inc
diff --git a/data-de/text/maps/RusturfTunnel.inc b/data-de/maps/RusturfTunnel/text.inc
index 1335318b3..1335318b3 100644
--- a/data-de/text/maps/RusturfTunnel.inc
+++ b/data-de/maps/RusturfTunnel/text.inc
diff --git a/data-de/text/maps/SSTidalCorridor.inc b/data-de/maps/SSTidalCorridor/text.inc
index bb6922229..bb6922229 100644
--- a/data-de/text/maps/SSTidalCorridor.inc
+++ b/data-de/maps/SSTidalCorridor/text.inc
diff --git a/data-de/text/maps/SSTidalLowerDeck.inc b/data-de/maps/SSTidalLowerDeck/text.inc
index 2341734dd..2341734dd 100644
--- a/data-de/text/maps/SSTidalLowerDeck.inc
+++ b/data-de/maps/SSTidalLowerDeck/text.inc
diff --git a/data-de/text/maps/SSTidalRooms.inc b/data-de/maps/SSTidalRooms/text.inc
index 72f9a0b48..72f9a0b48 100644
--- a/data-de/text/maps/SSTidalRooms.inc
+++ b/data-de/maps/SSTidalRooms/text.inc
diff --git a/data-de/text/maps/SeafloorCavern_Room1.inc b/data-de/maps/SeafloorCavern_Room1/text.inc
index 0b46a9267..0b46a9267 100644
--- a/data-de/text/maps/SeafloorCavern_Room1.inc
+++ b/data-de/maps/SeafloorCavern_Room1/text.inc
diff --git a/data-de/text/maps/SeafloorCavern_Room3.inc b/data-de/maps/SeafloorCavern_Room3/text.inc
index 896ef9e06..896ef9e06 100644
--- a/data-de/text/maps/SeafloorCavern_Room3.inc
+++ b/data-de/maps/SeafloorCavern_Room3/text.inc
diff --git a/data-de/text/maps/SeafloorCavern_Room4.inc b/data-de/maps/SeafloorCavern_Room4/text.inc
index 3b54317da..3b54317da 100644
--- a/data-de/text/maps/SeafloorCavern_Room4.inc
+++ b/data-de/maps/SeafloorCavern_Room4/text.inc
diff --git a/data-de/text/maps/SecretBase_RedCave1.inc b/data-de/maps/SecretBase_RedCave1/text.inc
index ffe6c4d04..ffe6c4d04 100644
--- a/data-de/text/maps/SecretBase_RedCave1.inc
+++ b/data-de/maps/SecretBase_RedCave1/text.inc
diff --git a/data-de/text/maps/ShoalCave_LowTideLowerRoom.inc b/data-de/maps/ShoalCave_LowTideLowerRoom/text.inc
index 1522dc019..1522dc019 100644
--- a/data-de/text/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data-de/maps/ShoalCave_LowTideLowerRoom/text.inc
diff --git a/data-de/text/maps/SlateportCity.inc b/data-de/maps/SlateportCity/text.inc
index b65cf82a4..b65cf82a4 100644
--- a/data-de/text/maps/SlateportCity.inc
+++ b/data-de/maps/SlateportCity/text.inc
diff --git a/data-de/text/maps/SlateportCity_ContestHall.inc b/data-de/maps/SlateportCity_ContestHall/text.inc
index 7a52c4a13..7a52c4a13 100644
--- a/data-de/text/maps/SlateportCity_ContestHall.inc
+++ b/data-de/maps/SlateportCity_ContestHall/text.inc
diff --git a/data-de/text/maps/SlateportCity_ContestLobby.inc b/data-de/maps/SlateportCity_ContestLobby/text.inc
index 24d4c8529..24d4c8529 100644
--- a/data-de/text/maps/SlateportCity_ContestLobby.inc
+++ b/data-de/maps/SlateportCity_ContestLobby/text.inc
diff --git a/data-de/text/maps/SlateportCity_Harbor.inc b/data-de/maps/SlateportCity_Harbor/text.inc
index 930375a5f..930375a5f 100644
--- a/data-de/text/maps/SlateportCity_Harbor.inc
+++ b/data-de/maps/SlateportCity_Harbor/text.inc
diff --git a/data-de/text/maps/SlateportCity_House1.inc b/data-de/maps/SlateportCity_House1/text.inc
index 1a5f503dd..1a5f503dd 100644
--- a/data-de/text/maps/SlateportCity_House1.inc
+++ b/data-de/maps/SlateportCity_House1/text.inc
diff --git a/data-de/text/maps/SlateportCity_House2.inc b/data-de/maps/SlateportCity_House2/text.inc
index 360e4c1a7..360e4c1a7 100644
--- a/data-de/text/maps/SlateportCity_House2.inc
+++ b/data-de/maps/SlateportCity_House2/text.inc
diff --git a/data-de/text/maps/SlateportCity_Mart.inc b/data-de/maps/SlateportCity_Mart/text.inc
index 8c09f7874..8c09f7874 100644
--- a/data-de/text/maps/SlateportCity_Mart.inc
+++ b/data-de/maps/SlateportCity_Mart/text.inc
diff --git a/data-de/text/maps/SlateportCity_OceanicMuseum_1F.inc b/data-de/maps/SlateportCity_OceanicMuseum_1F/text.inc
index 5087f3278..5087f3278 100644
--- a/data-de/text/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data-de/maps/SlateportCity_OceanicMuseum_1F/text.inc
diff --git a/data-de/text/maps/SlateportCity_OceanicMuseum_2F.inc b/data-de/maps/SlateportCity_OceanicMuseum_2F/text.inc
index 9f5c3eeab..9f5c3eeab 100644
--- a/data-de/text/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data-de/maps/SlateportCity_OceanicMuseum_2F/text.inc
diff --git a/data-de/text/maps/SlateportCity_PokemonCenter_1F.inc b/data-de/maps/SlateportCity_PokemonCenter_1F/text.inc
index 291a0212d..291a0212d 100644
--- a/data-de/text/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data-de/maps/SlateportCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/SlateportCity_PokemonFanClub.inc b/data-de/maps/SlateportCity_PokemonFanClub/text.inc
index e3dfa27c8..e3dfa27c8 100644
--- a/data-de/text/maps/SlateportCity_PokemonFanClub.inc
+++ b/data-de/maps/SlateportCity_PokemonFanClub/text.inc
diff --git a/data-de/text/maps/SlateportCity_SternsShipyard_1F.inc b/data-de/maps/SlateportCity_SternsShipyard_1F/text.inc
index d38e4b7ae..d38e4b7ae 100644
--- a/data-de/text/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data-de/maps/SlateportCity_SternsShipyard_1F/text.inc
diff --git a/data-de/text/maps/SlateportCity_SternsShipyard_2F.inc b/data-de/maps/SlateportCity_SternsShipyard_2F/text.inc
index d2a0dbd4c..d2a0dbd4c 100644
--- a/data-de/text/maps/SlateportCity_SternsShipyard_2F.inc
+++ b/data-de/maps/SlateportCity_SternsShipyard_2F/text.inc
diff --git a/data-de/text/maps/SootopolisCity.inc b/data-de/maps/SootopolisCity/text.inc
index d2c34f86e..d2c34f86e 100644
--- a/data-de/text/maps/SootopolisCity.inc
+++ b/data-de/maps/SootopolisCity/text.inc
diff --git a/data-de/text/maps/SootopolisCity_Gym_1F.inc b/data-de/maps/SootopolisCity_Gym_1F/text.inc
index 3216ea0c9..3216ea0c9 100644
--- a/data-de/text/maps/SootopolisCity_Gym_1F.inc
+++ b/data-de/maps/SootopolisCity_Gym_1F/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House1.inc b/data-de/maps/SootopolisCity_House1/text.inc
index b028594a8..b028594a8 100644
--- a/data-de/text/maps/SootopolisCity_House1.inc
+++ b/data-de/maps/SootopolisCity_House1/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House2.inc b/data-de/maps/SootopolisCity_House2/text.inc
index b19b34275..b19b34275 100644
--- a/data-de/text/maps/SootopolisCity_House2.inc
+++ b/data-de/maps/SootopolisCity_House2/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House3.inc b/data-de/maps/SootopolisCity_House3/text.inc
index 338881d2e..338881d2e 100644
--- a/data-de/text/maps/SootopolisCity_House3.inc
+++ b/data-de/maps/SootopolisCity_House3/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House4.inc b/data-de/maps/SootopolisCity_House4/text.inc
index d603808da..d603808da 100644
--- a/data-de/text/maps/SootopolisCity_House4.inc
+++ b/data-de/maps/SootopolisCity_House4/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House5.inc b/data-de/maps/SootopolisCity_House5/text.inc
index ca22756e3..ca22756e3 100644
--- a/data-de/text/maps/SootopolisCity_House5.inc
+++ b/data-de/maps/SootopolisCity_House5/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House6.inc b/data-de/maps/SootopolisCity_House6/text.inc
index ca1c6236b..ca1c6236b 100644
--- a/data-de/text/maps/SootopolisCity_House6.inc
+++ b/data-de/maps/SootopolisCity_House6/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House7.inc b/data-de/maps/SootopolisCity_House7/text.inc
index e58e57222..e58e57222 100644
--- a/data-de/text/maps/SootopolisCity_House7.inc
+++ b/data-de/maps/SootopolisCity_House7/text.inc
diff --git a/data-de/text/maps/SootopolisCity_House8.inc b/data-de/maps/SootopolisCity_House8/text.inc
index 0ea3dff9b..0ea3dff9b 100644
--- a/data-de/text/maps/SootopolisCity_House8.inc
+++ b/data-de/maps/SootopolisCity_House8/text.inc
diff --git a/data-de/text/maps/SootopolisCity_Mart.inc b/data-de/maps/SootopolisCity_Mart/text.inc
index 74db2bcd9..74db2bcd9 100644
--- a/data-de/text/maps/SootopolisCity_Mart.inc
+++ b/data-de/maps/SootopolisCity_Mart/text.inc
diff --git a/data-de/text/maps/SootopolisCity_PokemonCenter_1F.inc b/data-de/maps/SootopolisCity_PokemonCenter_1F/text.inc
index 034b51f4d..034b51f4d 100644
--- a/data-de/text/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data-de/maps/SootopolisCity_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/Underwater_SeafloorCavern.inc b/data-de/maps/Underwater_SeafloorCavern/text.inc
index c638a26d0..c638a26d0 100644
--- a/data-de/text/maps/Underwater_SeafloorCavern.inc
+++ b/data-de/maps/Underwater_SeafloorCavern/text.inc
diff --git a/data-de/text/maps/VerdanturfTown.inc b/data-de/maps/VerdanturfTown/text.inc
index a1a394ac7..a1a394ac7 100644
--- a/data-de/text/maps/VerdanturfTown.inc
+++ b/data-de/maps/VerdanturfTown/text.inc
diff --git a/data-de/text/maps/VerdanturfTown_ContestHall.inc b/data-de/maps/VerdanturfTown_ContestHall/text.inc
index 4fd58f853..4fd58f853 100644
--- a/data-de/text/maps/VerdanturfTown_ContestHall.inc
+++ b/data-de/maps/VerdanturfTown_ContestHall/text.inc
diff --git a/data-de/text/maps/VerdanturfTown_ContestLobby.inc b/data-de/maps/VerdanturfTown_ContestLobby/text.inc
index 9f8326613..9f8326613 100644
--- a/data-de/text/maps/VerdanturfTown_ContestLobby.inc
+++ b/data-de/maps/VerdanturfTown_ContestLobby/text.inc
diff --git a/data-de/text/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data-de/maps/VerdanturfTown_FriendshipRatersHouse/text.inc
index 39b1b5f4c..39b1b5f4c 100644
--- a/data-de/text/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data-de/maps/VerdanturfTown_FriendshipRatersHouse/text.inc
diff --git a/data-de/text/maps/VerdanturfTown_House.inc b/data-de/maps/VerdanturfTown_House/text.inc
index 0e6b1eaf1..0e6b1eaf1 100644
--- a/data-de/text/maps/VerdanturfTown_House.inc
+++ b/data-de/maps/VerdanturfTown_House/text.inc
diff --git a/data-de/text/maps/VerdanturfTown_Mart.inc b/data-de/maps/VerdanturfTown_Mart/text.inc
index 35f88e2f1..35f88e2f1 100644
--- a/data-de/text/maps/VerdanturfTown_Mart.inc
+++ b/data-de/maps/VerdanturfTown_Mart/text.inc
diff --git a/data-de/text/maps/VerdanturfTown_PokemonCenter_1F.inc b/data-de/maps/VerdanturfTown_PokemonCenter_1F/text.inc
index 33b100c01..33b100c01 100644
--- a/data-de/text/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data-de/maps/VerdanturfTown_PokemonCenter_1F/text.inc
diff --git a/data-de/text/maps/VerdanturfTown_WandasHouse.inc b/data-de/maps/VerdanturfTown_WandasHouse/text.inc
index 85028a3c4..85028a3c4 100644
--- a/data-de/text/maps/VerdanturfTown_WandasHouse.inc
+++ b/data-de/maps/VerdanturfTown_WandasHouse/text.inc
diff --git a/data-de/text/maps/VictoryRoad_1F.inc b/data-de/maps/VictoryRoad_1F/text.inc
index 770e75b3b..770e75b3b 100644
--- a/data-de/text/maps/VictoryRoad_1F.inc
+++ b/data-de/maps/VictoryRoad_1F/text.inc
diff --git a/data-de/text/maps/VictoryRoad_B1F.inc b/data-de/maps/VictoryRoad_B1F/text.inc
index 2261fceff..2261fceff 100644
--- a/data-de/text/maps/VictoryRoad_B1F.inc
+++ b/data-de/maps/VictoryRoad_B1F/text.inc
diff --git a/data-de/text/maps/VictoryRoad_B2F.inc b/data-de/maps/VictoryRoad_B2F/text.inc
index 2d3301d39..2d3301d39 100644
--- a/data-de/text/maps/VictoryRoad_B2F.inc
+++ b/data-de/maps/VictoryRoad_B2F/text.inc
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 7bf760480..89de51ca5 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -3191,7 +3191,7 @@ BattleScript_Pausex20:: @ 81D8EEF
 	return
 
 BattleScript_LevelUp:: @ 81D8EF3
-	fanfare BGM_FANFA1
+	fanfare MUS_FANFA1
 	printstring BATTLE_TEXT_GrewLevel 
 	setbyte sLVLBOX_STATE, 0
 	drawlvlupbox
@@ -3223,7 +3223,7 @@ BattleScript_ForgotAndLearnedNewMove: @ 81D8F46
 
 BattleScript_LearnedNewMove: @ 81D8F4F
 	buffermovetolearn
-	fanfare BGM_FANFA1
+	fanfare MUS_FANFA1
 	printstring BATTLE_TEXT_LearnedMove
 	waitmessage 64
 	updatechoicemoveonlvlup USER
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 68e287939..1f514321c 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -55,346 +55,346 @@ gStdScripts::
 	.4byte Std_ObtainDecoration
 gStdScripts_End::
 
-	.include "data/scripts/maps/PetalburgCity.inc"
-	.include "data/scripts/maps/SlateportCity.inc"
-	.include "data/scripts/maps/MauvilleCity.inc"
-	.include "data/scripts/maps/RustboroCity.inc"
-	.include "data/scripts/maps/FortreeCity.inc"
-	.include "data/scripts/maps/LilycoveCity.inc"
-	.include "data/scripts/maps/MossdeepCity.inc"
-	.include "data/scripts/maps/SootopolisCity.inc"
-	.include "data/scripts/maps/EverGrandeCity.inc"
-	.include "data/scripts/maps/LittlerootTown.inc"
-	.include "data/scripts/maps/OldaleTown.inc"
-	.include "data/scripts/maps/DewfordTown.inc"
-	.include "data/scripts/maps/LavaridgeTown.inc"
-	.include "data/scripts/maps/FallarborTown.inc"
-	.include "data/scripts/maps/VerdanturfTown.inc"
-	.include "data/scripts/maps/PacifidlogTown.inc"
-	.include "data/scripts/maps/Route101.inc"
-	.include "data/scripts/maps/Route102.inc"
-	.include "data/scripts/maps/Route103.inc"
-	.include "data/scripts/maps/Route104.inc"
-	.include "data/scripts/maps/Route105.inc"
-	.include "data/scripts/maps/Route106.inc"
-	.include "data/scripts/maps/Route107.inc"
-	.include "data/scripts/maps/Route108.inc"
-	.include "data/scripts/maps/Route109.inc"
-	.include "data/scripts/maps/Route110.inc"
-	.include "data/scripts/maps/Route111.inc"
-	.include "data/scripts/maps/Route112.inc"
-	.include "data/scripts/maps/Route113.inc"
-	.include "data/scripts/maps/Route114.inc"
-	.include "data/scripts/maps/Route115.inc"
-	.include "data/scripts/maps/Route116.inc"
-	.include "data/scripts/maps/Route117.inc"
-	.include "data/scripts/maps/Route118.inc"
-	.include "data/scripts/maps/Route119.inc"
-	.include "data/scripts/maps/Route120.inc"
-	.include "data/scripts/maps/Route121.inc"
-	.include "data/scripts/maps/Route122.inc"
-	.include "data/scripts/maps/Route123.inc"
-	.include "data/scripts/maps/Route124.inc"
-	.include "data/scripts/maps/Route125.inc"
-	.include "data/scripts/maps/Route126.inc"
-	.include "data/scripts/maps/Route127.inc"
-	.include "data/scripts/maps/Route128.inc"
-	.include "data/scripts/maps/Route129.inc"
-	.include "data/scripts/maps/Route130.inc"
-	.include "data/scripts/maps/Route131.inc"
-	.include "data/scripts/maps/Route132.inc"
-	.include "data/scripts/maps/Route133.inc"
-	.include "data/scripts/maps/Route134.inc"
-	.include "data/scripts/maps/Underwater1.inc"
-	.include "data/scripts/maps/Underwater2.inc"
-	.include "data/scripts/maps/Underwater3.inc"
-	.include "data/scripts/maps/Underwater4.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/scripts/maps/OldaleTown_House1.inc"
-	.include "data/scripts/maps/OldaleTown_House2.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/OldaleTown_Mart.inc"
-	.include "data/scripts/maps/DewfordTown_House1.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/DewfordTown_Gym.inc"
-	.include "data/scripts/maps/DewfordTown_Hall.inc"
-	.include "data/scripts/maps/DewfordTown_House2.inc"
-	.include "data/scripts/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_House.inc"
-	.include "data/scripts/maps/LavaridgeTown_Mart.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_Mart.inc"
-	.include "data/scripts/maps/FallarborTown_ContestLobby.inc"
-	.include "data/scripts/maps/FallarborTown_ContestHall.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_House1.inc"
-	.include "data/scripts/maps/FallarborTown_House2.inc"
-	.include "data/scripts/maps/VerdanturfTown_ContestLobby.inc"
-	.include "data/scripts/maps/VerdanturfTown_ContestHall.inc"
-	.include "data/scripts/maps/VerdanturfTown_Mart.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_House.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PacifidlogTown_House1.inc"
-	.include "data/scripts/maps/PacifidlogTown_House2.inc"
-	.include "data/scripts/maps/PacifidlogTown_House3.inc"
-	.include "data/scripts/maps/PacifidlogTown_House4.inc"
-	.include "data/scripts/maps/PacifidlogTown_House5.inc"
-	.include "data/scripts/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/scripts/maps/PetalburgCity_Gym.inc"
-	.include "data/scripts/maps/PetalburgCity_House1.inc"
-	.include "data/scripts/maps/PetalburgCity_House2.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PetalburgCity_Mart.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/scripts/maps/SlateportCity_ContestLobby.inc"
-	.include "data/scripts/maps/SlateportCity_ContestHall.inc"
-	.include "data/scripts/maps/SlateportCity_House1.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Harbor.inc"
-	.include "data/scripts/maps/SlateportCity_House2.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Mart.inc"
-	.include "data/scripts/maps/MauvilleCity_Gym.inc"
-	.include "data/scripts/maps/MauvilleCity_BikeShop.inc"
-	.include "data/scripts/maps/MauvilleCity_House1.inc"
-	.include "data/scripts/maps/MauvilleCity_GameCorner.inc"
-	.include "data/scripts/maps/MauvilleCity_House2.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MauvilleCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/scripts/maps/RustboroCity_Gym.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/scripts/maps/RustboroCity_House1.inc"
-	.include "data/scripts/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/scripts/maps/RustboroCity_House2.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/scripts/maps/RustboroCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House1.inc"
-	.include "data/scripts/maps/FortreeCity_Gym.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FortreeCity_Mart.inc"
-	.include "data/scripts/maps/FortreeCity_House2.inc"
-	.include "data/scripts/maps/FortreeCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House4.inc"
-	.include "data/scripts/maps/FortreeCity_House5.inc"
-	.include "data/scripts/maps/FortreeCity_DecorationShop.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestHall.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_UnusedMart.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/scripts/maps/LilycoveCity_Harbor.inc"
-	.include "data/scripts/maps/LilycoveCity_EmptyMap.inc"
-	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/scripts/maps/LilycoveCity_House1.inc"
-	.include "data/scripts/maps/LilycoveCity_House2.inc"
-	.include "data/scripts/maps/LilycoveCity_House3.inc"
-	.include "data/scripts/maps/LilycoveCity_House4.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/scripts/maps/MossdeepCity_Gym.inc"
-	.include "data/scripts/maps/MossdeepCity_House1.inc"
-	.include "data/scripts/maps/MossdeepCity_House2.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_Mart.inc"
-	.include "data/scripts/maps/MossdeepCity_House3.inc"
-	.include "data/scripts/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/scripts/maps/MossdeepCity_House4.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SootopolisCity_Mart.inc"
-	.include "data/scripts/maps/SootopolisCity_House1.inc"
-	.include "data/scripts/maps/SootopolisCity_House2.inc"
-	.include "data/scripts/maps/SootopolisCity_House3.inc"
-	.include "data/scripts/maps/SootopolisCity_House4.inc"
-	.include "data/scripts/maps/SootopolisCity_House5.inc"
-	.include "data/scripts/maps/SootopolisCity_House6.inc"
-	.include "data/scripts/maps/SootopolisCity_House7.inc"
-	.include "data/scripts/maps/SootopolisCity_House8.inc"
-	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor1.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor2.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor3.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor4.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor5.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague.inc"
-	.include "data/scripts/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/Route104_MrBrineysHouse.inc"
-	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/scripts/maps/Route111_OldLadysRestStop.inc"
-	.include "data/scripts/maps/Route112_CableCarStation.inc"
-	.include "data/scripts/maps/MtChimney_CableCarStation.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/scripts/maps/Route114_LanettesHouse.inc"
-	.include "data/scripts/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/scripts/maps/Route117_PokemonDayCare.inc"
-	.include "data/scripts/maps/Route121_SafariZoneEntrance.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_2R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_2R.inc"
-	.include "data/scripts/maps/RusturfTunnel.inc"
-	.include "data/scripts/maps/Underwater_SootopolisCity.inc"
-	.include "data/scripts/maps/DesertRuins.inc"
-	.include "data/scripts/maps/GraniteCave_1F.inc"
-	.include "data/scripts/maps/GraniteCave_B1F.inc"
-	.include "data/scripts/maps/GraniteCave_B2F.inc"
-	.include "data/scripts/maps/GraniteCave_StevensRoom.inc"
-	.include "data/scripts/maps/PetalburgWoods.inc"
-	.include "data/scripts/maps/MtChimney.inc"
-	.include "data/scripts/maps/JaggedPass.inc"
-	.include "data/scripts/maps/FieryPath.inc"
-	.include "data/scripts/maps/MtPyre_1F.inc"
-	.include "data/scripts/maps/MtPyre_2F.inc"
-	.include "data/scripts/maps/MtPyre_3F.inc"
-	.include "data/scripts/maps/MtPyre_4F.inc"
-	.include "data/scripts/maps/MtPyre_5F.inc"
-	.include "data/scripts/maps/MtPyre_6F.inc"
-	.include "data/scripts/maps/MtPyre_Exterior.inc"
-	.include "data/scripts/maps/MtPyre_Summit.inc"
-	.include "data/scripts/maps/AquaHideout_1F.inc"
-	.include "data/scripts/maps/AquaHideout_B1F.inc"
-	.include "data/scripts/maps/AquaHideout_B2F.inc"
-	.include "data/scripts/maps/Underwater_SeafloorCavern.inc"
-	.include "data/scripts/maps/SeafloorCavern_Entrance.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room1.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room2.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room3.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room4.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room5.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room6.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room7.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room8.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room9.inc"
-	.include "data/scripts/maps/CaveOfOrigin_Entrance.inc"
-	.include "data/scripts/maps/CaveOfOrigin_1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B2F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B3F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B4F.inc"
-	.include "data/scripts/maps/VictoryRoad_1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B2F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/scripts/maps/NewMauville_Entrance.inc"
-	.include "data/scripts/maps/NewMauville_Inside.inc"
-	.include "data/scripts/maps/AbandonedShip_Deck.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater1.inc"
-	.include "data/scripts/maps/AbandonedShip_Room_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater2.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/scripts/maps/IslandCave.inc"
-	.include "data/scripts/maps/AncientTomb.inc"
-	.include "data/scripts/maps/Underwater_Route134.inc"
-	.include "data/scripts/maps/Underwater_SealedChamber.inc"
-	.include "data/scripts/maps/SealedChamber_OuterRoom.inc"
-	.include "data/scripts/maps/SealedChamber_InnerRoom.inc"
-	.include "data/scripts/maps/ScorchedSlab.inc"
-	.include "data/scripts/maps/MagmaHideout_1F.inc"
-	.include "data/scripts/maps/MagmaHideout_B1F.inc"
-	.include "data/scripts/maps/MagmaHideout_B2F.inc"
-	.include "data/scripts/maps/SkyPillar_Entrance.inc"
-	.include "data/scripts/maps/SkyPillar_Outside.inc"
-	.include "data/scripts/maps/SkyPillar_1F.inc"
-	.include "data/scripts/maps/SkyPillar_2F.inc"
-	.include "data/scripts/maps/SkyPillar_3F.inc"
-	.include "data/scripts/maps/SkyPillar_4F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc"
-	.include "data/scripts/maps/SkyPillar_5F.inc"
-	.include "data/scripts/maps/SkyPillar_Top.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave1.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave2.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave3.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave4.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave1.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave2.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave3.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave4.inc"
-	.include "data/scripts/maps/SecretBase_RedCave1.inc"
-	.include "data/scripts/maps/SecretBase_RedCave2.inc"
-	.include "data/scripts/maps/SecretBase_RedCave3.inc"
-	.include "data/scripts/maps/SecretBase_RedCave4.inc"
-	.include "data/scripts/maps/SecretBase_Shrub1.inc"
-	.include "data/scripts/maps/SecretBase_Shrub2.inc"
-	.include "data/scripts/maps/SecretBase_Shrub3.inc"
-	.include "data/scripts/maps/SecretBase_Shrub4.inc"
-	.include "data/scripts/maps/SecretBase_Tree1.inc"
-	.include "data/scripts/maps/SecretBase_Tree2.inc"
-	.include "data/scripts/maps/SecretBase_Tree3.inc"
-	.include "data/scripts/maps/SecretBase_Tree4.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave1.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave2.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave3.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave4.inc"
+	.include "data/maps/PetalburgCity/scripts.inc"
+	.include "data/maps/SlateportCity/scripts.inc"
+	.include "data/maps/MauvilleCity/scripts.inc"
+	.include "data/maps/RustboroCity/scripts.inc"
+	.include "data/maps/FortreeCity/scripts.inc"
+	.include "data/maps/LilycoveCity/scripts.inc"
+	.include "data/maps/MossdeepCity/scripts.inc"
+	.include "data/maps/SootopolisCity/scripts.inc"
+	.include "data/maps/EverGrandeCity/scripts.inc"
+	.include "data/maps/LittlerootTown/scripts.inc"
+	.include "data/maps/OldaleTown/scripts.inc"
+	.include "data/maps/DewfordTown/scripts.inc"
+	.include "data/maps/LavaridgeTown/scripts.inc"
+	.include "data/maps/FallarborTown/scripts.inc"
+	.include "data/maps/VerdanturfTown/scripts.inc"
+	.include "data/maps/PacifidlogTown/scripts.inc"
+	.include "data/maps/Route101/scripts.inc"
+	.include "data/maps/Route102/scripts.inc"
+	.include "data/maps/Route103/scripts.inc"
+	.include "data/maps/Route104/scripts.inc"
+	.include "data/maps/Route105/scripts.inc"
+	.include "data/maps/Route106/scripts.inc"
+	.include "data/maps/Route107/scripts.inc"
+	.include "data/maps/Route108/scripts.inc"
+	.include "data/maps/Route109/scripts.inc"
+	.include "data/maps/Route110/scripts.inc"
+	.include "data/maps/Route111/scripts.inc"
+	.include "data/maps/Route112/scripts.inc"
+	.include "data/maps/Route113/scripts.inc"
+	.include "data/maps/Route114/scripts.inc"
+	.include "data/maps/Route115/scripts.inc"
+	.include "data/maps/Route116/scripts.inc"
+	.include "data/maps/Route117/scripts.inc"
+	.include "data/maps/Route118/scripts.inc"
+	.include "data/maps/Route119/scripts.inc"
+	.include "data/maps/Route120/scripts.inc"
+	.include "data/maps/Route121/scripts.inc"
+	.include "data/maps/Route122/scripts.inc"
+	.include "data/maps/Route123/scripts.inc"
+	.include "data/maps/Route124/scripts.inc"
+	.include "data/maps/Route125/scripts.inc"
+	.include "data/maps/Route126/scripts.inc"
+	.include "data/maps/Route127/scripts.inc"
+	.include "data/maps/Route128/scripts.inc"
+	.include "data/maps/Route129/scripts.inc"
+	.include "data/maps/Route130/scripts.inc"
+	.include "data/maps/Route131/scripts.inc"
+	.include "data/maps/Route132/scripts.inc"
+	.include "data/maps/Route133/scripts.inc"
+	.include "data/maps/Route134/scripts.inc"
+	.include "data/maps/Underwater1/scripts.inc"
+	.include "data/maps/Underwater2/scripts.inc"
+	.include "data/maps/Underwater3/scripts.inc"
+	.include "data/maps/Underwater4/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc"
+	.include "data/maps/OldaleTown_House1/scripts.inc"
+	.include "data/maps/OldaleTown_House2/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/OldaleTown_Mart/scripts.inc"
+	.include "data/maps/DewfordTown_House1/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/DewfordTown_Gym/scripts.inc"
+	.include "data/maps/DewfordTown_Hall/scripts.inc"
+	.include "data/maps/DewfordTown_House2/scripts.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_House/scripts.inc"
+	.include "data/maps/LavaridgeTown_Mart/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_Mart/scripts.inc"
+	.include "data/maps/FallarborTown_ContestLobby/scripts.inc"
+	.include "data/maps/FallarborTown_ContestHall/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_House1/scripts.inc"
+	.include "data/maps/FallarborTown_House2/scripts.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/scripts.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/scripts.inc"
+	.include "data/maps/VerdanturfTown_Mart/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_House/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PacifidlogTown_House1/scripts.inc"
+	.include "data/maps/PacifidlogTown_House2/scripts.inc"
+	.include "data/maps/PacifidlogTown_House3/scripts.inc"
+	.include "data/maps/PacifidlogTown_House4/scripts.inc"
+	.include "data/maps/PacifidlogTown_House5/scripts.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/scripts.inc"
+	.include "data/maps/PetalburgCity_Gym/scripts.inc"
+	.include "data/maps/PetalburgCity_House1/scripts.inc"
+	.include "data/maps/PetalburgCity_House2/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PetalburgCity_Mart/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc"
+	.include "data/maps/SlateportCity_ContestLobby/scripts.inc"
+	.include "data/maps/SlateportCity_ContestHall/scripts.inc"
+	.include "data/maps/SlateportCity_House1/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Harbor/scripts.inc"
+	.include "data/maps/SlateportCity_House2/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Mart/scripts.inc"
+	.include "data/maps/MauvilleCity_Gym/scripts.inc"
+	.include "data/maps/MauvilleCity_BikeShop/scripts.inc"
+	.include "data/maps/MauvilleCity_House1/scripts.inc"
+	.include "data/maps/MauvilleCity_GameCorner/scripts.inc"
+	.include "data/maps/MauvilleCity_House2/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MauvilleCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc"
+	.include "data/maps/RustboroCity_Gym/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/scripts.inc"
+	.include "data/maps/RustboroCity_House1/scripts.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/scripts.inc"
+	.include "data/maps/RustboroCity_House2/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/scripts.inc"
+	.include "data/maps/RustboroCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House1/scripts.inc"
+	.include "data/maps/FortreeCity_Gym/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FortreeCity_Mart/scripts.inc"
+	.include "data/maps/FortreeCity_House2/scripts.inc"
+	.include "data/maps/FortreeCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House4/scripts.inc"
+	.include "data/maps/FortreeCity_House5/scripts.inc"
+	.include "data/maps/FortreeCity_DecorationShop/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestHall/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc"
+	.include "data/maps/LilycoveCity_Harbor/scripts.inc"
+	.include "data/maps/LilycoveCity_EmptyMap/scripts.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc"
+	.include "data/maps/LilycoveCity_House1/scripts.inc"
+	.include "data/maps/LilycoveCity_House2/scripts.inc"
+	.include "data/maps/LilycoveCity_House3/scripts.inc"
+	.include "data/maps/LilycoveCity_House4/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc"
+	.include "data/maps/MossdeepCity_Gym/scripts.inc"
+	.include "data/maps/MossdeepCity_House1/scripts.inc"
+	.include "data/maps/MossdeepCity_House2/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_Mart/scripts.inc"
+	.include "data/maps/MossdeepCity_House3/scripts.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/scripts.inc"
+	.include "data/maps/MossdeepCity_House4/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SootopolisCity_Mart/scripts.inc"
+	.include "data/maps/SootopolisCity_House1/scripts.inc"
+	.include "data/maps/SootopolisCity_House2/scripts.inc"
+	.include "data/maps/SootopolisCity_House3/scripts.inc"
+	.include "data/maps/SootopolisCity_House4/scripts.inc"
+	.include "data/maps/SootopolisCity_House5/scripts.inc"
+	.include "data/maps/SootopolisCity_House6/scripts.inc"
+	.include "data/maps/SootopolisCity_House7/scripts.inc"
+	.include "data/maps/SootopolisCity_House8/scripts.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor1/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor2/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor3/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor4/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor5/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/scripts.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/Route104_MrBrineysHouse/scripts.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc"
+	.include "data/maps/Route111_OldLadysRestStop/scripts.inc"
+	.include "data/maps/Route112_CableCarStation/scripts.inc"
+	.include "data/maps/MtChimney_CableCarStation/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/scripts.inc"
+	.include "data/maps/Route114_LanettesHouse/scripts.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/scripts.inc"
+	.include "data/maps/Route117_PokemonDayCare/scripts.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_2R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/scripts.inc"
+	.include "data/maps/RusturfTunnel/scripts.inc"
+	.include "data/maps/Underwater_SootopolisCity/scripts.inc"
+	.include "data/maps/DesertRuins/scripts.inc"
+	.include "data/maps/GraniteCave_1F/scripts.inc"
+	.include "data/maps/GraniteCave_B1F/scripts.inc"
+	.include "data/maps/GraniteCave_B2F/scripts.inc"
+	.include "data/maps/GraniteCave_StevensRoom/scripts.inc"
+	.include "data/maps/PetalburgWoods/scripts.inc"
+	.include "data/maps/MtChimney/scripts.inc"
+	.include "data/maps/JaggedPass/scripts.inc"
+	.include "data/maps/FieryPath/scripts.inc"
+	.include "data/maps/MtPyre_1F/scripts.inc"
+	.include "data/maps/MtPyre_2F/scripts.inc"
+	.include "data/maps/MtPyre_3F/scripts.inc"
+	.include "data/maps/MtPyre_4F/scripts.inc"
+	.include "data/maps/MtPyre_5F/scripts.inc"
+	.include "data/maps/MtPyre_6F/scripts.inc"
+	.include "data/maps/MtPyre_Exterior/scripts.inc"
+	.include "data/maps/MtPyre_Summit/scripts.inc"
+	.include "data/maps/AquaHideout_1F/scripts.inc"
+	.include "data/maps/AquaHideout_B1F/scripts.inc"
+	.include "data/maps/AquaHideout_B2F/scripts.inc"
+	.include "data/maps/Underwater_SeafloorCavern/scripts.inc"
+	.include "data/maps/SeafloorCavern_Entrance/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room1/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room2/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room3/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room4/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room5/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room6/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room7/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room8/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room9/scripts.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/scripts.inc"
+	.include "data/maps/CaveOfOrigin_1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B2F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B3F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B4F/scripts.inc"
+	.include "data/maps/VictoryRoad_1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B2F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc"
+	.include "data/maps/NewMauville_Entrance/scripts.inc"
+	.include "data/maps/NewMauville_Inside/scripts.inc"
+	.include "data/maps/AbandonedShip_Deck/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater1/scripts.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater2/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc"
+	.include "data/maps/IslandCave/scripts.inc"
+	.include "data/maps/AncientTomb/scripts.inc"
+	.include "data/maps/Underwater_Route134/scripts.inc"
+	.include "data/maps/Underwater_SealedChamber/scripts.inc"
+	.include "data/maps/SealedChamber_OuterRoom/scripts.inc"
+	.include "data/maps/SealedChamber_InnerRoom/scripts.inc"
+	.include "data/maps/ScorchedSlab/scripts.inc"
+	.include "data/maps/MagmaHideout_1F/scripts.inc"
+	.include "data/maps/MagmaHideout_B1F/scripts.inc"
+	.include "data/maps/MagmaHideout_B2F/scripts.inc"
+	.include "data/maps/SkyPillar_Entrance/scripts.inc"
+	.include "data/maps/SkyPillar_Outside/scripts.inc"
+	.include "data/maps/SkyPillar_1F/scripts.inc"
+	.include "data/maps/SkyPillar_2F/scripts.inc"
+	.include "data/maps/SkyPillar_3F/scripts.inc"
+	.include "data/maps/SkyPillar_4F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc"
+	.include "data/maps/SkyPillar_5F/scripts.inc"
+	.include "data/maps/SkyPillar_Top/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave1/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave2/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave3/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave4/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave1/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave2/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave3/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave4/scripts.inc"
+	.include "data/maps/SecretBase_RedCave1/scripts.inc"
+	.include "data/maps/SecretBase_RedCave2/scripts.inc"
+	.include "data/maps/SecretBase_RedCave3/scripts.inc"
+	.include "data/maps/SecretBase_RedCave4/scripts.inc"
+	.include "data/maps/SecretBase_Shrub1/scripts.inc"
+	.include "data/maps/SecretBase_Shrub2/scripts.inc"
+	.include "data/maps/SecretBase_Shrub3/scripts.inc"
+	.include "data/maps/SecretBase_Shrub4/scripts.inc"
+	.include "data/maps/SecretBase_Tree1/scripts.inc"
+	.include "data/maps/SecretBase_Tree2/scripts.inc"
+	.include "data/maps/SecretBase_Tree3/scripts.inc"
+	.include "data/maps/SecretBase_Tree4/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave1/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave2/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave3/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave4/scripts.inc"
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
@@ -563,305 +563,305 @@ EventScript_15F573:
 	msgbox UnknownString_81A3C31, 3
 	end
 
-	.include "data/scripts/maps/SingleBattleColosseum.inc"
-	.include "data/scripts/maps/TradeCenter.inc"
-	.include "data/scripts/maps/RecordCorner.inc"
-	.include "data/scripts/maps/DoubleBattleColosseum.inc"
-	.include "data/scripts/maps/LinkContestRoom1.inc"
-	.include "data/scripts/maps/LinkContestRoom2.inc"
-	.include "data/scripts/maps/LinkContestRoom3.inc"
-	.include "data/scripts/maps/LinkContestRoom4.inc"
-	.include "data/scripts/maps/LinkContestRoom5.inc"
-	.include "data/scripts/maps/LinkContestRoom6.inc"
-	.include "data/scripts/maps/UnknownMap_25_29.inc"
-	.include "data/scripts/maps/UnknownMap_25_30.inc"
-	.include "data/scripts/maps/UnknownMap_25_31.inc"
-	.include "data/scripts/maps/UnknownMap_25_32.inc"
-	.include "data/scripts/maps/UnknownMap_25_33.inc"
-	.include "data/scripts/maps/UnknownMap_25_34.inc"
-	.include "data/scripts/maps/InsideOfTruck.inc"
-	.include "data/scripts/maps/SSTidalCorridor.inc"
-	.include "data/scripts/maps/SSTidalLowerDeck.inc"
-	.include "data/scripts/maps/SSTidalRooms.inc"
-	.include "data/scripts/maps/SafariZone_Northwest.inc"
-	.include "data/scripts/maps/SafariZone_Northeast.inc"
-	.include "data/scripts/maps/SafariZone_Southwest.inc"
-	.include "data/scripts/maps/SafariZone_Southeast.inc"
-	.include "data/scripts/maps/BattleTower_Outside.inc"
-	.include "data/scripts/maps/BattleTower_Lobby.inc"
-	.include "data/scripts/maps/BattleTower_Elevator.inc"
-	.include "data/scripts/maps/BattleTower_Corridor.inc"
-	.include "data/scripts/maps/BattleTower_BattleRoom.inc"
-	.include "data/scripts/maps/SouthernIsland_Exterior.inc"
-	.include "data/scripts/maps/SouthernIsland_Interior.inc"
-	.include "data/scripts/maps/SafariZone_RestHouse.inc"
-	.include "data/scripts/maps/Route104_Prototype.inc"
-	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route109_SeashoreHouse.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEntrance.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEnd.inc"
-	.include "data/scripts/maps/Route110_TrickHouseCorridor.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/scripts/maps/Route113_GlassWorkshop.inc"
-	.include "data/scripts/maps/Route123_BerryMastersHouse.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/scripts/maps/Route119_House.inc"
-	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc"
-
-	.include "data/text/maps/PetalburgCity.inc"
-	.include "data/text/maps/SlateportCity.inc"
-	.include "data/text/maps/MauvilleCity.inc"
-	.include "data/text/maps/RustboroCity.inc"
-	.include "data/text/maps/FortreeCity.inc"
-	.include "data/text/maps/LilycoveCity.inc"
-	.include "data/text/maps/MossdeepCity.inc"
-	.include "data/text/maps/SootopolisCity.inc"
-	.include "data/text/maps/EverGrandeCity.inc"
-	.include "data/text/maps/LittlerootTown.inc"
-	.include "data/text/maps/OldaleTown.inc"
-	.include "data/text/maps/DewfordTown.inc"
-	.include "data/text/maps/LavaridgeTown.inc"
-	.include "data/text/maps/FallarborTown.inc"
-	.include "data/text/maps/VerdanturfTown.inc"
-	.include "data/text/maps/PacifidlogTown.inc"
-	.include "data/text/maps/Route101.inc"
-	.include "data/text/maps/Route102.inc"
-	.include "data/text/maps/Route103.inc"
-	.include "data/text/maps/Route104.inc"
-	.include "data/text/maps/Route105.inc"
-	.include "data/text/maps/Route106.inc"
-	.include "data/text/maps/Route107.inc"
-	.include "data/text/maps/Route108.inc"
-	.include "data/text/maps/Route109.inc"
-	.include "data/text/maps/Route110.inc"
-	.include "data/text/maps/Route111.inc"
-	.include "data/text/maps/Route112.inc"
-	.include "data/text/maps/Route113.inc"
-	.include "data/text/maps/Route114.inc"
-	.include "data/text/maps/Route115.inc"
-	.include "data/text/maps/Route116.inc"
-	.include "data/text/maps/Route117.inc"
-	.include "data/text/maps/Route118.inc"
-	.include "data/text/maps/Route119.inc"
-	.include "data/text/maps/Route120.inc"
-	.include "data/text/maps/Route121.inc"
-	.include "data/text/maps/Route123.inc"
-	.include "data/text/maps/Route124.inc"
-	.include "data/text/maps/Route128.inc"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/text/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/text/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/text/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/text/maps/OldaleTown_House1.inc"
-	.include "data/text/maps/OldaleTown_House2.inc"
-	.include "data/text/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/OldaleTown_Mart.inc"
-	.include "data/text/maps/DewfordTown_House1.inc"
-	.include "data/text/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/DewfordTown_Gym.inc"
-	.include "data/text/maps/DewfordTown_Hall.inc"
-	.include "data/text/maps/DewfordTown_House2.inc"
-	.include "data/text/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/text/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/text/maps/LavaridgeTown_House.inc"
-	.include "data/text/maps/LavaridgeTown_Mart.inc"
-	.include "data/text/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/FallarborTown_Mart.inc"
-	.include "data/text/maps/FallarborTown_ContestLobby.inc"
-	.include "data/text/maps/FallarborTown_ContestHall.inc"
-	.include "data/text/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/FallarborTown_House1.inc"
-	.include "data/text/maps/FallarborTown_House2.inc"
-	.include "data/text/maps/VerdanturfTown_ContestLobby.inc"
-	.include "data/text/maps/VerdanturfTown_ContestHall.inc"
-	.include "data/text/maps/VerdanturfTown_Mart.inc"
-	.include "data/text/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/text/maps/VerdanturfTown_House.inc"
-	.include "data/text/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/PacifidlogTown_House1.inc"
-	.include "data/text/maps/PacifidlogTown_House2.inc"
-	.include "data/text/maps/PacifidlogTown_House3.inc"
-	.include "data/text/maps/PacifidlogTown_House4.inc"
-	.include "data/text/maps/PacifidlogTown_House5.inc"
-	.include "data/text/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/text/maps/PetalburgCity_Gym.inc"
-	.include "data/text/maps/PetalburgCity_House1.inc"
-	.include "data/text/maps/PetalburgCity_House2.inc"
-	.include "data/text/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/PetalburgCity_Mart.inc"
-	.include "data/text/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/text/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/text/maps/SlateportCity_ContestLobby.inc"
-	.include "data/text/maps/SlateportCity_ContestHall.inc"
-	.include "data/text/maps/SlateportCity_House1.inc"
-	.include "data/text/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/text/maps/SlateportCity_Harbor.inc"
-	.include "data/text/maps/SlateportCity_House2.inc"
-	.include "data/text/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/SlateportCity_Mart.inc"
-	.include "data/text/maps/MauvilleCity_Gym.inc"
-	.include "data/text/maps/MauvilleCity_BikeShop.inc"
-	.include "data/text/maps/MauvilleCity_House1.inc"
-	.include "data/text/maps/MauvilleCity_GameCorner.inc"
-	.include "data/text/maps/MauvilleCity_House2.inc"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/text/maps/MauvilleCity_Mart.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/text/maps/RustboroCity_Gym.inc"
-	.include "data/text/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/text/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/RustboroCity_Mart.inc"
-	.include "data/text/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/text/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/text/maps/RustboroCity_House1.inc"
-	.include "data/text/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/text/maps/RustboroCity_House2.inc"
-	.include "data/text/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/text/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/text/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/text/maps/RustboroCity_House3.inc"
-	.include "data/text/maps/FortreeCity_House1.inc"
-	.include "data/text/maps/FortreeCity_Gym.inc"
-	.include "data/text/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/FortreeCity_Mart.inc"
-	.include "data/text/maps/FortreeCity_House2.inc"
-	.include "data/text/maps/FortreeCity_House3.inc"
-	.include "data/text/maps/FortreeCity_House4.inc"
-	.include "data/text/maps/FortreeCity_House5.inc"
-	.include "data/text/maps/FortreeCity_DecorationShop.inc"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/text/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/text/maps/LilycoveCity_ContestHall.inc"
-	.include "data/text/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/text/maps/LilycoveCity_Harbor.inc"
-	.include "data/text/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/text/maps/LilycoveCity_House1.inc"
-	.include "data/text/maps/LilycoveCity_House2.inc"
-	.include "data/text/maps/LilycoveCity_House3.inc"
-	.include "data/text/maps/LilycoveCity_House4.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/text/maps/MossdeepCity_Gym.inc"
-	.include "data/text/maps/MossdeepCity_House1.inc"
-	.include "data/text/maps/MossdeepCity_House2.inc"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/text/maps/MossdeepCity_Mart.inc"
-	.include "data/text/maps/MossdeepCity_House3.inc"
-	.include "data/text/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/text/maps/MossdeepCity_House4.inc"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/text/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/text/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/text/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/text/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/text/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/SootopolisCity_Mart.inc"
-	.include "data/text/maps/SootopolisCity_House1.inc"
-	.include "data/text/maps/SootopolisCity_House2.inc"
-	.include "data/text/maps/SootopolisCity_House3.inc"
-	.include "data/text/maps/SootopolisCity_House4.inc"
-	.include "data/text/maps/SootopolisCity_House5.inc"
-	.include "data/text/maps/SootopolisCity_House6.inc"
-	.include "data/text/maps/SootopolisCity_House7.inc"
-	.include "data/text/maps/SootopolisCity_House8.inc"
-	.include "data/text/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/text/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/text/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/text/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/text/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/text/maps/EverGrandeCity_PokemonLeague.inc"
-	.include "data/text/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/text/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/Route104_MrBrineysHouse.inc"
-	.include "data/text/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/text/maps/Route111_OldLadysRestStop.inc"
-	.include "data/text/maps/Route112_CableCarStation.inc"
-	.include "data/text/maps/MtChimney_CableCarStation.inc"
-	.include "data/text/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/text/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/text/maps/Route114_LanettesHouse.inc"
-	.include "data/text/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/text/maps/MeteorFalls_1F_1R.inc"
-	.include "data/text/maps/MeteorFalls_1F_2R.inc"
-	.include "data/text/maps/RusturfTunnel.inc"
-	.include "data/text/maps/GraniteCave_1F.inc"
-	.include "data/text/maps/GraniteCave_StevensRoom.inc"
-	.include "data/text/maps/PetalburgWoods.inc"
-	.include "data/text/maps/MtChimney.inc"
-	.include "data/text/maps/JaggedPass.inc"
-	.include "data/text/maps/MtPyre_1F.inc"
-	.include "data/text/maps/MtPyre_2F.inc"
-	.include "data/text/maps/MtPyre_3F.inc"
-	.include "data/text/maps/MtPyre_4F.inc"
-	.include "data/text/maps/MtPyre_5F.inc"
-	.include "data/text/maps/MtPyre_6F.inc"
-	.include "data/text/maps/AquaHideout_1F.inc"
-	.include "data/text/maps/AquaHideout_B1F.inc"
-	.include "data/text/maps/AquaHideout_B2F.inc"
-	.include "data/text/maps/Underwater_SeafloorCavern.inc"
-	.include "data/text/maps/SeafloorCavern_Room1.inc"
-	.include "data/text/maps/SeafloorCavern_Room3.inc"
-	.include "data/text/maps/SeafloorCavern_Room4.inc"
-	.include "data/text/maps/VictoryRoad_1F.inc"
-	.include "data/text/maps/VictoryRoad_B1F.inc"
-	.include "data/text/maps/VictoryRoad_B2F.inc"
-	.include "data/text/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/text/maps/NewMauville_Entrance.inc"
-	.include "data/text/maps/NewMauville_Inside.inc"
-	.include "data/text/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/text/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/text/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/text/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/text/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/text/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/text/maps/SecretBase_RedCave1.inc"
-	.include "data/text/maps/InsideOfTruck.inc"
-	.include "data/text/maps/SSTidalCorridor.inc"
-	.include "data/text/maps/SSTidalLowerDeck.inc"
-	.include "data/text/maps/SSTidalRooms.inc"
-	.include "data/text/maps/BattleTower_Outside.inc"
-	.include "data/text/maps/BattleTower_Lobby.inc"
-	.include "data/text/maps/BattleTower_BattleRoom.inc"
-	.include "data/text/maps/SouthernIsland_Exterior.inc"
-	.include "data/text/maps/SouthernIsland_Interior.inc"
-	.include "data/text/maps/Route104_Prototype.inc"
-	.include "data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/text/maps/Route109_SeashoreHouse.inc"
-	.include "data/text/maps/Route110_TrickHouseEntrance.inc"
+	.include "data/maps/SingleBattleColosseum/scripts.inc"
+	.include "data/maps/TradeCenter/scripts.inc"
+	.include "data/maps/RecordCorner/scripts.inc"
+	.include "data/maps/DoubleBattleColosseum/scripts.inc"
+	.include "data/maps/LinkContestRoom1/scripts.inc"
+	.include "data/maps/LinkContestRoom2/scripts.inc"
+	.include "data/maps/LinkContestRoom3/scripts.inc"
+	.include "data/maps/LinkContestRoom4/scripts.inc"
+	.include "data/maps/LinkContestRoom5/scripts.inc"
+	.include "data/maps/LinkContestRoom6/scripts.inc"
+	.include "data/maps/UnknownMap_25_29/scripts.inc"
+	.include "data/maps/UnknownMap_25_30/scripts.inc"
+	.include "data/maps/UnknownMap_25_31/scripts.inc"
+	.include "data/maps/UnknownMap_25_32/scripts.inc"
+	.include "data/maps/UnknownMap_25_33/scripts.inc"
+	.include "data/maps/UnknownMap_25_34/scripts.inc"
+	.include "data/maps/InsideOfTruck/scripts.inc"
+	.include "data/maps/SSTidalCorridor/scripts.inc"
+	.include "data/maps/SSTidalLowerDeck/scripts.inc"
+	.include "data/maps/SSTidalRooms/scripts.inc"
+	.include "data/maps/SafariZone_Northwest/scripts.inc"
+	.include "data/maps/SafariZone_Northeast/scripts.inc"
+	.include "data/maps/SafariZone_Southwest/scripts.inc"
+	.include "data/maps/SafariZone_Southeast/scripts.inc"
+	.include "data/maps/BattleTower_Outside/scripts.inc"
+	.include "data/maps/BattleTower_Lobby/scripts.inc"
+	.include "data/maps/BattleTower_Elevator/scripts.inc"
+	.include "data/maps/BattleTower_Corridor/scripts.inc"
+	.include "data/maps/BattleTower_BattleRoom/scripts.inc"
+	.include "data/maps/SouthernIsland_Exterior/scripts.inc"
+	.include "data/maps/SouthernIsland_Interior/scripts.inc"
+	.include "data/maps/SafariZone_RestHouse/scripts.inc"
+	.include "data/maps/Route104_Prototype/scripts.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route109_SeashoreHouse/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEnd/scripts.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc"
+	.include "data/maps/Route113_GlassWorkshop/scripts.inc"
+	.include "data/maps/Route123_BerryMastersHouse/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/scripts.inc"
+	.include "data/maps/Route119_House/scripts.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
+
+	.include "data/maps/PetalburgCity/text.inc"
+	.include "data/maps/SlateportCity/text.inc"
+	.include "data/maps/MauvilleCity/text.inc"
+	.include "data/maps/RustboroCity/text.inc"
+	.include "data/maps/FortreeCity/text.inc"
+	.include "data/maps/LilycoveCity/text.inc"
+	.include "data/maps/MossdeepCity/text.inc"
+	.include "data/maps/SootopolisCity/text.inc"
+	.include "data/maps/EverGrandeCity/text.inc"
+	.include "data/maps/LittlerootTown/text.inc"
+	.include "data/maps/OldaleTown/text.inc"
+	.include "data/maps/DewfordTown/text.inc"
+	.include "data/maps/LavaridgeTown/text.inc"
+	.include "data/maps/FallarborTown/text.inc"
+	.include "data/maps/VerdanturfTown/text.inc"
+	.include "data/maps/PacifidlogTown/text.inc"
+	.include "data/maps/Route101/text.inc"
+	.include "data/maps/Route102/text.inc"
+	.include "data/maps/Route103/text.inc"
+	.include "data/maps/Route104/text.inc"
+	.include "data/maps/Route105/text.inc"
+	.include "data/maps/Route106/text.inc"
+	.include "data/maps/Route107/text.inc"
+	.include "data/maps/Route108/text.inc"
+	.include "data/maps/Route109/text.inc"
+	.include "data/maps/Route110/text.inc"
+	.include "data/maps/Route111/text.inc"
+	.include "data/maps/Route112/text.inc"
+	.include "data/maps/Route113/text.inc"
+	.include "data/maps/Route114/text.inc"
+	.include "data/maps/Route115/text.inc"
+	.include "data/maps/Route116/text.inc"
+	.include "data/maps/Route117/text.inc"
+	.include "data/maps/Route118/text.inc"
+	.include "data/maps/Route119/text.inc"
+	.include "data/maps/Route120/text.inc"
+	.include "data/maps/Route121/text.inc"
+	.include "data/maps/Route123/text.inc"
+	.include "data/maps/Route124/text.inc"
+	.include "data/maps/Route128/text.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/text.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/text.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/text.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/text.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/text.inc"
+	.include "data/maps/OldaleTown_House1/text.inc"
+	.include "data/maps/OldaleTown_House2/text.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/OldaleTown_Mart/text.inc"
+	.include "data/maps/DewfordTown_House1/text.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/DewfordTown_Gym/text.inc"
+	.include "data/maps/DewfordTown_Hall/text.inc"
+	.include "data/maps/DewfordTown_House2/text.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/text.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/text.inc"
+	.include "data/maps/LavaridgeTown_House/text.inc"
+	.include "data/maps/LavaridgeTown_Mart/text.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/FallarborTown_Mart/text.inc"
+	.include "data/maps/FallarborTown_ContestLobby/text.inc"
+	.include "data/maps/FallarborTown_ContestHall/text.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/FallarborTown_House1/text.inc"
+	.include "data/maps/FallarborTown_House2/text.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/text.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/text.inc"
+	.include "data/maps/VerdanturfTown_Mart/text.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/text.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc"
+	.include "data/maps/VerdanturfTown_House/text.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/PacifidlogTown_House1/text.inc"
+	.include "data/maps/PacifidlogTown_House2/text.inc"
+	.include "data/maps/PacifidlogTown_House3/text.inc"
+	.include "data/maps/PacifidlogTown_House4/text.inc"
+	.include "data/maps/PacifidlogTown_House5/text.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/text.inc"
+	.include "data/maps/PetalburgCity_Gym/text.inc"
+	.include "data/maps/PetalburgCity_House1/text.inc"
+	.include "data/maps/PetalburgCity_House2/text.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/PetalburgCity_Mart/text.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/text.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/text.inc"
+	.include "data/maps/SlateportCity_ContestLobby/text.inc"
+	.include "data/maps/SlateportCity_ContestHall/text.inc"
+	.include "data/maps/SlateportCity_House1/text.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/text.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/text.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/text.inc"
+	.include "data/maps/SlateportCity_Harbor/text.inc"
+	.include "data/maps/SlateportCity_House2/text.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/SlateportCity_Mart/text.inc"
+	.include "data/maps/MauvilleCity_Gym/text.inc"
+	.include "data/maps/MauvilleCity_BikeShop/text.inc"
+	.include "data/maps/MauvilleCity_House1/text.inc"
+	.include "data/maps/MauvilleCity_GameCorner/text.inc"
+	.include "data/maps/MauvilleCity_House2/text.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/text.inc"
+	.include "data/maps/MauvilleCity_Mart/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/text.inc"
+	.include "data/maps/RustboroCity_Gym/text.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/text.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/RustboroCity_Mart/text.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/text.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/text.inc"
+	.include "data/maps/RustboroCity_House1/text.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/text.inc"
+	.include "data/maps/RustboroCity_House2/text.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/text.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/text.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/text.inc"
+	.include "data/maps/RustboroCity_House3/text.inc"
+	.include "data/maps/FortreeCity_House1/text.inc"
+	.include "data/maps/FortreeCity_Gym/text.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/FortreeCity_Mart/text.inc"
+	.include "data/maps/FortreeCity_House2/text.inc"
+	.include "data/maps/FortreeCity_House3/text.inc"
+	.include "data/maps/FortreeCity_House4/text.inc"
+	.include "data/maps/FortreeCity_House5/text.inc"
+	.include "data/maps/FortreeCity_DecorationShop/text.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/text.inc"
+	.include "data/maps/LilycoveCity_ContestHall/text.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc"
+	.include "data/maps/LilycoveCity_Harbor/text.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/text.inc"
+	.include "data/maps/LilycoveCity_House1/text.inc"
+	.include "data/maps/LilycoveCity_House2/text.inc"
+	.include "data/maps/LilycoveCity_House3/text.inc"
+	.include "data/maps/LilycoveCity_House4/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc"
+	.include "data/maps/MossdeepCity_Gym/text.inc"
+	.include "data/maps/MossdeepCity_House1/text.inc"
+	.include "data/maps/MossdeepCity_House2/text.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/text.inc"
+	.include "data/maps/MossdeepCity_Mart/text.inc"
+	.include "data/maps/MossdeepCity_House3/text.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/text.inc"
+	.include "data/maps/MossdeepCity_House4/text.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/text.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/text.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/text.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/text.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/text.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/text.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/SootopolisCity_Mart/text.inc"
+	.include "data/maps/SootopolisCity_House1/text.inc"
+	.include "data/maps/SootopolisCity_House2/text.inc"
+	.include "data/maps/SootopolisCity_House3/text.inc"
+	.include "data/maps/SootopolisCity_House4/text.inc"
+	.include "data/maps/SootopolisCity_House5/text.inc"
+	.include "data/maps/SootopolisCity_House6/text.inc"
+	.include "data/maps/SootopolisCity_House7/text.inc"
+	.include "data/maps/SootopolisCity_House8/text.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/text.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/text.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/text.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/text.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/text.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/text.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/text.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/Route104_MrBrineysHouse/text.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/text.inc"
+	.include "data/maps/Route111_OldLadysRestStop/text.inc"
+	.include "data/maps/Route112_CableCarStation/text.inc"
+	.include "data/maps/MtChimney_CableCarStation/text.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/text.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/text.inc"
+	.include "data/maps/Route114_LanettesHouse/text.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/text.inc"
+	.include "data/maps/MeteorFalls_1F_1R/text.inc"
+	.include "data/maps/MeteorFalls_1F_2R/text.inc"
+	.include "data/maps/RusturfTunnel/text.inc"
+	.include "data/maps/GraniteCave_1F/text.inc"
+	.include "data/maps/GraniteCave_StevensRoom/text.inc"
+	.include "data/maps/PetalburgWoods/text.inc"
+	.include "data/maps/MtChimney/text.inc"
+	.include "data/maps/JaggedPass/text.inc"
+	.include "data/maps/MtPyre_1F/text.inc"
+	.include "data/maps/MtPyre_2F/text.inc"
+	.include "data/maps/MtPyre_3F/text.inc"
+	.include "data/maps/MtPyre_4F/text.inc"
+	.include "data/maps/MtPyre_5F/text.inc"
+	.include "data/maps/MtPyre_6F/text.inc"
+	.include "data/maps/AquaHideout_1F/text.inc"
+	.include "data/maps/AquaHideout_B1F/text.inc"
+	.include "data/maps/AquaHideout_B2F/text.inc"
+	.include "data/maps/Underwater_SeafloorCavern/text.inc"
+	.include "data/maps/SeafloorCavern_Room1/text.inc"
+	.include "data/maps/SeafloorCavern_Room3/text.inc"
+	.include "data/maps/SeafloorCavern_Room4/text.inc"
+	.include "data/maps/VictoryRoad_1F/text.inc"
+	.include "data/maps/VictoryRoad_B1F/text.inc"
+	.include "data/maps/VictoryRoad_B2F/text.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/text.inc"
+	.include "data/maps/NewMauville_Entrance/text.inc"
+	.include "data/maps/NewMauville_Inside/text.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/text.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/text.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/text.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/text.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/text.inc"
+	.include "data/maps/SecretBase_RedCave1/text.inc"
+	.include "data/maps/InsideOfTruck/text.inc"
+	.include "data/maps/SSTidalCorridor/text.inc"
+	.include "data/maps/SSTidalLowerDeck/text.inc"
+	.include "data/maps/SSTidalRooms/text.inc"
+	.include "data/maps/BattleTower_Outside/text.inc"
+	.include "data/maps/BattleTower_Lobby/text.inc"
+	.include "data/maps/BattleTower_BattleRoom/text.inc"
+	.include "data/maps/SouthernIsland_Exterior/text.inc"
+	.include "data/maps/SouthernIsland_Interior/text.inc"
+	.include "data/maps/Route104_Prototype/text.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc"
+	.include "data/maps/Route109_SeashoreHouse/text.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/text.inc"
 
 Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8
 	.string "{PLAYER} found a scroll.$"
@@ -878,23 +878,23 @@ UnknownString_819C21F: @ 819C21F
 	.string "...On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
 
-	.include "data/text/maps/Route110_TrickHouseEnd.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/text/maps/Route113_GlassWorkshop.inc"
-	.include "data/text/maps/Route123_BerryMastersHouse.inc"
-	.include "data/text/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/text/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/text/maps/Route119_House.inc"
-	.include "data/text/maps/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/Route110_TrickHouseEnd/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/text.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc"
+	.include "data/maps/Route113_GlassWorkshop/text.inc"
+	.include "data/maps/Route123_BerryMastersHouse/text.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/text.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/text.inc"
+	.include "data/maps/Route119_House/text.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/text.inc"
 
 
 Std_2:
@@ -1555,11 +1555,11 @@ Std_ObtainItem_Fail: @ 819FECC
 	return
 
 PlayGetItemFanfare:
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	return
 
 PlayGetTMHMFanfare:
-	playfanfare BGM_ME_WAZA
+	playfanfare MUS_ME_WAZA
 	return
 
 Std_ObtainDecoration: @ 819FEDA
@@ -1577,7 +1577,7 @@ Std_ObtainDecoration_: @ 819FEE8
 	return
 
 Std_ObtainDecoration_Success: @ 819FF03
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	message Message_ObtainedDecoration
 	waitfanfare
 	waitmessage
@@ -2091,7 +2091,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
-	playfanfare BGM_ME_BACHI
+	playfanfare MUS_ME_BACHI
 	waitfanfare
 	return
 
@@ -2100,7 +2100,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
 Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
 SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 1
-	playfanfare BGM_ME_ASA
+	playfanfare MUS_ME_ASA
 	waitfanfare
 	special ScrSpecial_HealPlayerParty
 	fadescreen 0
@@ -2119,7 +2119,7 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7
 Route104_EventScript_1A02E7:: @ 81A02E7
 Route109_EventScript_1A02E7:: @ 81A02E7
 	setflag FLAG_SPECIAL_FLAG_1
-	playbgm BGM_M_BOAT, FALSE
+	playbgm MUS_M_BOAT, FALSE
 	return
 
 DewfordTown_EventScript_1A02EF:: @ 81A02EF
@@ -2533,7 +2533,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
 MtPyre_Summit_EventScript_1A067F:: @ 81A067F
 SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
 	bufferitemname 0, VAR_SPECIAL_4
-	playfanfare BGM_ME_WAZA
+	playfanfare MUS_ME_WAZA
 	message FallarborTown_House1_Text_1A1498
 	waitmessage
 	waitfanfare
diff --git a/data/layouts.inc b/data/layouts.inc
new file mode 100644
index 000000000..aec54aaab
--- /dev/null
+++ b/data/layouts.inc
@@ -0,0 +1,332 @@
+	.include "data/layouts/PetalburgCity/layout.inc"
+	.include "data/layouts/SlateportCity/layout.inc"
+	.include "data/layouts/MauvilleCity/layout.inc"
+	.include "data/layouts/RustboroCity/layout.inc"
+	.include "data/layouts/FortreeCity/layout.inc"
+	.include "data/layouts/LilycoveCity/layout.inc"
+	.include "data/layouts/MossdeepCity/layout.inc"
+	.include "data/layouts/SootopolisCity/layout.inc"
+	.include "data/layouts/EverGrandeCity/layout.inc"
+	.include "data/layouts/LittlerootTown/layout.inc"
+	.include "data/layouts/OldaleTown/layout.inc"
+	.include "data/layouts/DewfordTown/layout.inc"
+	.include "data/layouts/LavaridgeTown/layout.inc"
+	.include "data/layouts/FallarborTown/layout.inc"
+	.include "data/layouts/VerdanturfTown/layout.inc"
+	.include "data/layouts/PacifidlogTown/layout.inc"
+	.include "data/layouts/Route101/layout.inc"
+	.include "data/layouts/Route102/layout.inc"
+	.include "data/layouts/Route103/layout.inc"
+	.include "data/layouts/Route104/layout.inc"
+	.include "data/layouts/Route105/layout.inc"
+	.include "data/layouts/Route106/layout.inc"
+	.include "data/layouts/Route107/layout.inc"
+	.include "data/layouts/Route108/layout.inc"
+	.include "data/layouts/Route109/layout.inc"
+	.include "data/layouts/Route110/layout.inc"
+	.include "data/layouts/Route111/layout.inc"
+	.include "data/layouts/Route112/layout.inc"
+	.include "data/layouts/Route113/layout.inc"
+	.include "data/layouts/Route114/layout.inc"
+	.include "data/layouts/Route115/layout.inc"
+	.include "data/layouts/Route116/layout.inc"
+	.include "data/layouts/Route117/layout.inc"
+	.include "data/layouts/Route118/layout.inc"
+	.include "data/layouts/Route119/layout.inc"
+	.include "data/layouts/Route120/layout.inc"
+	.include "data/layouts/Route121/layout.inc"
+	.include "data/layouts/Route122/layout.inc"
+	.include "data/layouts/Route123/layout.inc"
+	.include "data/layouts/Route124/layout.inc"
+	.include "data/layouts/Route125/layout.inc"
+	.include "data/layouts/Route126/layout.inc"
+	.include "data/layouts/Route127/layout.inc"
+	.include "data/layouts/Route128/layout.inc"
+	.include "data/layouts/Route129/layout.inc"
+	.include "data/layouts/UnreferencedMap/layout.inc"
+	.include "data/layouts/Route131/layout.inc"
+	.include "data/layouts/Route132/layout.inc"
+	.include "data/layouts/Route133/layout.inc"
+	.include "data/layouts/Route134/layout.inc"
+	.include "data/layouts/Underwater2/layout.inc"
+	.include "data/layouts/Underwater3/layout.inc"
+	.include "data/layouts/Underwater4/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc"
+	.include "data/layouts/House1/layout.inc"
+	.include "data/layouts/House2/layout.inc"
+	.include "data/layouts/PokemonCenter_1F/layout.inc"
+	.include "data/layouts/PokemonCenter_2F/layout.inc"
+	.include "data/layouts/PokeMart/layout.inc"
+	.include "data/layouts/House3/layout.inc"
+	.include "data/layouts/DewfordTown_Gym/layout.inc"
+	.include "data/layouts/DewfordTown_Hall/layout.inc"
+	.include "data/layouts/House4/layout.inc"
+	.include "data/layouts/LavaridgeTown_HerbShop/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc"
+	.include "data/layouts/ContestLobby/layout.inc"
+	.include "data/layouts/ContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_House2/layout.inc"
+	.include "data/layouts/UnknownMap_082CF564/layout.inc"
+	.include "data/layouts/VerdanturfTown_WandasHouse/layout.inc"
+	.include "data/layouts/PacifidlogTown_House1/layout.inc"
+	.include "data/layouts/PacifidlogTown_House2/layout.inc"
+	.include "data/layouts/PetalburgCity_Gym/layout.inc"
+	.include "data/layouts/HouseWithBed/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc"
+	.include "data/layouts/UnknownMap_082D05D8/layout.inc"
+	.include "data/layouts/UnknownMap_082D05FC/layout.inc"
+	.include "data/layouts/SlateportCity_PokemonFanClub/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc"
+	.include "data/layouts/Harbor/layout.inc"
+	.include "data/layouts/MauvilleCity_Gym/layout.inc"
+	.include "data/layouts/MauvilleCity_BikeShop/layout.inc"
+	.include "data/layouts/MauvilleCity_GameCorner/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Gym/layout.inc"
+	.include "data/layouts/RustboroCity_PokemonSchool/layout.inc"
+	.include "data/layouts/RustboroCity_House/layout.inc"
+	.include "data/layouts/RustboroCity_House1/layout.inc"
+	.include "data/layouts/RustboroCity_CuttersHouse/layout.inc"
+	.include "data/layouts/FortreeCity_House1/layout.inc"
+	.include "data/layouts/FortreeCity_Gym/layout.inc"
+	.include "data/layouts/FortreeCity_House2/layout.inc"
+	.include "data/layouts/Route104_MrBrineysHouse/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestLobby/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc"
+	.include "data/layouts/LilycoveCity_EmptyMap/layout.inc"
+	.include "data/layouts/MossdeepCity_Gym/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_1F/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_B1F/layout.inc"
+	.include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ShortCorridor/layout.inc"
+	.include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc"
+	.include "data/layouts/CableCarStation/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsHouse/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsTunnel/layout.inc"
+	.include "data/layouts/Route114_LanettesHouse/layout.inc"
+	.include "data/layouts/Route116_TunnelersRestHouse/layout.inc"
+	.include "data/layouts/Route117_PokemonDayCare/layout.inc"
+	.include "data/layouts/Route121_SafariZoneEntrance/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_2R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_2R/layout.inc"
+	.include "data/layouts/RusturfTunnel/layout.inc"
+	.include "data/layouts/Underwater_SootopolisCity/layout.inc"
+	.include "data/layouts/DesertRuins/layout.inc"
+	.include "data/layouts/GraniteCave_1F/layout.inc"
+	.include "data/layouts/GraniteCave_B1F/layout.inc"
+	.include "data/layouts/GraniteCave_B2F/layout.inc"
+	.include "data/layouts/PetalburgWoods/layout.inc"
+	.include "data/layouts/MtChimney/layout.inc"
+	.include "data/layouts/MtPyre_1F/layout.inc"
+	.include "data/layouts/MtPyre_2F/layout.inc"
+	.include "data/layouts/MtPyre_3F/layout.inc"
+	.include "data/layouts/MtPyre_4F/layout.inc"
+	.include "data/layouts/MtPyre_5F/layout.inc"
+	.include "data/layouts/MtPyre_6F/layout.inc"
+	.include "data/layouts/AquaHideout_1F/layout.inc"
+	.include "data/layouts/AquaHideout_B1F/layout.inc"
+	.include "data/layouts/AquaHideout_B2F/layout.inc"
+	.include "data/layouts/Underwater_SeafloorCavern/layout.inc"
+	.include "data/layouts/SeafloorCavern_Entrance/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room1/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room2/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room3/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room4/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room5/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room6/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room7/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room8/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room9/layout.inc"
+	.include "data/layouts/CaveOfOrigin_Entrance/layout.inc"
+	.include "data/layouts/CaveOfOrigin_1F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B1F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B2F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B3F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B4F/layout.inc"
+	.include "data/layouts/VictoryRoad_1F/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc"
+	.include "data/layouts/UnknownMap_082E55C8/layout.inc"
+	.include "data/layouts/UnknownMap_082E55EC/layout.inc"
+	.include "data/layouts/UnknownMap_082E5610/layout.inc"
+	.include "data/layouts/UnknownMap_082E5634/layout.inc"
+	.include "data/layouts/UnknownMap_082E5658/layout.inc"
+	.include "data/layouts/UnknownMap_082E567C/layout.inc"
+	.include "data/layouts/UnknownMap_082E56A0/layout.inc"
+	.include "data/layouts/UnknownMap_082E56C4/layout.inc"
+	.include "data/layouts/UnknownMap_082E56E8/layout.inc"
+	.include "data/layouts/UnknownMap_082E570C/layout.inc"
+	.include "data/layouts/UnknownMap_082E5730/layout.inc"
+	.include "data/layouts/UnknownMap_082E5754/layout.inc"
+	.include "data/layouts/UnknownMap_082E5778/layout.inc"
+	.include "data/layouts/UnknownMap_082E579C/layout.inc"
+	.include "data/layouts/NewMauville_Entrance/layout.inc"
+	.include "data/layouts/NewMauville_Inside/layout.inc"
+	.include "data/layouts/AbandonedShip_Deck/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater1/layout.inc"
+	.include "data/layouts/AbandonedShip_Room_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave1/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave1/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave1/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave1/layout.inc"
+	.include "data/layouts/SecretBase_Tree1/layout.inc"
+	.include "data/layouts/SecretBase_Shrub1/layout.inc"
+	.include "data/layouts/SecretBase_RedCave2/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave2/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave2/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave2/layout.inc"
+	.include "data/layouts/SecretBase_Tree2/layout.inc"
+	.include "data/layouts/SecretBase_Shrub2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave3/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave3/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave3/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave3/layout.inc"
+	.include "data/layouts/SecretBase_Tree3/layout.inc"
+	.include "data/layouts/SecretBase_Shrub3/layout.inc"
+	.include "data/layouts/SecretBase_RedCave4/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave4/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave4/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave4/layout.inc"
+	.include "data/layouts/SecretBase_Tree4/layout.inc"
+	.include "data/layouts/SecretBase_Shrub4/layout.inc"
+	.include "data/layouts/SingleBattleColosseum/layout.inc"
+	.include "data/layouts/TradeCenter/layout.inc"
+	.include "data/layouts/RecordCorner/layout.inc"
+	.include "data/layouts/DoubleBattleColosseum/layout.inc"
+	.include "data/layouts/LinkContestRoom1/layout.inc"
+	.include "data/layouts/UnknownMap_25_29/layout.inc"
+	.include "data/layouts/UnknownMap_25_30/layout.inc"
+	.include "data/layouts/UnknownMap_25_31/layout.inc"
+	.include "data/layouts/UnknownMap_25_32/layout.inc"
+	.include "data/layouts/UnknownMap_25_33/layout.inc"
+	.include "data/layouts/UnknownMap_25_34/layout.inc"
+	.include "data/layouts/LinkContestRoom2/layout.inc"
+	.include "data/layouts/LinkContestRoom3/layout.inc"
+	.include "data/layouts/LinkContestRoom4/layout.inc"
+	.include "data/layouts/LinkContestRoom5/layout.inc"
+	.include "data/layouts/LinkContestRoom6/layout.inc"
+	.include "data/layouts/InsideOfTruck/layout.inc"
+	.include "data/layouts/SafariZone_Northwest/layout.inc"
+	.include "data/layouts/SafariZone_Northeast/layout.inc"
+	.include "data/layouts/SafariZone_Southwest/layout.inc"
+	.include "data/layouts/SafariZone_Southeast/layout.inc"
+	.include "data/layouts/UnknownMap_082EDF30/layout.inc"
+	.include "data/layouts/Route109_SeashoreHouse/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEntrance/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEnd/layout.inc"
+	.include "data/layouts/Route110_TrickHouseCorridor/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle1/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle2/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle3/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle4/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle5/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle6/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle7/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle8/layout.inc"
+	.include "data/layouts/FortreeCity_DecorationShop/layout.inc"
+	.include "data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc"
+	.include "data/layouts/Route130/layout.inc"
+	.include "data/layouts/BattleTower_Lobby/layout.inc"
+	.include "data/layouts/BattleTower_Outside/layout.inc"
+	.include "data/layouts/BattleTower_Elevator/layout.inc"
+	.include "data/layouts/BattleTower_Corridor/layout.inc"
+	.include "data/layouts/BattleTower_BattleRoom/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc"
+	.include "data/layouts/EverGrandeCity_PokemonLeague/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_1F/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc"
+	.include "data/layouts/Underwater1/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc"
+	.include "data/layouts/SSTidalCorridor/layout.inc"
+	.include "data/layouts/SSTidalLowerDeck/layout.inc"
+	.include "data/layouts/SSTidalRooms/layout.inc"
+	.include "data/layouts/IslandCave/layout.inc"
+	.include "data/layouts/AncientTomb/layout.inc"
+	.include "data/layouts/Underwater_Route134/layout.inc"
+	.include "data/layouts/Underwater_SealedChamber/layout.inc"
+	.include "data/layouts/SealedChamber_OuterRoom/layout.inc"
+	.include "data/layouts/VictoryRoad_B1F/layout.inc"
+	.include "data/layouts/VictoryRoad_B2F/layout.inc"
+	.include "data/layouts/Route104_Prototype/layout.inc"
+	.include "data/layouts/GraniteCave_StevensRoom/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc"
+	.include "data/layouts/SouthernIsland_Exterior/layout.inc"
+	.include "data/layouts/SouthernIsland_Interior/layout.inc"
+	.include "data/layouts/JaggedPass/layout.inc"
+	.include "data/layouts/FieryPath/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_3F/layout.inc"
+	.include "data/layouts/SootopolisCity_House8/layout.inc"
+	.include "data/layouts/EverGrandeCity_HallOfFame/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc"
+	.include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc"
+	.include "data/layouts/MtPyre_Exterior/layout.inc"
+	.include "data/layouts/MtPyre_Summit/layout.inc"
+	.include "data/layouts/SealedChamber_InnerRoom/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc"
+	.include "data/layouts/SootopolisCity_House1/layout.inc"
+	.include "data/layouts/SootopolisCity_House2/layout.inc"
+	.include "data/layouts/SootopolisCity_House3/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc"
+	.include "data/layouts/ScorchedSlab/layout.inc"
+	.include "data/layouts/UnknownMap_082FF894/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_2F/layout.inc"
+	.include "data/layouts/EverGrandeCity_Corridor4/layout.inc"
+	.include "data/layouts/MagmaHideout_1F/layout.inc"
+	.include "data/layouts/MagmaHideout_B1F/layout.inc"
+	.include "data/layouts/MagmaHideout_B2F/layout.inc"
+	.include "data/layouts/UnknownMap_08302970/layout.inc"
+	.include "data/layouts/SkyPillar_Entrance/layout.inc"
+	.include "data/layouts/SkyPillar_Outside/layout.inc"
+	.include "data/layouts/SkyPillar_1F/layout.inc"
+	.include "data/layouts/SkyPillar_2F/layout.inc"
+	.include "data/layouts/SkyPillar_3F/layout.inc"
+	.include "data/layouts/SkyPillar_4F/layout.inc"
+	.include "data/layouts/UnknownMap_083041B4/layout.inc"
+	.include "data/layouts/MossdeepCity_StevensHouse/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc"
+	.include "data/layouts/SafariZone_RestHouse/layout.inc"
+	.include "data/layouts/SkyPillar_5F/layout.inc"
+	.include "data/layouts/SkyPillar_Top/layout.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/border.bin
+++ b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
new file mode 100644
index 000000000..a274ac523
--- /dev/null
+++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
+
+AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
+
+	.align 2
+AbandonedShip_CaptainsOffice_Layout:: @ 82E7558
+	.4byte 0x9
+	.4byte 0x7
+	.4byte AbandonedShip_CaptainsOffice_MapBorder
+	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
index c9097fa63..c9097fa63 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/map.bin
+++ b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/layouts/AbandonedShip_Corridors_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Corridors_1F/border.bin
+++ b/data/layouts/AbandonedShip_Corridors_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
new file mode 100644
index 000000000..24d3eea96
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
+
+AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_1F_Layout:: @ 82E6B5C
+	.4byte 0x12
+	.4byte 0xc
+	.4byte AbandonedShip_Corridors_1F_MapBorder
+	.4byte AbandonedShip_Corridors_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/layouts/AbandonedShip_Corridors_1F/map.bin
index 5ef5ca949..5ef5ca949 100644
--- a/data/maps/AbandonedShip_Corridors_1F/map.bin
+++ b/data/layouts/AbandonedShip_Corridors_1F/map.bin
diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
new file mode 100644
index 000000000..5e8c95959
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
+
+AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_B1F_Layout:: @ 82E6F04
+	.4byte 0xd
+	.4byte 0xa
+	.4byte AbandonedShip_Corridors_B1F_MapBorder
+	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
index 24b1a7b61..24b1a7b61 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/layouts/AbandonedShip_Deck/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/AbandonedShip_Deck/border.bin
+++ b/data/layouts/AbandonedShip_Deck/border.bin
diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc
new file mode 100644
index 000000000..abd9a205a
--- /dev/null
+++ b/data/layouts/AbandonedShip_Deck/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Deck_MapBorder:: @ 82E65BC
+	.incbin "data/layouts/AbandonedShip_Deck/border.bin"
+
+AbandonedShip_Deck_MapBlockdata:: @ 82E65C4
+	.incbin "data/layouts/AbandonedShip_Deck/map.bin"
+
+	.align 2
+AbandonedShip_Deck_Layout:: @ 82E698C
+	.4byte 0x17
+	.4byte 0x15
+	.4byte AbandonedShip_Deck_MapBorder
+	.4byte AbandonedShip_Deck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/layouts/AbandonedShip_Deck/map.bin
index 67cdde3d7..67cdde3d7 100644
--- a/data/maps/AbandonedShip_Deck/map.bin
+++ b/data/layouts/AbandonedShip_Deck/map.bin
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
new file mode 100644
index 000000000..afc4d6a17
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
+
+AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorCorridors_Layout:: @ 82F9D68
+	.4byte 0xd
+	.4byte 0xb
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
index a4637ccbe..a4637ccbe 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
new file mode 100644
index 000000000..cea6993b2
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
+
+AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorRooms_Layout:: @ 82FF328
+	.4byte 0x2c
+	.4byte 0xf
+	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
+	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
index b63eeabe6..b63eeabe6 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Room_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Room_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc
new file mode 100644
index 000000000..17341a15f
--- /dev/null
+++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
+	.incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
+
+AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4
+	.incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Room_B1F_Layout:: @ 82E7364
+	.4byte 0x9
+	.4byte 0x8
+	.4byte AbandonedShip_Room_B1F_MapBorder
+	.4byte AbandonedShip_Room_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/layouts/AbandonedShip_Room_B1F/map.bin
index cb8393eb2..cb8393eb2 100644
--- a/data/maps/AbandonedShip_Room_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Room_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
new file mode 100644
index 000000000..52c4a4f2e
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
+
+AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_1F_Layout:: @ 82E74B8
+	.4byte 0x9
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms2_1F_MapBorder
+	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
index c897ce8a0..c897ce8a0 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
new file mode 100644
index 000000000..b3c205318
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
+
+AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_B1F_Layout:: @ 82E7214
+	.4byte 0x12
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms2_B1F_MapBorder
+	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
index 7865bb69d..7865bb69d 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/layouts/AbandonedShip_Rooms_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms_1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
new file mode 100644
index 000000000..7563bfbba
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
+
+AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_1F_Layout:: @ 82E6DE0
+	.4byte 0x12
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms_1F_MapBorder
+	.4byte AbandonedShip_Rooms_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/layouts/AbandonedShip_Rooms_1F/map.bin
index 20529b3df..20529b3df 100644
--- a/data/maps/AbandonedShip_Rooms_1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms_1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
new file mode 100644
index 000000000..89bd595c9
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
+
+AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_B1F_Layout:: @ 82E70D4
+	.4byte 0x1b
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms_B1F_MapBorder
+	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
index b18509507..b18509507 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Underwater1/border.bin
+++ b/data/layouts/AbandonedShip_Underwater1/border.bin
diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc
new file mode 100644
index 000000000..d738f437d
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater1/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Underwater1_MapBorder:: @ 82E722C
+	.incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
+
+AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234
+	.incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
+
+	.align 2
+AbandonedShip_Underwater1_Layout:: @ 82E72B4
+	.4byte 0x8
+	.4byte 0x8
+	.4byte AbandonedShip_Underwater1_MapBorder
+	.4byte AbandonedShip_Underwater1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/layouts/AbandonedShip_Underwater1/map.bin
index 2c73cfe86..2c73cfe86 100644
--- a/data/maps/AbandonedShip_Underwater1/map.bin
+++ b/data/layouts/AbandonedShip_Underwater1/map.bin
diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Underwater2/border.bin
+++ b/data/layouts/AbandonedShip_Underwater2/border.bin
diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc
new file mode 100644
index 000000000..86dad6567
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater2/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Underwater2_MapBorder:: @ 82E7570
+	.incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
+
+AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578
+	.incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
+
+	.align 2
+AbandonedShip_Underwater2_Layout:: @ 82E76A0
+	.4byte 0x15
+	.4byte 0x7
+	.4byte AbandonedShip_Underwater2_MapBorder
+	.4byte AbandonedShip_Underwater2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/layouts/AbandonedShip_Underwater2/map.bin
index 9dbd5c71a..9dbd5c71a 100644
--- a/data/maps/AbandonedShip_Underwater2/map.bin
+++ b/data/layouts/AbandonedShip_Underwater2/map.bin
diff --git a/data/maps/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/AncientTomb/border.bin
+++ b/data/layouts/AncientTomb/border.bin
diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc
new file mode 100644
index 000000000..da28d0642
--- /dev/null
+++ b/data/layouts/AncientTomb/layout.inc
@@ -0,0 +1,14 @@
+AncientTomb_MapBorder:: @ 82F717C
+	.incbin "data/layouts/AncientTomb/border.bin"
+
+AncientTomb_MapBlockdata:: @ 82F7184
+	.incbin "data/layouts/AncientTomb/map.bin"
+
+	.align 2
+AncientTomb_Layout:: @ 82F75E8
+	.4byte 0x11
+	.4byte 0x21
+	.4byte AncientTomb_MapBorder
+	.4byte AncientTomb_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/AncientTomb/map.bin b/data/layouts/AncientTomb/map.bin
index bb87de307..bb87de307 100644
--- a/data/maps/AncientTomb/map.bin
+++ b/data/layouts/AncientTomb/map.bin
diff --git a/data/maps/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_1F/border.bin
+++ b/data/layouts/AquaHideout_1F/border.bin
diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc
new file mode 100644
index 000000000..74361e986
--- /dev/null
+++ b/data/layouts/AquaHideout_1F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_1F_MapBorder:: @ 82DBBD4
+	.incbin "data/layouts/AquaHideout_1F/border.bin"
+
+AquaHideout_1F_MapBlockdata:: @ 82DBBDC
+	.incbin "data/layouts/AquaHideout_1F/map.bin"
+
+	.align 2
+AquaHideout_1F_Layout:: @ 82DC26C
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte AquaHideout_1F_MapBorder
+	.4byte AquaHideout_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AquaHideout_1F/map.bin b/data/layouts/AquaHideout_1F/map.bin
index 2330fe015..2330fe015 100644
--- a/data/maps/AquaHideout_1F/map.bin
+++ b/data/layouts/AquaHideout_1F/map.bin
diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_B1F/border.bin
+++ b/data/layouts/AquaHideout_B1F/border.bin
diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc
new file mode 100644
index 000000000..451148de4
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_B1F_MapBorder:: @ 82DC284
+	.incbin "data/layouts/AquaHideout_B1F/border.bin"
+
+AquaHideout_B1F_MapBlockdata:: @ 82DC28C
+	.incbin "data/layouts/AquaHideout_B1F/map.bin"
+
+	.align 2
+AquaHideout_B1F_Layout:: @ 82DCC1C
+	.4byte 0x33
+	.4byte 0x18
+	.4byte AquaHideout_B1F_MapBorder
+	.4byte AquaHideout_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/layouts/AquaHideout_B1F/map.bin
index 5d13df58d..5d13df58d 100644
--- a/data/maps/AquaHideout_B1F/map.bin
+++ b/data/layouts/AquaHideout_B1F/map.bin
diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_B2F/border.bin
+++ b/data/layouts/AquaHideout_B2F/border.bin
diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc
new file mode 100644
index 000000000..860cc1790
--- /dev/null
+++ b/data/layouts/AquaHideout_B2F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_B2F_MapBorder:: @ 82DCC34
+	.incbin "data/layouts/AquaHideout_B2F/border.bin"
+
+AquaHideout_B2F_MapBlockdata:: @ 82DCC3C
+	.incbin "data/layouts/AquaHideout_B2F/map.bin"
+
+	.align 2
+AquaHideout_B2F_Layout:: @ 82DD29C
+	.4byte 0x22
+	.4byte 0x18
+	.4byte AquaHideout_B2F_MapBorder
+	.4byte AquaHideout_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/layouts/AquaHideout_B2F/map.bin
index 2e843a8e4..2e843a8e4 100644
--- a/data/maps/AquaHideout_B2F/map.bin
+++ b/data/layouts/AquaHideout_B2F/map.bin
diff --git a/data/maps/BattleTower_BattleRoom/border.bin b/data/layouts/BattleTower_BattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_BattleRoom/border.bin
+++ b/data/layouts/BattleTower_BattleRoom/border.bin
diff --git a/data/layouts/BattleTower_BattleRoom/layout.inc b/data/layouts/BattleTower_BattleRoom/layout.inc
new file mode 100644
index 000000000..7003c0bc3
--- /dev/null
+++ b/data/layouts/BattleTower_BattleRoom/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_BattleRoom_MapBorder:: @ 82F2694
+	.incbin "data/layouts/BattleTower_BattleRoom/border.bin"
+
+BattleTower_BattleRoom_MapBlockdata:: @ 82F269C
+	.incbin "data/layouts/BattleTower_BattleRoom/map.bin"
+
+	.align 2
+BattleTower_BattleRoom_Layout:: @ 82F2750
+	.4byte 0xa
+	.4byte 0x9
+	.4byte BattleTower_BattleRoom_MapBorder
+	.4byte BattleTower_BattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_BattleRoom/map.bin b/data/layouts/BattleTower_BattleRoom/map.bin
index 42d99b5a6..42d99b5a6 100644
--- a/data/maps/BattleTower_BattleRoom/map.bin
+++ b/data/layouts/BattleTower_BattleRoom/map.bin
diff --git a/data/maps/BattleTower_Corridor/border.bin b/data/layouts/BattleTower_Corridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_Corridor/border.bin
+++ b/data/layouts/BattleTower_Corridor/border.bin
diff --git a/data/layouts/BattleTower_Corridor/layout.inc b/data/layouts/BattleTower_Corridor/layout.inc
new file mode 100644
index 000000000..9932107ef
--- /dev/null
+++ b/data/layouts/BattleTower_Corridor/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Corridor_MapBorder:: @ 82F25C8
+	.incbin "data/layouts/BattleTower_Corridor/border.bin"
+
+BattleTower_Corridor_MapBlockdata:: @ 82F25D0
+	.incbin "data/layouts/BattleTower_Corridor/map.bin"
+
+	.align 2
+BattleTower_Corridor_Layout:: @ 82F267C
+	.4byte 0x11
+	.4byte 0x5
+	.4byte BattleTower_Corridor_MapBorder
+	.4byte BattleTower_Corridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_Corridor/map.bin b/data/layouts/BattleTower_Corridor/map.bin
index 0b0803f91..0b0803f91 100644
--- a/data/maps/BattleTower_Corridor/map.bin
+++ b/data/layouts/BattleTower_Corridor/map.bin
diff --git a/data/maps/BattleTower_Elevator/border.bin b/data/layouts/BattleTower_Elevator/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_Elevator/border.bin
+++ b/data/layouts/BattleTower_Elevator/border.bin
diff --git a/data/layouts/BattleTower_Elevator/layout.inc b/data/layouts/BattleTower_Elevator/layout.inc
new file mode 100644
index 000000000..6246ce767
--- /dev/null
+++ b/data/layouts/BattleTower_Elevator/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Elevator_MapBorder:: @ 82F2570
+	.incbin "data/layouts/BattleTower_Elevator/border.bin"
+
+BattleTower_Elevator_MapBlockdata:: @ 82F2578
+	.incbin "data/layouts/BattleTower_Elevator/map.bin"
+
+	.align 2
+BattleTower_Elevator_Layout:: @ 82F25B0
+	.4byte 0x4
+	.4byte 0x7
+	.4byte BattleTower_Elevator_MapBorder
+	.4byte BattleTower_Elevator_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_Elevator/map.bin b/data/layouts/BattleTower_Elevator/map.bin
index 8777c1471..8777c1471 100644
--- a/data/maps/BattleTower_Elevator/map.bin
+++ b/data/layouts/BattleTower_Elevator/map.bin
diff --git a/data/maps/BattleTower_Lobby/border.bin b/data/layouts/BattleTower_Lobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_Lobby/border.bin
+++ b/data/layouts/BattleTower_Lobby/border.bin
diff --git a/data/layouts/BattleTower_Lobby/layout.inc b/data/layouts/BattleTower_Lobby/layout.inc
new file mode 100644
index 000000000..b330b3c72
--- /dev/null
+++ b/data/layouts/BattleTower_Lobby/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Lobby_MapBorder:: @ 82F1D68
+	.incbin "data/layouts/BattleTower_Lobby/border.bin"
+
+BattleTower_Lobby_MapBlockdata:: @ 82F1D70
+	.incbin "data/layouts/BattleTower_Lobby/map.bin"
+
+	.align 2
+BattleTower_Lobby_Layout:: @ 82F1E6C
+	.4byte 0xe
+	.4byte 0x9
+	.4byte BattleTower_Lobby_MapBorder
+	.4byte BattleTower_Lobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_Lobby/map.bin b/data/layouts/BattleTower_Lobby/map.bin
index 8ff3182a6..8ff3182a6 100644
--- a/data/maps/BattleTower_Lobby/map.bin
+++ b/data/layouts/BattleTower_Lobby/map.bin
diff --git a/data/maps/BattleTower_Outside/border.bin b/data/layouts/BattleTower_Outside/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/BattleTower_Outside/border.bin
+++ b/data/layouts/BattleTower_Outside/border.bin
diff --git a/data/layouts/BattleTower_Outside/layout.inc b/data/layouts/BattleTower_Outside/layout.inc
new file mode 100644
index 000000000..f260dd98f
--- /dev/null
+++ b/data/layouts/BattleTower_Outside/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Outside_MapBorder:: @ 82F1E84
+	.incbin "data/layouts/BattleTower_Outside/border.bin"
+
+BattleTower_Outside_MapBlockdata:: @ 82F1E8C
+	.incbin "data/layouts/BattleTower_Outside/map.bin"
+
+	.align 2
+BattleTower_Outside_Layout:: @ 82F2558
+	.4byte 0x1d
+	.4byte 0x1e
+	.4byte BattleTower_Outside_MapBorder
+	.4byte BattleTower_Outside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/BattleTower_Outside/map.bin b/data/layouts/BattleTower_Outside/map.bin
index 6e9f6adb6..6e9f6adb6 100644
--- a/data/maps/BattleTower_Outside/map.bin
+++ b/data/layouts/BattleTower_Outside/map.bin
diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/layouts/CableCarStation/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_Hall/border.bin
+++ b/data/layouts/CableCarStation/border.bin
diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc
new file mode 100644
index 000000000..c35f3739e
--- /dev/null
+++ b/data/layouts/CableCarStation/layout.inc
@@ -0,0 +1,14 @@
+CableCarStation_MapBorder:: @ 82D4CCC
+	.incbin "data/layouts/CableCarStation/border.bin"
+
+CableCarStation_MapBlockdata:: @ 82D4CD4
+	.incbin "data/layouts/CableCarStation/map.bin"
+
+	.align 2
+CableCarStation_Layout:: @ 82D4E0C
+	.4byte 0xd
+	.4byte 0xc
+	.4byte CableCarStation_MapBorder
+	.4byte CableCarStation_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/layouts/CableCarStation/map.bin
index 93db9d5f0..93db9d5f0 100644
--- a/data/maps/Route112_CableCarStation/map.bin
+++ b/data/layouts/CableCarStation/map.bin
diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_1F/border.bin
+++ b/data/layouts/CaveOfOrigin_1F/border.bin
diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc
new file mode 100644
index 000000000..fd4e2ee77
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_1F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
+	.incbin "data/layouts/CaveOfOrigin_1F/border.bin"
+
+CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14
+	.incbin "data/layouts/CaveOfOrigin_1F/map.bin"
+
+	.align 2
+CaveOfOrigin_1F_Layout:: @ 82E0238
+	.4byte 0x17
+	.4byte 0x17
+	.4byte CaveOfOrigin_1F_MapBorder
+	.4byte CaveOfOrigin_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/layouts/CaveOfOrigin_1F/map.bin
index c3c5e7abf..c3c5e7abf 100644
--- a/data/maps/CaveOfOrigin_1F/map.bin
+++ b/data/layouts/CaveOfOrigin_1F/map.bin
diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_B1F/border.bin
+++ b/data/layouts/CaveOfOrigin_B1F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc
new file mode 100644
index 000000000..3d9dc9cec
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B1F_MapBorder:: @ 82E0250
+	.incbin "data/layouts/CaveOfOrigin_B1F/border.bin"
+
+CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258
+	.incbin "data/layouts/CaveOfOrigin_B1F/map.bin"
+
+	.align 2
+CaveOfOrigin_B1F_Layout:: @ 82E067C
+	.4byte 0x17
+	.4byte 0x17
+	.4byte CaveOfOrigin_B1F_MapBorder
+	.4byte CaveOfOrigin_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/layouts/CaveOfOrigin_B1F/map.bin
index 0ffbdaaa0..0ffbdaaa0 100644
--- a/data/maps/CaveOfOrigin_B1F/map.bin
+++ b/data/layouts/CaveOfOrigin_B1F/map.bin
diff --git a/data/maps/CaveOfOrigin_B2F/border.bin b/data/layouts/CaveOfOrigin_B2F/border.bin
index 4117717f2..4117717f2 100644
--- a/data/maps/CaveOfOrigin_B2F/border.bin
+++ b/data/layouts/CaveOfOrigin_B2F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B2F/layout.inc b/data/layouts/CaveOfOrigin_B2F/layout.inc
new file mode 100644
index 000000000..403f393b8
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B2F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B2F_MapBorder:: @ 82E0694
+	.incbin "data/layouts/CaveOfOrigin_B2F/border.bin"
+
+CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C
+	.incbin "data/layouts/CaveOfOrigin_B2F/map.bin"
+
+	.align 2
+CaveOfOrigin_B2F_Layout:: @ 82E0A10
+	.4byte 0x15
+	.4byte 0x15
+	.4byte CaveOfOrigin_B2F_MapBorder
+	.4byte CaveOfOrigin_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B2F/map.bin b/data/layouts/CaveOfOrigin_B2F/map.bin
index 4c1fd5ab8..4c1fd5ab8 100644
--- a/data/maps/CaveOfOrigin_B2F/map.bin
+++ b/data/layouts/CaveOfOrigin_B2F/map.bin
diff --git a/data/maps/CaveOfOrigin_B3F/border.bin b/data/layouts/CaveOfOrigin_B3F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_B3F/border.bin
+++ b/data/layouts/CaveOfOrigin_B3F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B3F/layout.inc b/data/layouts/CaveOfOrigin_B3F/layout.inc
new file mode 100644
index 000000000..797bc7569
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B3F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
+	.incbin "data/layouts/CaveOfOrigin_B3F/border.bin"
+
+CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30
+	.incbin "data/layouts/CaveOfOrigin_B3F/map.bin"
+
+	.align 2
+CaveOfOrigin_B3F_Layout:: @ 82E0D50
+	.4byte 0x13
+	.4byte 0x15
+	.4byte CaveOfOrigin_B3F_MapBorder
+	.4byte CaveOfOrigin_B3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B3F/map.bin b/data/layouts/CaveOfOrigin_B3F/map.bin
index ea574b224..ea574b224 100644
--- a/data/maps/CaveOfOrigin_B3F/map.bin
+++ b/data/layouts/CaveOfOrigin_B3F/map.bin
diff --git a/data/maps/CaveOfOrigin_B4F/border.bin b/data/layouts/CaveOfOrigin_B4F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_B4F/border.bin
+++ b/data/layouts/CaveOfOrigin_B4F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B4F/layout.inc b/data/layouts/CaveOfOrigin_B4F/layout.inc
new file mode 100644
index 000000000..be6bc0bf6
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B4F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
+	.incbin "data/layouts/CaveOfOrigin_B4F/border.bin"
+
+CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70
+	.incbin "data/layouts/CaveOfOrigin_B4F/map.bin"
+
+	.align 2
+CaveOfOrigin_B4F_Layout:: @ 82E1044
+	.4byte 0x13
+	.4byte 0x13
+	.4byte CaveOfOrigin_B4F_MapBorder
+	.4byte CaveOfOrigin_B4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B4F/map.bin b/data/layouts/CaveOfOrigin_B4F/map.bin
index efec94a9e..efec94a9e 100644
--- a/data/maps/CaveOfOrigin_B4F/map.bin
+++ b/data/layouts/CaveOfOrigin_B4F/map.bin
diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_Entrance/border.bin
+++ b/data/layouts/CaveOfOrigin_Entrance/border.bin
diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc
new file mode 100644
index 000000000..242a7b45a
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
+	.incbin "data/layouts/CaveOfOrigin_Entrance/border.bin"
+
+CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18
+	.incbin "data/layouts/CaveOfOrigin_Entrance/map.bin"
+
+	.align 2
+CaveOfOrigin_Entrance_Layout:: @ 82DFDF4
+	.4byte 0x13
+	.4byte 0x1a
+	.4byte CaveOfOrigin_Entrance_MapBorder
+	.4byte CaveOfOrigin_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/layouts/CaveOfOrigin_Entrance/map.bin
index 4bbffd109..4bbffd109 100644
--- a/data/maps/CaveOfOrigin_Entrance/map.bin
+++ b/data/layouts/CaveOfOrigin_Entrance/map.bin
diff --git a/data/maps/DewfordTown_House1/border.bin b/data/layouts/ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_House1/border.bin
+++ b/data/layouts/ContestHall/border.bin
diff --git a/data/layouts/ContestHall/layout.inc b/data/layouts/ContestHall/layout.inc
new file mode 100644
index 000000000..b108a3178
--- /dev/null
+++ b/data/layouts/ContestHall/layout.inc
@@ -0,0 +1,14 @@
+ContestHall_MapBorder:: @ 82CF1A4
+	.incbin "data/layouts/ContestHall/border.bin"
+
+ContestHall_MapBlockdata:: @ 82CF1AC
+	.incbin "data/layouts/ContestHall/map.bin"
+
+	.align 2
+ContestHall_Layout:: @ 82CF4A0
+	.4byte 0x15
+	.4byte 0x12
+	.4byte ContestHall_MapBorder
+	.4byte ContestHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/FallarborTown_ContestHall/map.bin b/data/layouts/ContestHall/map.bin
index d65e7c489..d65e7c489 100644
--- a/data/maps/FallarborTown_ContestHall/map.bin
+++ b/data/layouts/ContestHall/map.bin
diff --git a/data/maps/DewfordTown_House2/border.bin b/data/layouts/ContestLobby/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_House2/border.bin
+++ b/data/layouts/ContestLobby/border.bin
diff --git a/data/layouts/ContestLobby/layout.inc b/data/layouts/ContestLobby/layout.inc
new file mode 100644
index 000000000..975c86922
--- /dev/null
+++ b/data/layouts/ContestLobby/layout.inc
@@ -0,0 +1,14 @@
+ContestLobby_MapBorder:: @ 82CF0B0
+	.incbin "data/layouts/ContestLobby/border.bin"
+
+ContestLobby_MapBlockdata:: @ 82CF0B8
+	.incbin "data/layouts/ContestLobby/map.bin"
+
+	.align 2
+ContestLobby_Layout:: @ 82CF18C
+	.4byte 0xf
+	.4byte 0x7
+	.4byte ContestLobby_MapBorder
+	.4byte ContestLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/FallarborTown_ContestLobby/map.bin b/data/layouts/ContestLobby/map.bin
index 87407546a..87407546a 100644
--- a/data/maps/FallarborTown_ContestLobby/map.bin
+++ b/data/layouts/ContestLobby/map.bin
diff --git a/data/maps/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/DesertRuins/border.bin
+++ b/data/layouts/DesertRuins/border.bin
diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc
new file mode 100644
index 000000000..75de33542
--- /dev/null
+++ b/data/layouts/DesertRuins/layout.inc
@@ -0,0 +1,14 @@
+DesertRuins_MapBorder:: @ 82D7AEC
+	.incbin "data/layouts/DesertRuins/border.bin"
+
+DesertRuins_MapBlockdata:: @ 82D7AF4
+	.incbin "data/layouts/DesertRuins/map.bin"
+
+	.align 2
+DesertRuins_Layout:: @ 82D7F58
+	.4byte 0x11
+	.4byte 0x21
+	.4byte DesertRuins_MapBorder
+	.4byte DesertRuins_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/DesertRuins/map.bin b/data/layouts/DesertRuins/map.bin
index bb87de307..bb87de307 100644
--- a/data/maps/DesertRuins/map.bin
+++ b/data/layouts/DesertRuins/map.bin
diff --git a/data/maps/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin
index 281762f5b..281762f5b 100644
--- a/data/maps/DewfordTown/border.bin
+++ b/data/layouts/DewfordTown/border.bin
diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc
new file mode 100644
index 000000000..ddee6afbe
--- /dev/null
+++ b/data/layouts/DewfordTown/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_MapBorder:: @ 8291A2C
+	.incbin "data/layouts/DewfordTown/border.bin"
+
+DewfordTown_MapBlockdata:: @ 8291A34
+	.incbin "data/layouts/DewfordTown/map.bin"
+
+	.align 2
+DewfordTown_Layout:: @ 8291D54
+	.4byte 0x14
+	.4byte 0x14
+	.4byte DewfordTown_MapBorder
+	.4byte DewfordTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/DewfordTown/map.bin b/data/layouts/DewfordTown/map.bin
index e8a1154e8..e8a1154e8 100644
--- a/data/maps/DewfordTown/map.bin
+++ b/data/layouts/DewfordTown/map.bin
diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/layouts/DewfordTown_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/DewfordTown_Gym/border.bin
+++ b/data/layouts/DewfordTown_Gym/border.bin
diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc
new file mode 100644
index 000000000..517522216
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_Gym_MapBorder:: @ 82CE42C
+	.incbin "data/layouts/DewfordTown_Gym/border.bin"
+
+DewfordTown_Gym_MapBlockdata:: @ 82CE434
+	.incbin "data/layouts/DewfordTown_Gym/map.bin"
+
+	.align 2
+DewfordTown_Gym_Layout:: @ 82CE824
+	.4byte 0x12
+	.4byte 0x1c
+	.4byte DewfordTown_Gym_MapBorder
+	.4byte DewfordTown_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_DewfordGym
diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/layouts/DewfordTown_Gym/map.bin
index 19ea81674..19ea81674 100644
--- a/data/maps/DewfordTown_Gym/map.bin
+++ b/data/layouts/DewfordTown_Gym/map.bin
diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/layouts/DewfordTown_Hall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DoubleBattleColosseum/border.bin
+++ b/data/layouts/DewfordTown_Hall/border.bin
diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc
new file mode 100644
index 000000000..c1f232111
--- /dev/null
+++ b/data/layouts/DewfordTown_Hall/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_Hall_MapBorder:: @ 82CE83C
+	.incbin "data/layouts/DewfordTown_Hall/border.bin"
+
+DewfordTown_Hall_MapBlockdata:: @ 82CE844
+	.incbin "data/layouts/DewfordTown_Hall/map.bin"
+
+	.align 2
+DewfordTown_Hall_Layout:: @ 82CE978
+	.4byte 0x11
+	.4byte 0x9
+	.4byte DewfordTown_Hall_MapBorder
+	.4byte DewfordTown_Hall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/layouts/DewfordTown_Hall/map.bin
index 5fd13209d..5fd13209d 100644
--- a/data/maps/DewfordTown_Hall/map.bin
+++ b/data/layouts/DewfordTown_Hall/map.bin
diff --git a/data/maps/EverGrandeCity_PokemonLeague/border.bin b/data/layouts/DoubleBattleColosseum/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/border.bin
+++ b/data/layouts/DoubleBattleColosseum/border.bin
diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc
new file mode 100644
index 000000000..04dc2e303
--- /dev/null
+++ b/data/layouts/DoubleBattleColosseum/layout.inc
@@ -0,0 +1,14 @@
+DoubleBattleColosseum_MapBorder:: @ 82E9610
+	.incbin "data/layouts/DoubleBattleColosseum/border.bin"
+
+DoubleBattleColosseum_MapBlockdata:: @ 82E9618
+	.incbin "data/layouts/DoubleBattleColosseum/map.bin"
+
+	.align 2
+DoubleBattleColosseum_Layout:: @ 82E9714
+	.4byte 0xe
+	.4byte 0x9
+	.4byte DoubleBattleColosseum_MapBorder
+	.4byte DoubleBattleColosseum_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin
index 77606e818..77606e818 100644
--- a/data/maps/DoubleBattleColosseum/map.bin
+++ b/data/layouts/DoubleBattleColosseum/map.bin
diff --git a/data/maps/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/EverGrandeCity/border.bin
+++ b/data/layouts/EverGrandeCity/border.bin
diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc
new file mode 100644
index 000000000..f8465ad0f
--- /dev/null
+++ b/data/layouts/EverGrandeCity/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_MapBorder:: @ 828FA8C
+	.incbin "data/layouts/EverGrandeCity/border.bin"
+
+EverGrandeCity_MapBlockdata:: @ 828FA94
+	.incbin "data/layouts/EverGrandeCity/map.bin"
+
+	.align 2
+EverGrandeCity_Layout:: @ 8291394
+	.4byte 0x28
+	.4byte 0x50
+	.4byte EverGrandeCity_MapBorder
+	.4byte EverGrandeCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_EverGrande
diff --git a/data/maps/EverGrandeCity/map.bin b/data/layouts/EverGrandeCity/map.bin
index 33b271d5d..33b271d5d 100644
--- a/data/maps/EverGrandeCity/map.bin
+++ b/data/layouts/EverGrandeCity/map.bin
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/border.bin
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
new file mode 100644
index 000000000..befca0f66
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
+	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin"
+
+EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0
+	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin"
+
+	.align 2
+EverGrandeCity_ChampionsRoom_Layout:: @ 82D4A44
+	.4byte 0xd
+	.4byte 0xd
+	.4byte EverGrandeCity_ChampionsRoom_MapBorder
+	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
index a234307b5..a234307b5 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/map.bin
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
diff --git a/data/maps/EverGrandeCity_Corridor1/border.bin b/data/layouts/EverGrandeCity_Corridor4/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_Corridor1/border.bin
+++ b/data/layouts/EverGrandeCity_Corridor4/border.bin
diff --git a/data/layouts/EverGrandeCity_Corridor4/layout.inc b/data/layouts/EverGrandeCity_Corridor4/layout.inc
new file mode 100644
index 000000000..e21b1481d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Corridor4/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
+	.incbin "data/layouts/EverGrandeCity_Corridor4/border.bin"
+
+EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4
+	.incbin "data/layouts/EverGrandeCity_Corridor4/map.bin"
+
+	.align 2
+EverGrandeCity_Corridor4_Layout:: @ 82FFDA0
+	.4byte 0xb
+	.4byte 0x22
+	.4byte EverGrandeCity_Corridor4_MapBorder
+	.4byte EverGrandeCity_Corridor4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_Corridor4/map.bin b/data/layouts/EverGrandeCity_Corridor4/map.bin
index 580ae095a..580ae095a 100644
--- a/data/maps/EverGrandeCity_Corridor4/map.bin
+++ b/data/layouts/EverGrandeCity_Corridor4/map.bin
diff --git a/data/maps/EverGrandeCity_Corridor4/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_Corridor4/border.bin
+++ b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
new file mode 100644
index 000000000..aa7d4c7ee
--- /dev/null
+++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
+	.incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin"
+
+EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764
+	.incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin"
+
+	.align 2
+EverGrandeCity_DrakesRoom_Layout:: @ 82D48D0
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_DrakesRoom_MapBorder
+	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
index 3b5248d98..3b5248d98 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/map.bin
+++ b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/border.bin
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
new file mode 100644
index 000000000..9dbcba92e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
+	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin"
+
+EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8
+	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin"
+
+	.align 2
+EverGrandeCity_GlaciasRoom_Layout:: @ 82D4744
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_GlaciasRoom_MapBorder
+	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
index 2d7db7377..2d7db7377 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/border.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
new file mode 100644
index 000000000..fe6bfd983
--- /dev/null
+++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
+	.incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin"
+
+EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4
+	.incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin"
+
+	.align 2
+EverGrandeCity_HallOfFame_Layout:: @ 82FC5E4
+	.4byte 0xf
+	.4byte 0x11
+	.4byte EverGrandeCity_HallOfFame_MapBorder
+	.4byte EverGrandeCity_HallOfFame_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin
index 1df9e4804..1df9e4804 100644
--- a/data/maps/EverGrandeCity_HallOfFame/map.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin
diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_HallOfFame/border.bin
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
new file mode 100644
index 000000000..0757ef56c
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
+	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin"
+
+EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C
+	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin"
+
+	.align 2
+EverGrandeCity_PhoebesRoom_Layout:: @ 82D45B8
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_PhoebesRoom_MapBorder
+	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
index 2e75b706c..2e75b706c 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
diff --git a/data/maps/FallarborTown_ContestHall/border.bin b/data/layouts/EverGrandeCity_PokemonLeague/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FallarborTown_ContestHall/border.bin
+++ b/data/layouts/EverGrandeCity_PokemonLeague/border.bin
diff --git a/data/layouts/EverGrandeCity_PokemonLeague/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc
new file mode 100644
index 000000000..268f4df65
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
+	.incbin "data/layouts/EverGrandeCity_PokemonLeague/border.bin"
+
+EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8
+	.incbin "data/layouts/EverGrandeCity_PokemonLeague/map.bin"
+
+	.align 2
+EverGrandeCity_PokemonLeague_Layout:: @ 82F2AB0
+	.4byte 0x13
+	.4byte 0xc
+	.4byte EverGrandeCity_PokemonLeague_MapBorder
+	.4byte EverGrandeCity_PokemonLeague_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.bin b/data/layouts/EverGrandeCity_PokemonLeague/map.bin
index d2acdf2dd..d2acdf2dd 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/map.bin
+++ b/data/layouts/EverGrandeCity_PokemonLeague/map.bin
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_ShortCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/border.bin
+++ b/data/layouts/EverGrandeCity_ShortCorridor/border.bin
diff --git a/data/layouts/EverGrandeCity_ShortCorridor/layout.inc b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc
new file mode 100644
index 000000000..cd04f317b
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_ShortCorridor_MapBorder:: @ 82D4A5C
+	.incbin "data/layouts/EverGrandeCity_ShortCorridor/border.bin"
+
+EverGrandeCity_ShortCorridor_MapBlockdata:: @ 82D4A64
+	.incbin "data/layouts/EverGrandeCity_ShortCorridor/map.bin"
+
+	.align 2
+EverGrandeCity_ShortCorridor_Layout:: @ 82D4B84
+	.4byte 0xb
+	.4byte 0xd
+	.4byte EverGrandeCity_ShortCorridor_MapBorder
+	.4byte EverGrandeCity_ShortCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_Corridor1/map.bin b/data/layouts/EverGrandeCity_ShortCorridor/map.bin
index 75812b238..75812b238 100644
--- a/data/maps/EverGrandeCity_Corridor1/map.bin
+++ b/data/layouts/EverGrandeCity_ShortCorridor/map.bin
diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/border.bin
+++ b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
new file mode 100644
index 000000000..10905e89b
--- /dev/null
+++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
+	.incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin"
+
+EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0
+	.incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin"
+
+	.align 2
+EverGrandeCity_SidneysRoom_Layout:: @ 82D442C
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_SidneysRoom_MapBorder
+	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
index ebca00c5c..ebca00c5c 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/map.bin
+++ b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
diff --git a/data/maps/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin
index 23e2a92e5..23e2a92e5 100644
--- a/data/maps/FallarborTown/border.bin
+++ b/data/layouts/FallarborTown/border.bin
diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc
new file mode 100644
index 000000000..d8e51258c
--- /dev/null
+++ b/data/layouts/FallarborTown/layout.inc
@@ -0,0 +1,14 @@
+FallarborTown_MapBorder:: @ 82920AC
+	.incbin "data/layouts/FallarborTown/border.bin"
+
+FallarborTown_MapBlockdata:: @ 82920B4
+	.incbin "data/layouts/FallarborTown/map.bin"
+
+	.align 2
+FallarborTown_Layout:: @ 82923D4
+	.4byte 0x14
+	.4byte 0x14
+	.4byte FallarborTown_MapBorder
+	.4byte FallarborTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/FallarborTown/map.bin b/data/layouts/FallarborTown/map.bin
index 08f68b6ea..08f68b6ea 100644
--- a/data/maps/FallarborTown/map.bin
+++ b/data/layouts/FallarborTown/map.bin
diff --git a/data/maps/FieryPath/border.bin b/data/layouts/FieryPath/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/FieryPath/border.bin
+++ b/data/layouts/FieryPath/border.bin
diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc
new file mode 100644
index 000000000..5e5e77404
--- /dev/null
+++ b/data/layouts/FieryPath/layout.inc
@@ -0,0 +1,14 @@
+FieryPath_MapBorder:: @ 82FB574
+	.incbin "data/layouts/FieryPath/border.bin"
+
+FieryPath_MapBlockdata:: @ 82FB57C
+	.incbin "data/layouts/FieryPath/map.bin"
+
+	.align 2
+FieryPath_Layout:: @ 82FBFE0
+	.4byte 0x23
+	.4byte 0x26
+	.4byte FieryPath_MapBorder
+	.4byte FieryPath_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/FieryPath/map.bin b/data/layouts/FieryPath/map.bin
index 5928fb173..5928fb173 100644
--- a/data/maps/FieryPath/map.bin
+++ b/data/layouts/FieryPath/map.bin
diff --git a/data/maps/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin
index addb5d6ce..addb5d6ce 100644
--- a/data/maps/FortreeCity/border.bin
+++ b/data/layouts/FortreeCity/border.bin
diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc
new file mode 100644
index 000000000..1e5bfcbd3
--- /dev/null
+++ b/data/layouts/FortreeCity/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_MapBorder:: @ 828A5AC
+	.incbin "data/layouts/FortreeCity/border.bin"
+
+FortreeCity_MapBlockdata:: @ 828A5B4
+	.incbin "data/layouts/FortreeCity/map.bin"
+
+	.align 2
+FortreeCity_Layout:: @ 828ABF4
+	.4byte 0x28
+	.4byte 0x14
+	.4byte FortreeCity_MapBorder
+	.4byte FortreeCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
diff --git a/data/maps/FortreeCity/map.bin b/data/layouts/FortreeCity/map.bin
index a2aa40e98..a2aa40e98 100644
--- a/data/maps/FortreeCity/map.bin
+++ b/data/layouts/FortreeCity/map.bin
diff --git a/data/maps/FallarborTown_ContestLobby/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FallarborTown_ContestLobby/border.bin
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc
new file mode 100644
index 000000000..b6cc3eba2
--- /dev/null
+++ b/data/layouts/FortreeCity_DecorationShop/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
+	.incbin "data/layouts/FortreeCity_DecorationShop/border.bin"
+
+FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC
+	.incbin "data/layouts/FortreeCity_DecorationShop/map.bin"
+
+	.align 2
+FortreeCity_DecorationShop_Layout:: @ 82EFB4C
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_DecorationShop_MapBorder
+	.4byte FortreeCity_DecorationShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin
index 6ca8b4e61..6ca8b4e61 100644
--- a/data/maps/FortreeCity_DecorationShop/map.bin
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/FortreeCity_Gym/border.bin
+++ b/data/layouts/FortreeCity_Gym/border.bin
diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc
new file mode 100644
index 000000000..75c619802
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_Gym_MapBorder:: @ 82D1B54
+	.incbin "data/layouts/FortreeCity_Gym/border.bin"
+
+FortreeCity_Gym_MapBlockdata:: @ 82D1B5C
+	.incbin "data/layouts/FortreeCity_Gym/map.bin"
+
+	.align 2
+FortreeCity_Gym_Layout:: @ 82D1F44
+	.4byte 0x14
+	.4byte 0x19
+	.4byte FortreeCity_Gym_MapBorder
+	.4byte FortreeCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_FortreeGym
diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/layouts/FortreeCity_Gym/map.bin
index a8ee94ae1..a8ee94ae1 100644
--- a/data/maps/FortreeCity_Gym/map.bin
+++ b/data/layouts/FortreeCity_Gym/map.bin
diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_DecorationShop/border.bin
+++ b/data/layouts/FortreeCity_House1/border.bin
diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc
new file mode 100644
index 000000000..0c604c064
--- /dev/null
+++ b/data/layouts/FortreeCity_House1/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_House1_MapBorder:: @ 82D1AD4
+	.incbin "data/layouts/FortreeCity_House1/border.bin"
+
+FortreeCity_House1_MapBlockdata:: @ 82D1ADC
+	.incbin "data/layouts/FortreeCity_House1/map.bin"
+
+	.align 2
+FortreeCity_House1_Layout:: @ 82D1B3C
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_House1_MapBorder
+	.4byte FortreeCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin
index 5a3ac8cb6..5a3ac8cb6 100644
--- a/data/maps/FortreeCity_House1/map.bin
+++ b/data/layouts/FortreeCity_House1/map.bin
diff --git a/data/maps/FortreeCity_House1/border.bin b/data/layouts/FortreeCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_House1/border.bin
+++ b/data/layouts/FortreeCity_House2/border.bin
diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc
new file mode 100644
index 000000000..2ab8ee1c3
--- /dev/null
+++ b/data/layouts/FortreeCity_House2/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_House2_MapBorder:: @ 82D1F5C
+	.incbin "data/layouts/FortreeCity_House2/border.bin"
+
+FortreeCity_House2_MapBlockdata:: @ 82D1F64
+	.incbin "data/layouts/FortreeCity_House2/map.bin"
+
+	.align 2
+FortreeCity_House2_Layout:: @ 82D1FC4
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_House2_MapBorder
+	.4byte FortreeCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin
index 3fbcd6043..3fbcd6043 100644
--- a/data/maps/FortreeCity_House2/map.bin
+++ b/data/layouts/FortreeCity_House2/map.bin
diff --git a/data/maps/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_1F/border.bin
+++ b/data/layouts/GraniteCave_1F/border.bin
diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc
new file mode 100644
index 000000000..a41a08112
--- /dev/null
+++ b/data/layouts/GraniteCave_1F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_1F_MapBorder:: @ 82D7F70
+	.incbin "data/layouts/GraniteCave_1F/border.bin"
+
+GraniteCave_1F_MapBlockdata:: @ 82D7F78
+	.incbin "data/layouts/GraniteCave_1F/map.bin"
+
+	.align 2
+GraniteCave_1F_Layout:: @ 82D8464
+	.4byte 0x2a
+	.4byte 0xf
+	.4byte GraniteCave_1F_MapBorder
+	.4byte GraniteCave_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_1F/map.bin b/data/layouts/GraniteCave_1F/map.bin
index 58c7945ab..58c7945ab 100644
--- a/data/maps/GraniteCave_1F/map.bin
+++ b/data/layouts/GraniteCave_1F/map.bin
diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_B1F/border.bin
+++ b/data/layouts/GraniteCave_B1F/border.bin
diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc
new file mode 100644
index 000000000..fed45feaa
--- /dev/null
+++ b/data/layouts/GraniteCave_B1F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_B1F_MapBorder:: @ 82D847C
+	.incbin "data/layouts/GraniteCave_B1F/border.bin"
+
+GraniteCave_B1F_MapBlockdata:: @ 82D8484
+	.incbin "data/layouts/GraniteCave_B1F/map.bin"
+
+	.align 2
+GraniteCave_B1F_Layout:: @ 82D8B04
+	.4byte 0x20
+	.4byte 0x1a
+	.4byte GraniteCave_B1F_MapBorder
+	.4byte GraniteCave_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/layouts/GraniteCave_B1F/map.bin
index 27f98c6cf..27f98c6cf 100644
--- a/data/maps/GraniteCave_B1F/map.bin
+++ b/data/layouts/GraniteCave_B1F/map.bin
diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_B2F/border.bin
+++ b/data/layouts/GraniteCave_B2F/border.bin
diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc
new file mode 100644
index 000000000..3ec6961df
--- /dev/null
+++ b/data/layouts/GraniteCave_B2F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_B2F_MapBorder:: @ 82D8B1C
+	.incbin "data/layouts/GraniteCave_B2F/border.bin"
+
+GraniteCave_B2F_MapBlockdata:: @ 82D8B24
+	.incbin "data/layouts/GraniteCave_B2F/map.bin"
+
+	.align 2
+GraniteCave_B2F_Layout:: @ 82D91A4
+	.4byte 0x20
+	.4byte 0x1a
+	.4byte GraniteCave_B2F_MapBorder
+	.4byte GraniteCave_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/layouts/GraniteCave_B2F/map.bin
index bbf8dc7af..bbf8dc7af 100644
--- a/data/maps/GraniteCave_B2F/map.bin
+++ b/data/layouts/GraniteCave_B2F/map.bin
diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_StevensRoom/border.bin
+++ b/data/layouts/GraniteCave_StevensRoom/border.bin
diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc
new file mode 100644
index 000000000..fc036e27e
--- /dev/null
+++ b/data/layouts/GraniteCave_StevensRoom/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
+	.incbin "data/layouts/GraniteCave_StevensRoom/border.bin"
+
+GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84
+	.incbin "data/layouts/GraniteCave_StevensRoom/map.bin"
+
+	.align 2
+GraniteCave_StevensRoom_Layout:: @ 82F9C28
+	.4byte 0xf
+	.4byte 0xe
+	.4byte GraniteCave_StevensRoom_MapBorder
+	.4byte GraniteCave_StevensRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/layouts/GraniteCave_StevensRoom/map.bin
index 3dc6987c2..3dc6987c2 100644
--- a/data/maps/GraniteCave_StevensRoom/map.bin
+++ b/data/layouts/GraniteCave_StevensRoom/map.bin
diff --git a/data/maps/FortreeCity_House2/border.bin b/data/layouts/Harbor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_House2/border.bin
+++ b/data/layouts/Harbor/border.bin
diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc
new file mode 100644
index 000000000..11d740254
--- /dev/null
+++ b/data/layouts/Harbor/layout.inc
@@ -0,0 +1,14 @@
+Harbor_MapBorder:: @ 82D0A78
+	.incbin "data/layouts/Harbor/border.bin"
+
+Harbor_MapBlockdata:: @ 82D0A80
+	.incbin "data/layouts/Harbor/map.bin"
+
+	.align 2
+Harbor_Layout:: @ 82D0D50
+	.4byte 0x18
+	.4byte 0xf
+	.4byte Harbor_MapBorder
+	.4byte Harbor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/layouts/Harbor/map.bin
index c77c1edfb..c77c1edfb 100644
--- a/data/maps/SlateportCity_Harbor/map.bin
+++ b/data/layouts/Harbor/map.bin
diff --git a/data/maps/House1/border.bin b/data/layouts/House1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/House1/border.bin
+++ b/data/layouts/House1/border.bin
diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc
new file mode 100644
index 000000000..c92a5232f
--- /dev/null
+++ b/data/layouts/House1/layout.inc
@@ -0,0 +1,14 @@
+House1_MapBorder:: @ 82CDEC0
+	.incbin "data/layouts/House1/border.bin"
+
+House1_MapBlockdata:: @ 82CDEC8
+	.incbin "data/layouts/House1/map.bin"
+
+	.align 2
+House1_Layout:: @ 82CDF7C
+	.4byte 0xa
+	.4byte 0x9
+	.4byte House1_MapBorder
+	.4byte House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/House1/map.bin b/data/layouts/House1/map.bin
index ea185484d..ea185484d 100644
--- a/data/maps/House1/map.bin
+++ b/data/layouts/House1/map.bin
diff --git a/data/maps/House2/border.bin b/data/layouts/House2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/House2/border.bin
+++ b/data/layouts/House2/border.bin
diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc
new file mode 100644
index 000000000..fae098aa3
--- /dev/null
+++ b/data/layouts/House2/layout.inc
@@ -0,0 +1,14 @@
+House2_MapBorder:: @ 82CDF94
+	.incbin "data/layouts/House2/border.bin"
+
+House2_MapBlockdata:: @ 82CDF9C
+	.incbin "data/layouts/House2/map.bin"
+
+	.align 2
+House2_Layout:: @ 82CE04C
+	.4byte 0xb
+	.4byte 0x8
+	.4byte House2_MapBorder
+	.4byte House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/House2/map.bin b/data/layouts/House2/map.bin
index 0e9f07964..0e9f07964 100644
--- a/data/maps/House2/map.bin
+++ b/data/layouts/House2/map.bin
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/House3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin
+++ b/data/layouts/House3/border.bin
diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc
new file mode 100644
index 000000000..3664d8849
--- /dev/null
+++ b/data/layouts/House3/layout.inc
@@ -0,0 +1,14 @@
+House3_MapBorder:: @ 82CE36C
+	.incbin "data/layouts/House3/border.bin"
+
+House3_MapBlockdata:: @ 82CE374
+	.incbin "data/layouts/House3/map.bin"
+
+	.align 2
+House3_Layout:: @ 82CE414
+	.4byte 0xa
+	.4byte 0x8
+	.4byte House3_MapBorder
+	.4byte House3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/DewfordTown_House1/map.bin b/data/layouts/House3/map.bin
index 1f732ba3f..1f732ba3f 100644
--- a/data/maps/DewfordTown_House1/map.bin
+++ b/data/layouts/House3/map.bin
diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/layouts/House4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_ContestHall/border.bin
+++ b/data/layouts/House4/border.bin
diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc
new file mode 100644
index 000000000..35f609029
--- /dev/null
+++ b/data/layouts/House4/layout.inc
@@ -0,0 +1,14 @@
+House4_MapBorder:: @ 82CE990
+	.incbin "data/layouts/House4/border.bin"
+
+House4_MapBlockdata:: @ 82CE998
+	.incbin "data/layouts/House4/map.bin"
+
+	.align 2
+House4_Layout:: @ 82CEA4C
+	.4byte 0xa
+	.4byte 0x9
+	.4byte House4_MapBorder
+	.4byte House4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/DewfordTown_House2/map.bin b/data/layouts/House4/map.bin
index 6274e4418..6274e4418 100644
--- a/data/maps/DewfordTown_House2/map.bin
+++ b/data/layouts/House4/map.bin
diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/layouts/HouseWithBed/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_ContestLobby/border.bin
+++ b/data/layouts/HouseWithBed/border.bin
diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc
new file mode 100644
index 000000000..6d732d4f7
--- /dev/null
+++ b/data/layouts/HouseWithBed/layout.inc
@@ -0,0 +1,14 @@
+HouseWithBed_MapBorder:: @ 82D0054
+	.incbin "data/layouts/HouseWithBed/border.bin"
+
+HouseWithBed_MapBlockdata:: @ 82D005C
+	.incbin "data/layouts/HouseWithBed/map.bin"
+
+	.align 2
+HouseWithBed_Layout:: @ 82D00FC
+	.4byte 0xa
+	.4byte 0x8
+	.4byte HouseWithBed_MapBorder
+	.4byte HouseWithBed_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/layouts/HouseWithBed/map.bin
index b91b7153b..b91b7153b 100644
--- a/data/maps/PetalburgCity_House2/map.bin
+++ b/data/layouts/HouseWithBed/map.bin
diff --git a/data/maps/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin
index 8459c2996..8459c2996 100644
--- a/data/maps/InsideOfTruck/border.bin
+++ b/data/layouts/InsideOfTruck/border.bin
diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc
new file mode 100644
index 000000000..f32874b46
--- /dev/null
+++ b/data/layouts/InsideOfTruck/layout.inc
@@ -0,0 +1,14 @@
+InsideOfTruck_MapBorder:: @ 82EA08C
+	.incbin "data/layouts/InsideOfTruck/border.bin"
+
+InsideOfTruck_MapBlockdata:: @ 82EA094
+	.incbin "data/layouts/InsideOfTruck/map.bin"
+
+	.align 2
+InsideOfTruck_Layout:: @ 82EA0C8
+	.4byte 0x5
+	.4byte 0x5
+	.4byte InsideOfTruck_MapBorder
+	.4byte InsideOfTruck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideOfTruck
diff --git a/data/maps/InsideOfTruck/map.bin b/data/layouts/InsideOfTruck/map.bin
index 84b946be5..84b946be5 100644
--- a/data/maps/InsideOfTruck/map.bin
+++ b/data/layouts/InsideOfTruck/map.bin
diff --git a/data/maps/IslandCave/border.bin b/data/layouts/IslandCave/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/IslandCave/border.bin
+++ b/data/layouts/IslandCave/border.bin
diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc
new file mode 100644
index 000000000..095996bc5
--- /dev/null
+++ b/data/layouts/IslandCave/layout.inc
@@ -0,0 +1,14 @@
+IslandCave_MapBorder:: @ 82F6CF8
+	.incbin "data/layouts/IslandCave/border.bin"
+
+IslandCave_MapBlockdata:: @ 82F6D00
+	.incbin "data/layouts/IslandCave/map.bin"
+
+	.align 2
+IslandCave_Layout:: @ 82F7164
+	.4byte 0x11
+	.4byte 0x21
+	.4byte IslandCave_MapBorder
+	.4byte IslandCave_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/IslandCave/map.bin b/data/layouts/IslandCave/map.bin
index a7fa61b4d..a7fa61b4d 100644
--- a/data/maps/IslandCave/map.bin
+++ b/data/layouts/IslandCave/map.bin
diff --git a/data/maps/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/JaggedPass/border.bin
+++ b/data/layouts/JaggedPass/border.bin
diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc
new file mode 100644
index 000000000..8679ed58d
--- /dev/null
+++ b/data/layouts/JaggedPass/layout.inc
@@ -0,0 +1,14 @@
+JaggedPass_MapBorder:: @ 82FAA8C
+	.incbin "data/layouts/JaggedPass/border.bin"
+
+JaggedPass_MapBlockdata:: @ 82FAA94
+	.incbin "data/layouts/JaggedPass/map.bin"
+
+	.align 2
+JaggedPass_Layout:: @ 82FB55C
+	.4byte 0x1e
+	.4byte 0x2e
+	.4byte JaggedPass_MapBorder
+	.4byte JaggedPass_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/JaggedPass/map.bin b/data/layouts/JaggedPass/map.bin
index a87a5332e..a87a5332e 100644
--- a/data/maps/JaggedPass/map.bin
+++ b/data/layouts/JaggedPass/map.bin
diff --git a/data/maps/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/LavaridgeTown/border.bin
+++ b/data/layouts/LavaridgeTown/border.bin
diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc
new file mode 100644
index 000000000..c75599acc
--- /dev/null
+++ b/data/layouts/LavaridgeTown/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_MapBorder:: @ 8291D6C
+	.incbin "data/layouts/LavaridgeTown/border.bin"
+
+LavaridgeTown_MapBlockdata:: @ 8291D74
+	.incbin "data/layouts/LavaridgeTown/map.bin"
+
+	.align 2
+LavaridgeTown_Layout:: @ 8292094
+	.4byte 0x14
+	.4byte 0x14
+	.4byte LavaridgeTown_MapBorder
+	.4byte LavaridgeTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin
index 604ad5f3f..604ad5f3f 100644
--- a/data/maps/LavaridgeTown/map.bin
+++ b/data/layouts/LavaridgeTown/map.bin
diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_Gym_1F/border.bin
+++ b/data/layouts/LavaridgeTown_Gym_1F/border.bin
diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
new file mode 100644
index 000000000..4ccf34bae
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
+	.incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin"
+
+LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C
+	.incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin"
+
+	.align 2
+LavaridgeTown_Gym_1F_Layout:: @ 82CED4C
+	.4byte 0xb
+	.4byte 0x18
+	.4byte LavaridgeTown_Gym_1F_MapBorder
+	.4byte LavaridgeTown_Gym_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/layouts/LavaridgeTown_Gym_1F/map.bin
index 7f2b02f90..7f2b02f90 100644
--- a/data/maps/LavaridgeTown_Gym_1F/map.bin
+++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin
diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/border.bin
+++ b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
new file mode 100644
index 000000000..4439d7e16
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
+	.incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin"
+
+LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C
+	.incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin"
+
+	.align 2
+LavaridgeTown_Gym_B1F_Layout:: @ 82CEF7C
+	.4byte 0xb
+	.4byte 0x18
+	.4byte LavaridgeTown_Gym_B1F_MapBorder
+	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
index 035719ffe..035719ffe 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/map.bin
+++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_HerbShop/border.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc
new file mode 100644
index 000000000..e16d8d26e
--- /dev/null
+++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
+	.incbin "data/layouts/LavaridgeTown_HerbShop/border.bin"
+
+LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C
+	.incbin "data/layouts/LavaridgeTown_HerbShop/map.bin"
+
+	.align 2
+LavaridgeTown_HerbShop_Layout:: @ 82CEB1C
+	.4byte 0xb
+	.4byte 0x8
+	.4byte LavaridgeTown_HerbShop_MapBorder
+	.4byte LavaridgeTown_HerbShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin
index cc0294a80..cc0294a80 100644
--- a/data/maps/LavaridgeTown_HerbShop/map.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..878764cf4
--- /dev/null
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
+	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin"
+
+LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C
+	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin"
+
+	.align 2
+LavaridgeTown_PokemonCenter_1F_Layout:: @ 82CF098
+	.4byte 0xe
+	.4byte 0x9
+	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
+	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
index d841f9f1a..d841f9f1a 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
diff --git a/data/maps/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/LilycoveCity/border.bin
+++ b/data/layouts/LilycoveCity/border.bin
diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc
new file mode 100644
index 000000000..b9dd45070
--- /dev/null
+++ b/data/layouts/LilycoveCity/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_MapBorder:: @ 828AC0C
+	.incbin "data/layouts/LilycoveCity/border.bin"
+
+LilycoveCity_MapBlockdata:: @ 828AC14
+	.incbin "data/layouts/LilycoveCity/map.bin"
+
+	.align 2
+LilycoveCity_Layout:: @ 828C514
+	.4byte 0x50
+	.4byte 0x28
+	.4byte LilycoveCity_MapBorder
+	.4byte LilycoveCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/LilycoveCity/map.bin b/data/layouts/LilycoveCity/map.bin
index d17bd748d..d17bd748d 100644
--- a/data/maps/LilycoveCity/map.bin
+++ b/data/layouts/LilycoveCity/map.bin
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin
+++ b/data/layouts/LilycoveCity_ContestHall/border.bin
diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc
new file mode 100644
index 000000000..49b886534
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestHall/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
+	.incbin "data/layouts/LilycoveCity_ContestHall/border.bin"
+
+LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC
+	.incbin "data/layouts/LilycoveCity_ContestHall/map.bin"
+
+	.align 2
+LilycoveCity_ContestHall_Layout:: @ 82D3514
+	.4byte 0x33
+	.4byte 0x21
+	.4byte LilycoveCity_ContestHall_MapBorder
+	.4byte LilycoveCity_ContestHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/layouts/LilycoveCity_ContestHall/map.bin
index 06fdae4f7..06fdae4f7 100644
--- a/data/maps/LilycoveCity_ContestHall/map.bin
+++ b/data/layouts/LilycoveCity_ContestHall/map.bin
diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_House2/border.bin
+++ b/data/layouts/LilycoveCity_ContestLobby/border.bin
diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc
new file mode 100644
index 000000000..588aa758c
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
+	.incbin "data/layouts/LilycoveCity_ContestLobby/border.bin"
+
+LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4
+	.incbin "data/layouts/LilycoveCity_ContestLobby/map.bin"
+
+	.align 2
+LilycoveCity_ContestLobby_Layout:: @ 82D27CC
+	.4byte 0x17
+	.4byte 0xc
+	.4byte LilycoveCity_ContestLobby_MapBorder
+	.4byte LilycoveCity_ContestLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/layouts/LilycoveCity_ContestLobby/map.bin
index 3d8c96b04..3d8c96b04 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.bin
+++ b/data/layouts/LilycoveCity_ContestLobby/map.bin
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
new file mode 100644
index 000000000..6a995c0be
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin"
+
+LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin"
+
+	.align 2
+LilycoveCity_CoveLilyMotel_1F_Layout:: @ 82FC6DC
+	.4byte 0xc
+	.4byte 0x9
+	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
+	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
index 5242f8e57..5242f8e57 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
new file mode 100644
index 000000000..ba54855aa
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin"
+
+LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin"
+
+	.align 2
+LilycoveCity_CoveLilyMotel_2F_Layout:: @ 82FC7D4
+	.4byte 0xc
+	.4byte 0x9
+	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
+	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
index 4484b5b55..4484b5b55 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
new file mode 100644
index 000000000..8e6e35fdf
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin"
+
+LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStoreElevator_Layout:: @ 82F2F00
+	.4byte 0x4
+	.4byte 0x6
+	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
+	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
index 1b3bf23c0..1b3bf23c0 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
new file mode 100644
index 000000000..d72a2a96b
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin"
+
+LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStoreRooftop_Layout:: @ 82F0430
+	.4byte 0x12
+	.4byte 0xc
+	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
+	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
index e9125baf0..e9125baf0 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
new file mode 100644
index 000000000..146db41fb
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin"
+
+LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_1F_Layout:: @ 82EFD60
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
index 2d3d15360..2d3d15360 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
new file mode 100644
index 000000000..e1cd81700
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin"
+
+LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_2F_Layout:: @ 82EFEA0
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
index 82ca90b08..82ca90b08 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
new file mode 100644
index 000000000..c8f82faee
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin"
+
+LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_3F_Layout:: @ 82EFFE0
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
index c10b776f5..c10b776f5 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
new file mode 100644
index 000000000..fbd10dea0
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin"
+
+LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_4F_Layout:: @ 82F0120
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
index bc1a09e2c..bc1a09e2c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
new file mode 100644
index 000000000..877794bb7
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin"
+
+LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_5F_Layout:: @ 82F0260
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
index 80acc3900..80acc3900 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
diff --git a/data/maps/LilycoveCity_EmptyMap/border.bin b/data/layouts/LilycoveCity_EmptyMap/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/LilycoveCity_EmptyMap/border.bin
+++ b/data/layouts/LilycoveCity_EmptyMap/border.bin
diff --git a/data/layouts/LilycoveCity_EmptyMap/layout.inc b/data/layouts/LilycoveCity_EmptyMap/layout.inc
new file mode 100644
index 000000000..9006217c0
--- /dev/null
+++ b/data/layouts/LilycoveCity_EmptyMap/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
+	.incbin "data/layouts/LilycoveCity_EmptyMap/border.bin"
+
+LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4
+	.incbin "data/layouts/LilycoveCity_EmptyMap/map.bin"
+
+	.align 2
+LilycoveCity_EmptyMap_Layout:: @ 82D36A8
+	.4byte 0x1
+	.4byte 0x1
+	.4byte LilycoveCity_EmptyMap_MapBorder
+	.4byte LilycoveCity_EmptyMap_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/LilycoveCity_EmptyMap/map.bin b/data/layouts/LilycoveCity_EmptyMap/map.bin
index f70d7bba4..f70d7bba4 100644
--- a/data/maps/LilycoveCity_EmptyMap/map.bin
+++ b/data/layouts/LilycoveCity_EmptyMap/map.bin
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin
+++ b/data/layouts/LilycoveCity_House2/border.bin
diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc
new file mode 100644
index 000000000..a5f900854
--- /dev/null
+++ b/data/layouts/LilycoveCity_House2/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_House2_MapBorder:: @ 82CF4B8
+	.incbin "data/layouts/LilycoveCity_House2/border.bin"
+
+LilycoveCity_House2_MapBlockdata:: @ 82CF4C0
+	.incbin "data/layouts/LilycoveCity_House2/map.bin"
+
+	.align 2
+LilycoveCity_House2_Layout:: @ 82CF540
+	.4byte 0x8
+	.4byte 0x8
+	.4byte LilycoveCity_House2_MapBorder
+	.4byte LilycoveCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/layouts/LilycoveCity_House2/map.bin
index e381f20eb..e381f20eb 100644
--- a/data/maps/LilycoveCity_House2/map.bin
+++ b/data/layouts/LilycoveCity_House2/map.bin
diff --git a/data/maps/LinkContestRoom1/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom1/border.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
new file mode 100644
index 000000000..57b9802da
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin"
+
+LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin"
+
+	.align 2
+LilycoveCity_LilycoveMuseum_1F_Layout:: @ 82D2328
+	.4byte 0x15
+	.4byte 0xe
+	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
+	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
index 6e92a8b58..6e92a8b58 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
diff --git a/data/maps/LinkContestRoom2/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom2/border.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
new file mode 100644
index 000000000..4e426f5f5
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin"
+
+LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin"
+
+	.align 2
+LilycoveCity_LilycoveMuseum_2F_Layout:: @ 82D2584
+	.4byte 0x16
+	.4byte 0xd
+	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
+	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
index 76a918838..76a918838 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
diff --git a/data/maps/LinkContestRoom3/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom3/border.bin
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
new file mode 100644
index 000000000..4c93258ae
--- /dev/null
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
+	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin"
+
+LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534
+	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin"
+
+	.align 2
+LilycoveCity_PokemonTrainerFanClub_Layout:: @ 82D3684
+	.4byte 0xc
+	.4byte 0xe
+	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
+	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
index cddfe5d9d..cddfe5d9d 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
diff --git a/data/maps/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom4/border.bin
+++ b/data/layouts/LinkContestRoom1/border.bin
diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc
new file mode 100644
index 000000000..1f71a862d
--- /dev/null
+++ b/data/layouts/LinkContestRoom1/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom1_MapBorder:: @ 82E972C
+	.incbin "data/layouts/LinkContestRoom1/border.bin"
+
+LinkContestRoom1_MapBlockdata:: @ 82E9734
+	.incbin "data/layouts/LinkContestRoom1/map.bin"
+
+	.align 2
+LinkContestRoom1_Layout:: @ 82E9880
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom1_MapBorder
+	.4byte LinkContestRoom1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin
index a8853f6ae..a8853f6ae 100644
--- a/data/maps/LinkContestRoom1/map.bin
+++ b/data/layouts/LinkContestRoom1/map.bin
diff --git a/data/maps/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom5/border.bin
+++ b/data/layouts/LinkContestRoom2/border.bin
diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc
new file mode 100644
index 000000000..77a027169
--- /dev/null
+++ b/data/layouts/LinkContestRoom2/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom2_MapBorder:: @ 82E9970
+	.incbin "data/layouts/LinkContestRoom2/border.bin"
+
+LinkContestRoom2_MapBlockdata:: @ 82E9978
+	.incbin "data/layouts/LinkContestRoom2/map.bin"
+
+	.align 2
+LinkContestRoom2_Layout:: @ 82E9AC4
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom2_MapBorder
+	.4byte LinkContestRoom2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin
index 7cb63b40d..7cb63b40d 100644
--- a/data/maps/LinkContestRoom2/map.bin
+++ b/data/layouts/LinkContestRoom2/map.bin
diff --git a/data/maps/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom6/border.bin
+++ b/data/layouts/LinkContestRoom3/border.bin
diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc
new file mode 100644
index 000000000..250f1f851
--- /dev/null
+++ b/data/layouts/LinkContestRoom3/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom3_MapBorder:: @ 82E9ADC
+	.incbin "data/layouts/LinkContestRoom3/border.bin"
+
+LinkContestRoom3_MapBlockdata:: @ 82E9AE4
+	.incbin "data/layouts/LinkContestRoom3/map.bin"
+
+	.align 2
+LinkContestRoom3_Layout:: @ 82E9C30
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom3_MapBorder
+	.4byte LinkContestRoom3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin
index 59e9e9182..59e9e9182 100644
--- a/data/maps/LinkContestRoom3/map.bin
+++ b/data/layouts/LinkContestRoom3/map.bin
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LinkContestRoom4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin
+++ b/data/layouts/LinkContestRoom4/border.bin
diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc
new file mode 100644
index 000000000..f29c386a8
--- /dev/null
+++ b/data/layouts/LinkContestRoom4/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom4_MapBorder:: @ 82E9C48
+	.incbin "data/layouts/LinkContestRoom4/border.bin"
+
+LinkContestRoom4_MapBlockdata:: @ 82E9C50
+	.incbin "data/layouts/LinkContestRoom4/map.bin"
+
+	.align 2
+LinkContestRoom4_Layout:: @ 82E9D9C
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom4_MapBorder
+	.4byte LinkContestRoom4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin
index 4e2166c19..4e2166c19 100644
--- a/data/maps/LinkContestRoom4/map.bin
+++ b/data/layouts/LinkContestRoom4/map.bin
diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/layouts/LinkContestRoom5/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MagmaHideout_1F/border.bin
+++ b/data/layouts/LinkContestRoom5/border.bin
diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc
new file mode 100644
index 000000000..033bc94e4
--- /dev/null
+++ b/data/layouts/LinkContestRoom5/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom5_MapBorder:: @ 82E9DB4
+	.incbin "data/layouts/LinkContestRoom5/border.bin"
+
+LinkContestRoom5_MapBlockdata:: @ 82E9DBC
+	.incbin "data/layouts/LinkContestRoom5/map.bin"
+
+	.align 2
+LinkContestRoom5_Layout:: @ 82E9F08
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom5_MapBorder
+	.4byte LinkContestRoom5_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin
index ad068fe7c..ad068fe7c 100644
--- a/data/maps/LinkContestRoom5/map.bin
+++ b/data/layouts/LinkContestRoom5/map.bin
diff --git a/data/maps/MagmaHideout_B1F/border.bin b/data/layouts/LinkContestRoom6/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MagmaHideout_B1F/border.bin
+++ b/data/layouts/LinkContestRoom6/border.bin
diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc
new file mode 100644
index 000000000..8101c42ba
--- /dev/null
+++ b/data/layouts/LinkContestRoom6/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom6_MapBorder:: @ 82E9F20
+	.incbin "data/layouts/LinkContestRoom6/border.bin"
+
+LinkContestRoom6_MapBlockdata:: @ 82E9F28
+	.incbin "data/layouts/LinkContestRoom6/map.bin"
+
+	.align 2
+LinkContestRoom6_Layout:: @ 82EA074
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom6_MapBorder
+	.4byte LinkContestRoom6_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin
index 9fcec5a5e..9fcec5a5e 100644
--- a/data/maps/LinkContestRoom6/map.bin
+++ b/data/layouts/LinkContestRoom6/map.bin
diff --git a/data/maps/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/LittlerootTown/border.bin
+++ b/data/layouts/LittlerootTown/border.bin
diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc
new file mode 100644
index 000000000..2d29b6839
--- /dev/null
+++ b/data/layouts/LittlerootTown/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MapBorder:: @ 82913AC
+	.incbin "data/layouts/LittlerootTown/border.bin"
+
+LittlerootTown_MapBlockdata:: @ 82913B4
+	.incbin "data/layouts/LittlerootTown/map.bin"
+
+	.align 2
+LittlerootTown_Layout:: @ 82916D4
+	.4byte 0x14
+	.4byte 0x14
+	.4byte LittlerootTown_MapBorder
+	.4byte LittlerootTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin
index 9af76f90e..9af76f90e 100644
--- a/data/maps/LittlerootTown/map.bin
+++ b/data/layouts/LittlerootTown/map.bin
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
new file mode 100644
index 000000000..e2470e498
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin"
+
+LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin"
+
+	.align 2
+LittlerootTown_BrendansHouse_1F_Layout:: @ 82CDAEC
+	.4byte 0xb
+	.4byte 0x9
+	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
+	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
index 3ae8e69a6..3ae8e69a6 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
new file mode 100644
index 000000000..e848645e5
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin"
+
+LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin"
+
+	.align 2
+LittlerootTown_BrendansHouse_2F_Layout:: @ 82CDB9C
+	.4byte 0x9
+	.4byte 0x8
+	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
+	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
index 9de4bae2a..9de4bae2a 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
new file mode 100644
index 000000000..b65b9596c
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
+	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin"
+
+LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC
+	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin"
+
+	.align 2
+LittlerootTown_MaysHouse_1F_Layout:: @ 82CDC84
+	.4byte 0xb
+	.4byte 0x9
+	.4byte LittlerootTown_MaysHouse_1F_MapBorder
+	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
index 12b4f86c2..12b4f86c2 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
new file mode 100644
index 000000000..e732253a9
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
+	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin"
+
+LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4
+	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
+
+	.align 2
+LittlerootTown_MaysHouse_2F_Layout:: @ 82CDD34
+	.4byte 0x9
+	.4byte 0x8
+	.4byte LittlerootTown_MaysHouse_2F_MapBorder
+	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
index b51210332..b51210332 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
diff --git a/data/maps/MagmaHideout_B2F/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MagmaHideout_B2F/border.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
new file mode 100644
index 000000000..8dc767516
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
+	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin"
+
+LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54
+	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin"
+
+	.align 2
+LittlerootTown_ProfessorBirchsLab_Layout:: @ 82CDEA8
+	.4byte 0xd
+	.4byte 0xd
+	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
+	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
index 0b62afcdf..0b62afcdf 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/layouts/MagmaHideout_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_1F_1R/border.bin
+++ b/data/layouts/MagmaHideout_1F/border.bin
diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc
new file mode 100644
index 000000000..3aa438e2f
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_1F_MapBorder:: @ 82FFDB8
+	.incbin "data/layouts/MagmaHideout_1F/border.bin"
+
+MagmaHideout_1F_MapBlockdata:: @ 82FFDC0
+	.incbin "data/layouts/MagmaHideout_1F/map.bin"
+
+	.align 2
+MagmaHideout_1F_Layout:: @ 8300450
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte MagmaHideout_1F_MapBorder
+	.4byte MagmaHideout_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin
index 52c2d57eb..52c2d57eb 100644
--- a/data/maps/MagmaHideout_1F/map.bin
+++ b/data/layouts/MagmaHideout_1F/map.bin
diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/layouts/MagmaHideout_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_1F_2R/border.bin
+++ b/data/layouts/MagmaHideout_B1F/border.bin
diff --git a/data/layouts/MagmaHideout_B1F/layout.inc b/data/layouts/MagmaHideout_B1F/layout.inc
new file mode 100644
index 000000000..9bc8f8860
--- /dev/null
+++ b/data/layouts/MagmaHideout_B1F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_B1F_MapBorder:: @ 8300468
+	.incbin "data/layouts/MagmaHideout_B1F/border.bin"
+
+MagmaHideout_B1F_MapBlockdata:: @ 8300470
+	.incbin "data/layouts/MagmaHideout_B1F/map.bin"
+
+	.align 2
+MagmaHideout_B1F_Layout:: @ 8301010
+	.4byte 0x3e
+	.4byte 0x18
+	.4byte MagmaHideout_B1F_MapBorder
+	.4byte MagmaHideout_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MagmaHideout_B1F/map.bin b/data/layouts/MagmaHideout_B1F/map.bin
index b423ca1a9..b423ca1a9 100644
--- a/data/maps/MagmaHideout_B1F/map.bin
+++ b/data/layouts/MagmaHideout_B1F/map.bin
diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/layouts/MagmaHideout_B2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_B1F_1R/border.bin
+++ b/data/layouts/MagmaHideout_B2F/border.bin
diff --git a/data/layouts/MagmaHideout_B2F/layout.inc b/data/layouts/MagmaHideout_B2F/layout.inc
new file mode 100644
index 000000000..b245f7b91
--- /dev/null
+++ b/data/layouts/MagmaHideout_B2F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_B2F_MapBorder:: @ 8301028
+	.incbin "data/layouts/MagmaHideout_B2F/border.bin"
+
+MagmaHideout_B2F_MapBlockdata:: @ 8301030
+	.incbin "data/layouts/MagmaHideout_B2F/map.bin"
+
+	.align 2
+MagmaHideout_B2F_Layout:: @ 8301690
+	.4byte 0x22
+	.4byte 0x18
+	.4byte MagmaHideout_B2F_MapBorder
+	.4byte MagmaHideout_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MagmaHideout_B2F/map.bin b/data/layouts/MagmaHideout_B2F/map.bin
index 68afb0063..68afb0063 100644
--- a/data/maps/MagmaHideout_B2F/map.bin
+++ b/data/layouts/MagmaHideout_B2F/map.bin
diff --git a/data/maps/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/MauvilleCity/border.bin
+++ b/data/layouts/MauvilleCity/border.bin
diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc
new file mode 100644
index 000000000..a40712576
--- /dev/null
+++ b/data/layouts/MauvilleCity/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_MapBorder:: @ 8288C6C
+	.incbin "data/layouts/MauvilleCity/border.bin"
+
+MauvilleCity_MapBlockdata:: @ 8288C74
+	.incbin "data/layouts/MauvilleCity/map.bin"
+
+	.align 2
+MauvilleCity_Layout:: @ 82892B4
+	.4byte 0x28
+	.4byte 0x14
+	.4byte MauvilleCity_MapBorder
+	.4byte MauvilleCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/MauvilleCity/map.bin b/data/layouts/MauvilleCity/map.bin
index 80a38e902..80a38e902 100644
--- a/data/maps/MauvilleCity/map.bin
+++ b/data/layouts/MauvilleCity/map.bin
diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/MauvilleCity_BikeShop/border.bin
+++ b/data/layouts/MauvilleCity_BikeShop/border.bin
diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc
new file mode 100644
index 000000000..b4f7c402f
--- /dev/null
+++ b/data/layouts/MauvilleCity_BikeShop/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
+	.incbin "data/layouts/MauvilleCity_BikeShop/border.bin"
+
+MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34
+	.incbin "data/layouts/MauvilleCity_BikeShop/map.bin"
+
+	.align 2
+MauvilleCity_BikeShop_Layout:: @ 82D100C
+	.4byte 0xc
+	.4byte 0x9
+	.4byte MauvilleCity_BikeShop_MapBorder
+	.4byte MauvilleCity_BikeShop_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/layouts/MauvilleCity_BikeShop/map.bin
index 9891b9fd5..9891b9fd5 100644
--- a/data/maps/MauvilleCity_BikeShop/map.bin
+++ b/data/layouts/MauvilleCity_BikeShop/map.bin
diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MauvilleCity_GameCorner/border.bin
+++ b/data/layouts/MauvilleCity_GameCorner/border.bin
diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc
new file mode 100644
index 000000000..7393c3274
--- /dev/null
+++ b/data/layouts/MauvilleCity_GameCorner/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_GameCorner_MapBorder:: @ 82D1024
+	.incbin "data/layouts/MauvilleCity_GameCorner/border.bin"
+
+MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C
+	.incbin "data/layouts/MauvilleCity_GameCorner/map.bin"
+
+	.align 2
+MauvilleCity_GameCorner_Layout:: @ 82D1210
+	.4byte 0x16
+	.4byte 0xb
+	.4byte MauvilleCity_GameCorner_MapBorder
+	.4byte MauvilleCity_GameCorner_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGameCorner
diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/layouts/MauvilleCity_GameCorner/map.bin
index ce3f9bf73..ce3f9bf73 100644
--- a/data/maps/MauvilleCity_GameCorner/map.bin
+++ b/data/layouts/MauvilleCity_GameCorner/map.bin
diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/layouts/MauvilleCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MauvilleCity_Gym/border.bin
+++ b/data/layouts/MauvilleCity_Gym/border.bin
diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc
new file mode 100644
index 000000000..9e8004009
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_Gym_MapBorder:: @ 82D0D68
+	.incbin "data/layouts/MauvilleCity_Gym/border.bin"
+
+MauvilleCity_Gym_MapBlockdata:: @ 82D0D70
+	.incbin "data/layouts/MauvilleCity_Gym/map.bin"
+
+	.align 2
+MauvilleCity_Gym_Layout:: @ 82D0F14
+	.4byte 0xa
+	.4byte 0x15
+	.4byte MauvilleCity_Gym_MapBorder
+	.4byte MauvilleCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGym
diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/layouts/MauvilleCity_Gym/map.bin
index 73847264c..73847264c 100644
--- a/data/maps/MauvilleCity_Gym/map.bin
+++ b/data/layouts/MauvilleCity_Gym/map.bin
diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_B1F_2R/border.bin
+++ b/data/layouts/MeteorFalls_1F_1R/border.bin
diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc
new file mode 100644
index 000000000..131e63ec0
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_1F_1R_MapBorder:: @ 82D565C
+	.incbin "data/layouts/MeteorFalls_1F_1R/border.bin"
+
+MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664
+	.incbin "data/layouts/MeteorFalls_1F_1R/map.bin"
+
+	.align 2
+MeteorFalls_1F_1R_Layout:: @ 82D603C
+	.4byte 0x1e
+	.4byte 0x2a
+	.4byte MeteorFalls_1F_1R_MapBorder
+	.4byte MeteorFalls_1F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/layouts/MeteorFalls_1F_1R/map.bin
index bcfb05fd2..bcfb05fd2 100644
--- a/data/maps/MeteorFalls_1F_1R/map.bin
+++ b/data/layouts/MeteorFalls_1F_1R/map.bin
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/layouts/MeteorFalls_1F_2R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin
+++ b/data/layouts/MeteorFalls_1F_2R/border.bin
diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc
new file mode 100644
index 000000000..aacce1de4
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_1F_2R_MapBorder:: @ 82D6054
+	.incbin "data/layouts/MeteorFalls_1F_2R/border.bin"
+
+MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C
+	.incbin "data/layouts/MeteorFalls_1F_2R/map.bin"
+
+	.align 2
+MeteorFalls_1F_2R_Layout:: @ 82D67DC
+	.4byte 0x1e
+	.4byte 0x20
+	.4byte MeteorFalls_1F_2R_MapBorder
+	.4byte MeteorFalls_1F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/layouts/MeteorFalls_1F_2R/map.bin
index cea93a39b..cea93a39b 100644
--- a/data/maps/MeteorFalls_1F_2R/map.bin
+++ b/data/layouts/MeteorFalls_1F_2R/map.bin
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/layouts/MeteorFalls_B1F_1R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin
+++ b/data/layouts/MeteorFalls_B1F_1R/border.bin
diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc
new file mode 100644
index 000000000..e5aef8279
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
+	.incbin "data/layouts/MeteorFalls_B1F_1R/border.bin"
+
+MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC
+	.incbin "data/layouts/MeteorFalls_B1F_1R/map.bin"
+
+	.align 2
+MeteorFalls_B1F_1R_Layout:: @ 82D7098
+	.4byte 0x1d
+	.4byte 0x26
+	.4byte MeteorFalls_B1F_1R_MapBorder
+	.4byte MeteorFalls_B1F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/layouts/MeteorFalls_B1F_1R/map.bin
index a37afdb17..a37afdb17 100644
--- a/data/maps/MeteorFalls_B1F_1R/map.bin
+++ b/data/layouts/MeteorFalls_B1F_1R/map.bin
diff --git a/data/maps/MtPyre_1F/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_1F/border.bin
+++ b/data/layouts/MeteorFalls_B1F_2R/border.bin
diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc
new file mode 100644
index 000000000..8d6f7041a
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
+	.incbin "data/layouts/MeteorFalls_B1F_2R/border.bin"
+
+MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8
+	.incbin "data/layouts/MeteorFalls_B1F_2R/map.bin"
+
+	.align 2
+MeteorFalls_B1F_2R_Layout:: @ 82D7244
+	.4byte 0xb
+	.4byte 0x12
+	.4byte MeteorFalls_B1F_2R_MapBorder
+	.4byte MeteorFalls_B1F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/layouts/MeteorFalls_B1F_2R/map.bin
index 5f4497752..5f4497752 100644
--- a/data/maps/MeteorFalls_B1F_2R/map.bin
+++ b/data/layouts/MeteorFalls_B1F_2R/map.bin
diff --git a/data/maps/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/MossdeepCity/border.bin
+++ b/data/layouts/MossdeepCity/border.bin
diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc
new file mode 100644
index 000000000..33ebb078e
--- /dev/null
+++ b/data/layouts/MossdeepCity/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_MapBorder:: @ 828C52C
+	.incbin "data/layouts/MossdeepCity/border.bin"
+
+MossdeepCity_MapBlockdata:: @ 828C534
+	.incbin "data/layouts/MossdeepCity/map.bin"
+
+	.align 2
+MossdeepCity_Layout:: @ 828DE34
+	.4byte 0x50
+	.4byte 0x28
+	.4byte MossdeepCity_MapBorder
+	.4byte MossdeepCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/MossdeepCity/map.bin b/data/layouts/MossdeepCity/map.bin
index 29b167286..29b167286 100644
--- a/data/maps/MossdeepCity/map.bin
+++ b/data/layouts/MossdeepCity/map.bin
diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/border.bin
+++ b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
new file mode 100644
index 000000000..c569215c5
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
+	.incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin"
+
+MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88
+	.incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin"
+
+	.align 2
+MossdeepCity_GameCorner_1F_Layout:: @ 82FEB38
+	.4byte 0xb
+	.4byte 0x8
+	.4byte MossdeepCity_GameCorner_1F_MapBorder
+	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
index bad63f412..bad63f412 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/map.bin
+++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/border.bin
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
new file mode 100644
index 000000000..1ab9e6129
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
+	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin"
+
+MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58
+	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin"
+
+	.align 2
+MossdeepCity_GameCorner_B1F_Layout:: @ 82FEC30
+	.4byte 0xc
+	.4byte 0x9
+	.4byte MossdeepCity_GameCorner_B1F_MapBorder
+	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
index 399d05705..399d05705 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/MossdeepCity_Gym/border.bin
+++ b/data/layouts/MossdeepCity_Gym/border.bin
diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc
new file mode 100644
index 000000000..0d999df58
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_Gym_MapBorder:: @ 82D36C0
+	.incbin "data/layouts/MossdeepCity_Gym/border.bin"
+
+MossdeepCity_Gym_MapBlockdata:: @ 82D36C8
+	.incbin "data/layouts/MossdeepCity_Gym/map.bin"
+
+	.align 2
+MossdeepCity_Gym_Layout:: @ 82D3B78
+	.4byte 0x14
+	.4byte 0x1e
+	.4byte MossdeepCity_Gym_MapBorder
+	.4byte MossdeepCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MossdeepGym
diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/layouts/MossdeepCity_Gym/map.bin
index cd6eb09f9..cd6eb09f9 100644
--- a/data/maps/MossdeepCity_Gym/map.bin
+++ b/data/layouts/MossdeepCity_Gym/map.bin
diff --git a/data/maps/MtPyre_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_2F/border.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
new file mode 100644
index 000000000..97248346a
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin"
+
+MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin"
+
+	.align 2
+MossdeepCity_SpaceCenter_1F_Layout:: @ 82F6280
+	.4byte 0x10
+	.4byte 0xa
+	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
+	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
index 44f5081b9..44f5081b9 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
diff --git a/data/maps/MtPyre_3F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_3F/border.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
new file mode 100644
index 000000000..46c85be57
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin"
+
+MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin"
+
+	.align 2
+MossdeepCity_SpaceCenter_2F_Layout:: @ 82F63E0
+	.4byte 0x10
+	.4byte 0xa
+	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
+	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
index d2e52d780..d2e52d780 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_StevensHouse/border.bin
+++ b/data/layouts/MossdeepCity_StevensHouse/border.bin
diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc
new file mode 100644
index 000000000..ec6c7cc3e
--- /dev/null
+++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
+	.incbin "data/layouts/MossdeepCity_StevensHouse/border.bin"
+
+MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4
+	.incbin "data/layouts/MossdeepCity_StevensHouse/map.bin"
+
+	.align 2
+MossdeepCity_StevensHouse_Layout:: @ 8304284
+	.4byte 0xb
+	.4byte 0x8
+	.4byte MossdeepCity_StevensHouse_MapBorder
+	.4byte MossdeepCity_StevensHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/layouts/MossdeepCity_StevensHouse/map.bin
index ade25497a..ade25497a 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.bin
+++ b/data/layouts/MossdeepCity_StevensHouse/map.bin
diff --git a/data/maps/MtChimney/border.bin b/data/layouts/MtChimney/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MtChimney/border.bin
+++ b/data/layouts/MtChimney/border.bin
diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc
new file mode 100644
index 000000000..ca97f1797
--- /dev/null
+++ b/data/layouts/MtChimney/layout.inc
@@ -0,0 +1,14 @@
+MtChimney_MapBorder:: @ 82DA25C
+	.incbin "data/layouts/MtChimney/border.bin"
+
+MtChimney_MapBlockdata:: @ 82DA264
+	.incbin "data/layouts/MtChimney/map.bin"
+
+	.align 2
+MtChimney_Layout:: @ 82DB114
+	.4byte 0x28
+	.4byte 0x2f
+	.4byte MtChimney_MapBorder
+	.4byte MtChimney_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/MtChimney/map.bin b/data/layouts/MtChimney/map.bin
index 09eb5a906..09eb5a906 100644
--- a/data/maps/MtChimney/map.bin
+++ b/data/layouts/MtChimney/map.bin
diff --git a/data/maps/MtPyre_4F/border.bin b/data/layouts/MtPyre_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_4F/border.bin
+++ b/data/layouts/MtPyre_1F/border.bin
diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc
new file mode 100644
index 000000000..c39f56fa2
--- /dev/null
+++ b/data/layouts/MtPyre_1F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_1F_MapBorder:: @ 82DB12C
+	.incbin "data/layouts/MtPyre_1F/border.bin"
+
+MtPyre_1F_MapBlockdata:: @ 82DB134
+	.incbin "data/layouts/MtPyre_1F/map.bin"
+
+	.align 2
+MtPyre_1F_Layout:: @ 82DB478
+	.4byte 0x16
+	.4byte 0x13
+	.4byte MtPyre_1F_MapBorder
+	.4byte MtPyre_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_1F/map.bin b/data/layouts/MtPyre_1F/map.bin
index 60b992a73..60b992a73 100644
--- a/data/maps/MtPyre_1F/map.bin
+++ b/data/layouts/MtPyre_1F/map.bin
diff --git a/data/maps/MtPyre_5F/border.bin b/data/layouts/MtPyre_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_5F/border.bin
+++ b/data/layouts/MtPyre_2F/border.bin
diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc
new file mode 100644
index 000000000..8b68101c9
--- /dev/null
+++ b/data/layouts/MtPyre_2F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_2F_MapBorder:: @ 82DB490
+	.incbin "data/layouts/MtPyre_2F/border.bin"
+
+MtPyre_2F_MapBlockdata:: @ 82DB498
+	.incbin "data/layouts/MtPyre_2F/map.bin"
+
+	.align 2
+MtPyre_2F_Layout:: @ 82DB5EC
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_2F_MapBorder
+	.4byte MtPyre_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_2F/map.bin b/data/layouts/MtPyre_2F/map.bin
index 628d2262e..628d2262e 100644
--- a/data/maps/MtPyre_2F/map.bin
+++ b/data/layouts/MtPyre_2F/map.bin
diff --git a/data/maps/MtPyre_6F/border.bin b/data/layouts/MtPyre_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_6F/border.bin
+++ b/data/layouts/MtPyre_3F/border.bin
diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc
new file mode 100644
index 000000000..459fae9e7
--- /dev/null
+++ b/data/layouts/MtPyre_3F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_3F_MapBorder:: @ 82DB604
+	.incbin "data/layouts/MtPyre_3F/border.bin"
+
+MtPyre_3F_MapBlockdata:: @ 82DB60C
+	.incbin "data/layouts/MtPyre_3F/map.bin"
+
+	.align 2
+MtPyre_3F_Layout:: @ 82DB760
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_3F_MapBorder
+	.4byte MtPyre_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_3F/map.bin b/data/layouts/MtPyre_3F/map.bin
index fabbe8cb3..fabbe8cb3 100644
--- a/data/maps/MtPyre_3F/map.bin
+++ b/data/layouts/MtPyre_3F/map.bin
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/layouts/MtPyre_4F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin
+++ b/data/layouts/MtPyre_4F/border.bin
diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc
new file mode 100644
index 000000000..97363cb82
--- /dev/null
+++ b/data/layouts/MtPyre_4F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_4F_MapBorder:: @ 82DB778
+	.incbin "data/layouts/MtPyre_4F/border.bin"
+
+MtPyre_4F_MapBlockdata:: @ 82DB780
+	.incbin "data/layouts/MtPyre_4F/map.bin"
+
+	.align 2
+MtPyre_4F_Layout:: @ 82DB8D4
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_4F_MapBorder
+	.4byte MtPyre_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_4F/map.bin b/data/layouts/MtPyre_4F/map.bin
index 98dc679ff..98dc679ff 100644
--- a/data/maps/MtPyre_4F/map.bin
+++ b/data/layouts/MtPyre_4F/map.bin
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/layouts/MtPyre_5F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin
+++ b/data/layouts/MtPyre_5F/border.bin
diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc
new file mode 100644
index 000000000..252899515
--- /dev/null
+++ b/data/layouts/MtPyre_5F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_5F_MapBorder:: @ 82DB8EC
+	.incbin "data/layouts/MtPyre_5F/border.bin"
+
+MtPyre_5F_MapBlockdata:: @ 82DB8F4
+	.incbin "data/layouts/MtPyre_5F/map.bin"
+
+	.align 2
+MtPyre_5F_Layout:: @ 82DBA48
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_5F_MapBorder
+	.4byte MtPyre_5F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_5F/map.bin b/data/layouts/MtPyre_5F/map.bin
index 12fbeeb7e..12fbeeb7e 100644
--- a/data/maps/MtPyre_5F/map.bin
+++ b/data/layouts/MtPyre_5F/map.bin
diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/layouts/MtPyre_6F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PacifidlogTown_House1/border.bin
+++ b/data/layouts/MtPyre_6F/border.bin
diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc
new file mode 100644
index 000000000..46c419157
--- /dev/null
+++ b/data/layouts/MtPyre_6F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_6F_MapBorder:: @ 82DBA60
+	.incbin "data/layouts/MtPyre_6F/border.bin"
+
+MtPyre_6F_MapBlockdata:: @ 82DBA68
+	.incbin "data/layouts/MtPyre_6F/map.bin"
+
+	.align 2
+MtPyre_6F_Layout:: @ 82DBBBC
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_6F_MapBorder
+	.4byte MtPyre_6F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_6F/map.bin b/data/layouts/MtPyre_6F/map.bin
index 54f599ec2..54f599ec2 100644
--- a/data/maps/MtPyre_6F/map.bin
+++ b/data/layouts/MtPyre_6F/map.bin
diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin
index 1d7df4a00..1d7df4a00 100644
--- a/data/maps/MtPyre_Exterior/border.bin
+++ b/data/layouts/MtPyre_Exterior/border.bin
diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc
new file mode 100644
index 000000000..09cfeaecf
--- /dev/null
+++ b/data/layouts/MtPyre_Exterior/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_Exterior_MapBorder:: @ 82FC8C0
+	.incbin "data/layouts/MtPyre_Exterior/border.bin"
+
+MtPyre_Exterior_MapBlockdata:: @ 82FC8C8
+	.incbin "data/layouts/MtPyre_Exterior/map.bin"
+
+	.align 2
+MtPyre_Exterior_Layout:: @ 82FD7EC
+	.4byte 0x26
+	.4byte 0x33
+	.4byte MtPyre_Exterior_MapBorder
+	.4byte MtPyre_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/layouts/MtPyre_Exterior/map.bin
index 7ab1e0461..7ab1e0461 100644
--- a/data/maps/MtPyre_Exterior/map.bin
+++ b/data/layouts/MtPyre_Exterior/map.bin
diff --git a/data/maps/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin
index 1d7df4a00..1d7df4a00 100644
--- a/data/maps/MtPyre_Summit/border.bin
+++ b/data/layouts/MtPyre_Summit/border.bin
diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc
new file mode 100644
index 000000000..b587bdee8
--- /dev/null
+++ b/data/layouts/MtPyre_Summit/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_Summit_MapBorder:: @ 82FD804
+	.incbin "data/layouts/MtPyre_Summit/border.bin"
+
+MtPyre_Summit_MapBlockdata:: @ 82FD80C
+	.incbin "data/layouts/MtPyre_Summit/map.bin"
+
+	.align 2
+MtPyre_Summit_Layout:: @ 82FE680
+	.4byte 0x32
+	.4byte 0x25
+	.4byte MtPyre_Summit_MapBorder
+	.4byte MtPyre_Summit_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_Summit/map.bin b/data/layouts/MtPyre_Summit/map.bin
index 1de8bd5ea..1de8bd5ea 100644
--- a/data/maps/MtPyre_Summit/map.bin
+++ b/data/layouts/MtPyre_Summit/map.bin
diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin
index 4531975c7..4531975c7 100644
--- a/data/maps/NewMauville_Entrance/border.bin
+++ b/data/layouts/NewMauville_Entrance/border.bin
diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc
new file mode 100644
index 000000000..f86a45691
--- /dev/null
+++ b/data/layouts/NewMauville_Entrance/layout.inc
@@ -0,0 +1,14 @@
+NewMauville_Entrance_MapBorder:: @ 82E57B4
+	.incbin "data/layouts/NewMauville_Entrance/border.bin"
+
+NewMauville_Entrance_MapBlockdata:: @ 82E57BC
+	.incbin "data/layouts/NewMauville_Entrance/map.bin"
+
+	.align 2
+NewMauville_Entrance_Layout:: @ 82E5860
+	.4byte 0x9
+	.4byte 0x9
+	.4byte NewMauville_Entrance_MapBorder
+	.4byte NewMauville_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/layouts/NewMauville_Entrance/map.bin
index 1e3f471e8..1e3f471e8 100644
--- a/data/maps/NewMauville_Entrance/map.bin
+++ b/data/layouts/NewMauville_Entrance/map.bin
diff --git a/data/maps/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/NewMauville_Inside/border.bin
+++ b/data/layouts/NewMauville_Inside/border.bin
diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc
new file mode 100644
index 000000000..25aa29e7d
--- /dev/null
+++ b/data/layouts/NewMauville_Inside/layout.inc
@@ -0,0 +1,14 @@
+NewMauville_Inside_MapBorder:: @ 82E5878
+	.incbin "data/layouts/NewMauville_Inside/border.bin"
+
+NewMauville_Inside_MapBlockdata:: @ 82E5880
+	.incbin "data/layouts/NewMauville_Inside/map.bin"
+
+	.align 2
+NewMauville_Inside_Layout:: @ 82E65A4
+	.4byte 0x29
+	.4byte 0x29
+	.4byte NewMauville_Inside_MapBorder
+	.4byte NewMauville_Inside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
diff --git a/data/maps/NewMauville_Inside/map.bin b/data/layouts/NewMauville_Inside/map.bin
index 78d1e39ce..78d1e39ce 100644
--- a/data/maps/NewMauville_Inside/map.bin
+++ b/data/layouts/NewMauville_Inside/map.bin
diff --git a/data/maps/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/OldaleTown/border.bin
+++ b/data/layouts/OldaleTown/border.bin
diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc
new file mode 100644
index 000000000..621c4bd0d
--- /dev/null
+++ b/data/layouts/OldaleTown/layout.inc
@@ -0,0 +1,14 @@
+OldaleTown_MapBorder:: @ 82916EC
+	.incbin "data/layouts/OldaleTown/border.bin"
+
+OldaleTown_MapBlockdata:: @ 82916F4
+	.incbin "data/layouts/OldaleTown/map.bin"
+
+	.align 2
+OldaleTown_Layout:: @ 8291A14
+	.4byte 0x14
+	.4byte 0x14
+	.4byte OldaleTown_MapBorder
+	.4byte OldaleTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin
index e6ff2362e..e6ff2362e 100644
--- a/data/maps/OldaleTown/map.bin
+++ b/data/layouts/OldaleTown/map.bin
diff --git a/data/maps/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/PacifidlogTown/border.bin
+++ b/data/layouts/PacifidlogTown/border.bin
diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc
new file mode 100644
index 000000000..c2be2f4cf
--- /dev/null
+++ b/data/layouts/PacifidlogTown/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_MapBorder:: @ 829272C
+	.incbin "data/layouts/PacifidlogTown/border.bin"
+
+PacifidlogTown_MapBlockdata:: @ 8292734
+	.incbin "data/layouts/PacifidlogTown/map.bin"
+
+	.align 2
+PacifidlogTown_Layout:: @ 8292D74
+	.4byte 0x14
+	.4byte 0x28
+	.4byte PacifidlogTown_MapBorder
+	.4byte PacifidlogTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/PacifidlogTown/map.bin b/data/layouts/PacifidlogTown/map.bin
index 02c1454bb..02c1454bb 100644
--- a/data/maps/PacifidlogTown/map.bin
+++ b/data/layouts/PacifidlogTown/map.bin
diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PacifidlogTown_House2/border.bin
+++ b/data/layouts/PacifidlogTown_House1/border.bin
diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc
new file mode 100644
index 000000000..b09e191ca
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House1/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_House1_MapBorder:: @ 82CF6AC
+	.incbin "data/layouts/PacifidlogTown_House1/border.bin"
+
+PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4
+	.incbin "data/layouts/PacifidlogTown_House1/map.bin"
+
+	.align 2
+PacifidlogTown_House1_Layout:: @ 82CF768
+	.4byte 0xa
+	.4byte 0x9
+	.4byte PacifidlogTown_House1_MapBorder
+	.4byte PacifidlogTown_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin
index 7865fdc7c..7865fdc7c 100644
--- a/data/maps/PacifidlogTown_House1/map.bin
+++ b/data/layouts/PacifidlogTown_House1/map.bin
diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PetalburgCity_House2/border.bin
+++ b/data/layouts/PacifidlogTown_House2/border.bin
diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc
new file mode 100644
index 000000000..ecb3d28f0
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House2/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_House2_MapBorder:: @ 82CF780
+	.incbin "data/layouts/PacifidlogTown_House2/border.bin"
+
+PacifidlogTown_House2_MapBlockdata:: @ 82CF788
+	.incbin "data/layouts/PacifidlogTown_House2/map.bin"
+
+	.align 2
+PacifidlogTown_House2_Layout:: @ 82CF83C
+	.4byte 0xa
+	.4byte 0x9
+	.4byte PacifidlogTown_House2_MapBorder
+	.4byte PacifidlogTown_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin
index 617346322..617346322 100644
--- a/data/maps/PacifidlogTown_House2/map.bin
+++ b/data/layouts/PacifidlogTown_House2/map.bin
diff --git a/data/maps/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/PetalburgCity/border.bin
+++ b/data/layouts/PetalburgCity/border.bin
diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc
new file mode 100644
index 000000000..76cb0186f
--- /dev/null
+++ b/data/layouts/PetalburgCity/layout.inc
@@ -0,0 +1,14 @@
+PetalburgCity_MapBorder:: @ 8287264
+	.incbin "data/layouts/PetalburgCity/border.bin"
+
+PetalburgCity_MapBlockdata:: @ 828726C
+	.incbin "data/layouts/PetalburgCity/map.bin"
+
+	.align 2
+PetalburgCity_Layout:: @ 8287974
+	.4byte 0x1e
+	.4byte 0x1e
+	.4byte PetalburgCity_MapBorder
+	.4byte PetalburgCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin
index 35f0172ca..35f0172ca 100644
--- a/data/maps/PetalburgCity/map.bin
+++ b/data/layouts/PetalburgCity/map.bin
diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/PetalburgCity_Gym/border.bin
+++ b/data/layouts/PetalburgCity_Gym/border.bin
diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc
new file mode 100644
index 000000000..9e5eb5509
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+PetalburgCity_Gym_MapBorder:: @ 82CF854
+	.incbin "data/layouts/PetalburgCity_Gym/border.bin"
+
+PetalburgCity_Gym_MapBlockdata:: @ 82CF85C
+	.incbin "data/layouts/PetalburgCity_Gym/map.bin"
+
+	.align 2
+PetalburgCity_Gym_Layout:: @ 82D003C
+	.4byte 0x9
+	.4byte 0x70
+	.4byte PetalburgCity_Gym_MapBorder
+	.4byte PetalburgCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PetalburgGym
diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/layouts/PetalburgCity_Gym/map.bin
index 665783c7b..665783c7b 100644
--- a/data/maps/PetalburgCity_Gym/map.bin
+++ b/data/layouts/PetalburgCity_Gym/map.bin
diff --git a/data/maps/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/PetalburgWoods/border.bin
+++ b/data/layouts/PetalburgWoods/border.bin
diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc
new file mode 100644
index 000000000..47192ac1a
--- /dev/null
+++ b/data/layouts/PetalburgWoods/layout.inc
@@ -0,0 +1,14 @@
+PetalburgWoods_MapBorder:: @ 82D91BC
+	.incbin "data/layouts/PetalburgWoods/border.bin"
+
+PetalburgWoods_MapBlockdata:: @ 82D91C4
+	.incbin "data/layouts/PetalburgWoods/map.bin"
+
+	.align 2
+PetalburgWoods_Layout:: @ 82DA244
+	.4byte 0x30
+	.4byte 0x2c
+	.4byte PetalburgWoods_MapBorder
+	.4byte PetalburgWoods_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin
index a032b4c43..a032b4c43 100644
--- a/data/maps/PetalburgWoods/map.bin
+++ b/data/layouts/PetalburgWoods/map.bin
diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/layouts/PokeMart/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/OldaleTown_Mart/border.bin
+++ b/data/layouts/PokeMart/border.bin
diff --git a/data/layouts/PokeMart/layout.inc b/data/layouts/PokeMart/layout.inc
new file mode 100644
index 000000000..830d398ac
--- /dev/null
+++ b/data/layouts/PokeMart/layout.inc
@@ -0,0 +1,14 @@
+PokeMart_MapBorder:: @ 82CE29C
+	.incbin "data/layouts/PokeMart/border.bin"
+
+PokeMart_MapBlockdata:: @ 82CE2A4
+	.incbin "data/layouts/PokeMart/map.bin"
+
+	.align 2
+PokeMart_Layout:: @ 82CE354
+	.4byte 0xb
+	.4byte 0x8
+	.4byte PokeMart_MapBorder
+	.4byte PokeMart_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/layouts/PokeMart/map.bin
index 73d90bf31..73d90bf31 100644
--- a/data/maps/OldaleTown_Mart/map.bin
+++ b/data/layouts/PokeMart/map.bin
diff --git a/data/maps/RecordCorner/border.bin b/data/layouts/PokemonCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RecordCorner/border.bin
+++ b/data/layouts/PokemonCenter_1F/border.bin
diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..a4d067758
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+PokemonCenter_1F_MapBorder:: @ 82CE064
+	.incbin "data/layouts/PokemonCenter_1F/border.bin"
+
+PokemonCenter_1F_MapBlockdata:: @ 82CE06C
+	.incbin "data/layouts/PokemonCenter_1F/map.bin"
+
+	.align 2
+PokemonCenter_1F_Layout:: @ 82CE168
+	.4byte 0xe
+	.4byte 0x9
+	.4byte PokemonCenter_1F_MapBorder
+	.4byte PokemonCenter_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin
index 5201dde15..5201dde15 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin
+++ b/data/layouts/PokemonCenter_1F/map.bin
diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/layouts/PokemonCenter_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route104_MrBrineysHouse/border.bin
+++ b/data/layouts/PokemonCenter_2F/border.bin
diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc
new file mode 100644
index 000000000..033580519
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/layout.inc
@@ -0,0 +1,14 @@
+PokemonCenter_2F_MapBorder:: @ 82CE180
+	.incbin "data/layouts/PokemonCenter_2F/border.bin"
+
+PokemonCenter_2F_MapBlockdata:: @ 82CE188
+	.incbin "data/layouts/PokemonCenter_2F/map.bin"
+
+	.align 2
+PokemonCenter_2F_Layout:: @ 82CE284
+	.4byte 0xe
+	.4byte 0x9
+	.4byte PokemonCenter_2F_MapBorder
+	.4byte PokemonCenter_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin
index 40cf9afd7..40cf9afd7 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin
+++ b/data/layouts/PokemonCenter_2F/map.bin
diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/layouts/RecordCorner/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseCorridor/border.bin
+++ b/data/layouts/RecordCorner/border.bin
diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc
new file mode 100644
index 000000000..9252de7db
--- /dev/null
+++ b/data/layouts/RecordCorner/layout.inc
@@ -0,0 +1,14 @@
+RecordCorner_MapBorder:: @ 82E9460
+	.incbin "data/layouts/RecordCorner/border.bin"
+
+RecordCorner_MapBlockdata:: @ 82E9468
+	.incbin "data/layouts/RecordCorner/map.bin"
+
+	.align 2
+RecordCorner_Layout:: @ 82E95F8
+	.4byte 0x14
+	.4byte 0xa
+	.4byte RecordCorner_MapBorder
+	.4byte RecordCorner_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin
index 51dfb6e5a..51dfb6e5a 100644
--- a/data/maps/RecordCorner/map.bin
+++ b/data/layouts/RecordCorner/map.bin
diff --git a/data/maps/Route101/border.bin b/data/layouts/Route101/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route101/border.bin
+++ b/data/layouts/Route101/border.bin
diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc
new file mode 100644
index 000000000..276a580b0
--- /dev/null
+++ b/data/layouts/Route101/layout.inc
@@ -0,0 +1,14 @@
+Route101_MapBorder:: @ 8292D8C
+	.incbin "data/layouts/Route101/border.bin"
+
+Route101_MapBlockdata:: @ 8292D94
+	.incbin "data/layouts/Route101/map.bin"
+
+	.align 2
+Route101_Layout:: @ 82930B4
+	.4byte 0x14
+	.4byte 0x14
+	.4byte Route101_MapBorder
+	.4byte Route101_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/Route101/map.bin b/data/layouts/Route101/map.bin
index fab3a1d69..fab3a1d69 100644
--- a/data/maps/Route101/map.bin
+++ b/data/layouts/Route101/map.bin
diff --git a/data/maps/Route102/border.bin b/data/layouts/Route102/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route102/border.bin
+++ b/data/layouts/Route102/border.bin
diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc
new file mode 100644
index 000000000..c2e36ea4e
--- /dev/null
+++ b/data/layouts/Route102/layout.inc
@@ -0,0 +1,14 @@
+Route102_MapBorder:: @ 82930CC
+	.incbin "data/layouts/Route102/border.bin"
+
+Route102_MapBlockdata:: @ 82930D4
+	.incbin "data/layouts/Route102/map.bin"
+
+	.align 2
+Route102_Layout:: @ 82938A4
+	.4byte 0x32
+	.4byte 0x14
+	.4byte Route102_MapBorder
+	.4byte Route102_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/Route102/map.bin b/data/layouts/Route102/map.bin
index 7378bb44b..7378bb44b 100644
--- a/data/maps/Route102/map.bin
+++ b/data/layouts/Route102/map.bin
diff --git a/data/maps/Route103/border.bin b/data/layouts/Route103/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route103/border.bin
+++ b/data/layouts/Route103/border.bin
diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc
new file mode 100644
index 000000000..15d321a66
--- /dev/null
+++ b/data/layouts/Route103/layout.inc
@@ -0,0 +1,14 @@
+Route103_MapBorder:: @ 82938BC
+	.incbin "data/layouts/Route103/border.bin"
+
+Route103_MapBlockdata:: @ 82938C4
+	.incbin "data/layouts/Route103/map.bin"
+
+	.align 2
+Route103_Layout:: @ 8294544
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route103_MapBorder
+	.4byte Route103_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/Route103/map.bin b/data/layouts/Route103/map.bin
index 6c5205b4c..6c5205b4c 100644
--- a/data/maps/Route103/map.bin
+++ b/data/layouts/Route103/map.bin
diff --git a/data/maps/Route104/border.bin b/data/layouts/Route104/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route104/border.bin
+++ b/data/layouts/Route104/border.bin
diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc
new file mode 100644
index 000000000..c6f807405
--- /dev/null
+++ b/data/layouts/Route104/layout.inc
@@ -0,0 +1,14 @@
+Route104_MapBorder:: @ 829455C
+	.incbin "data/layouts/Route104/border.bin"
+
+Route104_MapBlockdata:: @ 8294564
+	.incbin "data/layouts/Route104/map.bin"
+
+	.align 2
+Route104_Layout:: @ 8295E64
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route104_MapBorder
+	.4byte Route104_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/Route104/map.bin b/data/layouts/Route104/map.bin
index 7731bc31c..7731bc31c 100644
--- a/data/maps/Route104/map.bin
+++ b/data/layouts/Route104/map.bin
diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseEnd/border.bin
+++ b/data/layouts/Route104_MrBrineysHouse/border.bin
diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc
new file mode 100644
index 000000000..c265b931d
--- /dev/null
+++ b/data/layouts/Route104_MrBrineysHouse/layout.inc
@@ -0,0 +1,14 @@
+Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
+	.incbin "data/layouts/Route104_MrBrineysHouse/border.bin"
+
+Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4
+	.incbin "data/layouts/Route104_MrBrineysHouse/map.bin"
+
+	.align 2
+Route104_MrBrineysHouse_Layout:: @ 82D20BC
+	.4byte 0xc
+	.4byte 0x9
+	.4byte Route104_MrBrineysHouse_MapBorder
+	.4byte Route104_MrBrineysHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/layouts/Route104_MrBrineysHouse/map.bin
index 7660fd5d7..7660fd5d7 100644
--- a/data/maps/Route104_MrBrineysHouse/map.bin
+++ b/data/layouts/Route104_MrBrineysHouse/map.bin
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/border.bin
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
new file mode 100644
index 000000000..35012e71b
--- /dev/null
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
@@ -0,0 +1,14 @@
+Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
+	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin"
+
+Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4
+	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin"
+
+	.align 2
+Route104_PrettyPetalFlowerShop_Layout:: @ 82D4CB4
+	.4byte 0xf
+	.4byte 0x9
+	.4byte Route104_PrettyPetalFlowerShop_MapBorder
+	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PrettyPetalFlowerShop
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
index d34ff5c1a..d34ff5c1a 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/map.bin
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
diff --git a/data/maps/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route104_Prototype/border.bin
+++ b/data/layouts/Route104_Prototype/border.bin
diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc
new file mode 100644
index 000000000..9ddf033e1
--- /dev/null
+++ b/data/layouts/Route104_Prototype/layout.inc
@@ -0,0 +1,14 @@
+Route104_Prototype_MapBorder:: @ 82F9A58
+	.incbin "data/layouts/Route104_Prototype/border.bin"
+
+Route104_Prototype_MapBlockdata:: @ 82F9A60
+	.incbin "data/layouts/Route104_Prototype/map.bin"
+
+	.align 2
+Route104_Prototype_Layout:: @ 82F9A64
+	.4byte 0x1
+	.4byte 0x1
+	.4byte Route104_Prototype_MapBorder
+	.4byte Route104_Prototype_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/Route104_Prototype/map.bin b/data/layouts/Route104_Prototype/map.bin
index 71bd63e62..71bd63e62 100644
--- a/data/maps/Route104_Prototype/map.bin
+++ b/data/layouts/Route104_Prototype/map.bin
diff --git a/data/maps/Route105/border.bin b/data/layouts/Route105/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route105/border.bin
+++ b/data/layouts/Route105/border.bin
diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc
new file mode 100644
index 000000000..d918e73ff
--- /dev/null
+++ b/data/layouts/Route105/layout.inc
@@ -0,0 +1,14 @@
+Route105_MapBorder:: @ 8295E7C
+	.incbin "data/layouts/Route105/border.bin"
+
+Route105_MapBlockdata:: @ 8295E84
+	.incbin "data/layouts/Route105/map.bin"
+
+	.align 2
+Route105_Layout:: @ 8297784
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route105_MapBorder
+	.4byte Route105_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/Route105/map.bin b/data/layouts/Route105/map.bin
index 152aad670..152aad670 100644
--- a/data/maps/Route105/map.bin
+++ b/data/layouts/Route105/map.bin
diff --git a/data/maps/Route106/border.bin b/data/layouts/Route106/border.bin
index 281762f5b..281762f5b 100644
--- a/data/maps/Route106/border.bin
+++ b/data/layouts/Route106/border.bin
diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc
new file mode 100644
index 000000000..60ff843f3
--- /dev/null
+++ b/data/layouts/Route106/layout.inc
@@ -0,0 +1,14 @@
+Route106_MapBorder:: @ 829779C
+	.incbin "data/layouts/Route106/border.bin"
+
+Route106_MapBlockdata:: @ 82977A4
+	.incbin "data/layouts/Route106/map.bin"
+
+	.align 2
+Route106_Layout:: @ 8298424
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route106_MapBorder
+	.4byte Route106_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/Route106/map.bin b/data/layouts/Route106/map.bin
index d65a278a4..d65a278a4 100644
--- a/data/maps/Route106/map.bin
+++ b/data/layouts/Route106/map.bin
diff --git a/data/maps/Route107/border.bin b/data/layouts/Route107/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route107/border.bin
+++ b/data/layouts/Route107/border.bin
diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc
new file mode 100644
index 000000000..06b6f3020
--- /dev/null
+++ b/data/layouts/Route107/layout.inc
@@ -0,0 +1,14 @@
+Route107_MapBorder:: @ 829843C
+	.incbin "data/layouts/Route107/border.bin"
+
+Route107_MapBlockdata:: @ 8298444
+	.incbin "data/layouts/Route107/map.bin"
+
+	.align 2
+Route107_Layout:: @ 8298DA4
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route107_MapBorder
+	.4byte Route107_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/Route107/map.bin b/data/layouts/Route107/map.bin
index 521997b0f..521997b0f 100644
--- a/data/maps/Route107/map.bin
+++ b/data/layouts/Route107/map.bin
diff --git a/data/maps/Route108/border.bin b/data/layouts/Route108/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route108/border.bin
+++ b/data/layouts/Route108/border.bin
diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc
new file mode 100644
index 000000000..1c4e97eec
--- /dev/null
+++ b/data/layouts/Route108/layout.inc
@@ -0,0 +1,14 @@
+Route108_MapBorder:: @ 8298DBC
+	.incbin "data/layouts/Route108/border.bin"
+
+Route108_MapBlockdata:: @ 8298DC4
+	.incbin "data/layouts/Route108/map.bin"
+
+	.align 2
+Route108_Layout:: @ 8299724
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route108_MapBorder
+	.4byte Route108_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
diff --git a/data/maps/Route108/map.bin b/data/layouts/Route108/map.bin
index 0a82f9924..0a82f9924 100644
--- a/data/maps/Route108/map.bin
+++ b/data/layouts/Route108/map.bin
diff --git a/data/maps/Route109/border.bin b/data/layouts/Route109/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route109/border.bin
+++ b/data/layouts/Route109/border.bin
diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc
new file mode 100644
index 000000000..9ea7a20ce
--- /dev/null
+++ b/data/layouts/Route109/layout.inc
@@ -0,0 +1,14 @@
+Route109_MapBorder:: @ 829973C
+	.incbin "data/layouts/Route109/border.bin"
+
+Route109_MapBlockdata:: @ 8299744
+	.incbin "data/layouts/Route109/map.bin"
+
+	.align 2
+Route109_Layout:: @ 829AA04
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte Route109_MapBorder
+	.4byte Route109_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
diff --git a/data/maps/Route109/map.bin b/data/layouts/Route109/map.bin
index eb83de870..eb83de870 100644
--- a/data/maps/Route109/map.bin
+++ b/data/layouts/Route109/map.bin
diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route109_SeashoreHouse/border.bin
+++ b/data/layouts/Route109_SeashoreHouse/border.bin
diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc
new file mode 100644
index 000000000..a4c1542ca
--- /dev/null
+++ b/data/layouts/Route109_SeashoreHouse/layout.inc
@@ -0,0 +1,14 @@
+Route109_SeashoreHouse_MapBorder:: @ 82EDF48
+	.incbin "data/layouts/Route109_SeashoreHouse/border.bin"
+
+Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50
+	.incbin "data/layouts/Route109_SeashoreHouse/map.bin"
+
+	.align 2
+Route109_SeashoreHouse_Layout:: @ 82EE07C
+	.4byte 0xf
+	.4byte 0xa
+	.4byte Route109_SeashoreHouse_MapBorder
+	.4byte Route109_SeashoreHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SeashoreHouse
diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/layouts/Route109_SeashoreHouse/map.bin
index cb7853a17..cb7853a17 100644
--- a/data/maps/Route109_SeashoreHouse/map.bin
+++ b/data/layouts/Route109_SeashoreHouse/map.bin
diff --git a/data/maps/Route110/border.bin b/data/layouts/Route110/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route110/border.bin
+++ b/data/layouts/Route110/border.bin
diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc
new file mode 100644
index 000000000..df2399715
--- /dev/null
+++ b/data/layouts/Route110/layout.inc
@@ -0,0 +1,14 @@
+Route110_MapBorder:: @ 829AA1C
+	.incbin "data/layouts/Route110/border.bin"
+
+Route110_MapBlockdata:: @ 829AA24
+	.incbin "data/layouts/Route110/map.bin"
+
+	.align 2
+Route110_Layout:: @ 829C964
+	.4byte 0x28
+	.4byte 0x64
+	.4byte Route110_MapBorder
+	.4byte Route110_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route110/map.bin b/data/layouts/Route110/map.bin
index e10394048..e10394048 100644
--- a/data/maps/Route110/map.bin
+++ b/data/layouts/Route110/map.bin
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc
new file mode 100644
index 000000000..4841f1891
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc
@@ -0,0 +1,14 @@
+Route110_SeasideCyclingRoadEntrace_MapBorder:: @ 82EFB64
+	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin"
+
+Route110_SeasideCyclingRoadEntrace_MapBlockdata:: @ 82EFB6C
+	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin"
+
+	.align 2
+Route110_SeasideCyclingRoadEntrace_Layout:: @ 82EFC20
+	.4byte 0xf
+	.4byte 0x6
+	.4byte Route110_SeasideCyclingRoadEntrace_MapBorder
+	.4byte Route110_SeasideCyclingRoadEntrace_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin
index e9fc770d4..e9fc770d4 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin
diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseEntrance/border.bin
+++ b/data/layouts/Route110_TrickHouseCorridor/border.bin
diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc
new file mode 100644
index 000000000..a85dd2b14
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
+	.incbin "data/layouts/Route110_TrickHouseCorridor/border.bin"
+
+Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C
+	.incbin "data/layouts/Route110_TrickHouseCorridor/map.bin"
+
+	.align 2
+Route110_TrickHouseCorridor_Layout:: @ 82EE52C
+	.4byte 0xf
+	.4byte 0x18
+	.4byte Route110_TrickHouseCorridor_MapBorder
+	.4byte Route110_TrickHouseCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/layouts/Route110_TrickHouseCorridor/map.bin
index 8981d28bd..8981d28bd 100644
--- a/data/maps/Route110_TrickHouseCorridor/map.bin
+++ b/data/layouts/Route110_TrickHouseCorridor/map.bin
diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route112_CableCarStation/border.bin
+++ b/data/layouts/Route110_TrickHouseEnd/border.bin
diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc
new file mode 100644
index 000000000..d0c414069
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEnd/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseEnd_MapBorder:: @ 82EE174
+	.incbin "data/layouts/Route110_TrickHouseEnd/border.bin"
+
+Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C
+	.incbin "data/layouts/Route110_TrickHouseEnd/map.bin"
+
+	.align 2
+Route110_TrickHouseEnd_Layout:: @ 82EE23C
+	.4byte 0xc
+	.4byte 0x8
+	.4byte Route110_TrickHouseEnd_MapBorder
+	.4byte Route110_TrickHouseEnd_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/layouts/Route110_TrickHouseEnd/map.bin
index 506fdb644..506fdb644 100644
--- a/data/maps/Route110_TrickHouseEnd/map.bin
+++ b/data/layouts/Route110_TrickHouseEnd/map.bin
diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route114_FossilManiacsHouse/border.bin
+++ b/data/layouts/Route110_TrickHouseEntrance/border.bin
diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc
new file mode 100644
index 000000000..6ccef43ff
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
+	.incbin "data/layouts/Route110_TrickHouseEntrance/border.bin"
+
+Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C
+	.incbin "data/layouts/Route110_TrickHouseEntrance/map.bin"
+
+	.align 2
+Route110_TrickHouseEntrance_Layout:: @ 82EE15C
+	.4byte 0xc
+	.4byte 0x8
+	.4byte Route110_TrickHouseEntrance_MapBorder
+	.4byte Route110_TrickHouseEntrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/layouts/Route110_TrickHouseEntrance/map.bin
index 1306bb9b5..1306bb9b5 100644
--- a/data/maps/Route110_TrickHouseEntrance/map.bin
+++ b/data/layouts/Route110_TrickHouseEntrance/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle1/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle1/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
new file mode 100644
index 000000000..8ad11d641
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
+	.incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin"
+
+Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C
+	.incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle1_Layout:: @ 82EE7E0
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle1_MapBorder
+	.4byte Route110_TrickHousePuzzle1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/layouts/Route110_TrickHousePuzzle1/map.bin
index c809b7482..c809b7482 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle2/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle2/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
new file mode 100644
index 000000000..a7750390b
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
+	.incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin"
+
+Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800
+	.incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle2_Layout:: @ 82EEA94
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle2_MapBorder
+	.4byte Route110_TrickHousePuzzle2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/layouts/Route110_TrickHousePuzzle2/map.bin
index 819080ced..819080ced 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle3/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle3/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
new file mode 100644
index 000000000..8f49ea03a
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
+	.incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin"
+
+Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4
+	.incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle3_Layout:: @ 82EED48
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle3_MapBorder
+	.4byte Route110_TrickHousePuzzle3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/layouts/Route110_TrickHousePuzzle3/map.bin
index 4dc43a00d..4dc43a00d 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle4/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle4/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
new file mode 100644
index 000000000..20706bed7
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
+	.incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin"
+
+Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68
+	.incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle4_Layout:: @ 82EEFFC
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle4_MapBorder
+	.4byte Route110_TrickHousePuzzle4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/layouts/Route110_TrickHousePuzzle4/map.bin
index e0b8cf33f..e0b8cf33f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle5/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle5/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
new file mode 100644
index 000000000..f01f23322
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
+	.incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin"
+
+Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C
+	.incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle5_Layout:: @ 82EF2B0
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle5_MapBorder
+	.4byte Route110_TrickHousePuzzle5_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/layouts/Route110_TrickHousePuzzle5/map.bin
index a64ea34b6..a64ea34b6 100644
--- a/data/maps/Route110_TrickHousePuzzle5/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle6/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle6/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
new file mode 100644
index 000000000..a49bb680f
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
+	.incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin"
+
+Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0
+	.incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle6_Layout:: @ 82EF564
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle6_MapBorder
+	.4byte Route110_TrickHousePuzzle6_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/layouts/Route110_TrickHousePuzzle6/map.bin
index ec8447889..ec8447889 100644
--- a/data/maps/Route110_TrickHousePuzzle6/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle7/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle7/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
new file mode 100644
index 000000000..dcd1b9367
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
+	.incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin"
+
+Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584
+	.incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle7_Layout:: @ 82EF818
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle7_MapBorder
+	.4byte Route110_TrickHousePuzzle7_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/layouts/Route110_TrickHousePuzzle7/map.bin
index 5859601f6..5859601f6 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle8/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle8/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
new file mode 100644
index 000000000..1c8212684
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
+	.incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin"
+
+Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838
+	.incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle8_Layout:: @ 82EFACC
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle8_MapBorder
+	.4byte Route110_TrickHousePuzzle8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/layouts/Route110_TrickHousePuzzle8/map.bin
index d8c131da6..d8c131da6 100644
--- a/data/maps/Route110_TrickHousePuzzle8/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin
diff --git a/data/maps/Route111/border.bin b/data/layouts/Route111/border.bin
index 4531975c7..4531975c7 100644
--- a/data/maps/Route111/border.bin
+++ b/data/layouts/Route111/border.bin
diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc
new file mode 100644
index 000000000..ff3aa42c4
--- /dev/null
+++ b/data/layouts/Route111/layout.inc
@@ -0,0 +1,14 @@
+Route111_MapBorder:: @ 829C97C
+	.incbin "data/layouts/Route111/border.bin"
+
+Route111_MapBlockdata:: @ 829C984
+	.incbin "data/layouts/Route111/map.bin"
+
+	.align 2
+Route111_Layout:: @ 829F544
+	.4byte 0x28
+	.4byte 0x8c
+	.4byte Route111_MapBorder
+	.4byte Route111_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route111/map.bin b/data/layouts/Route111/map.bin
index 50fc935bd..50fc935bd 100644
--- a/data/maps/Route111/map.bin
+++ b/data/layouts/Route111/map.bin
diff --git a/data/maps/Route112/border.bin b/data/layouts/Route112/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/Route112/border.bin
+++ b/data/layouts/Route112/border.bin
diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc
new file mode 100644
index 000000000..fc7caacb7
--- /dev/null
+++ b/data/layouts/Route112/layout.inc
@@ -0,0 +1,14 @@
+Route112_MapBorder:: @ 829F55C
+	.incbin "data/layouts/Route112/border.bin"
+
+Route112_MapBlockdata:: @ 829F564
+	.incbin "data/layouts/Route112/map.bin"
+
+	.align 2
+Route112_Layout:: @ 82A0824
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte Route112_MapBorder
+	.4byte Route112_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/Route112/map.bin b/data/layouts/Route112/map.bin
index bc194cbc5..bc194cbc5 100644
--- a/data/maps/Route112/map.bin
+++ b/data/layouts/Route112/map.bin
diff --git a/data/maps/Route113/border.bin b/data/layouts/Route113/border.bin
index 73e1e3c60..73e1e3c60 100644
--- a/data/maps/Route113/border.bin
+++ b/data/layouts/Route113/border.bin
diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc
new file mode 100644
index 000000000..f56fc6b9b
--- /dev/null
+++ b/data/layouts/Route113/layout.inc
@@ -0,0 +1,14 @@
+Route113_MapBorder:: @ 82A083C
+	.incbin "data/layouts/Route113/border.bin"
+
+Route113_MapBlockdata:: @ 82A0844
+	.incbin "data/layouts/Route113/map.bin"
+
+	.align 2
+Route113_Layout:: @ 82A17E4
+	.4byte 0x64
+	.4byte 0x14
+	.4byte Route113_MapBorder
+	.4byte Route113_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route113/map.bin b/data/layouts/Route113/map.bin
index 1d6c6b283..1d6c6b283 100644
--- a/data/maps/Route113/map.bin
+++ b/data/layouts/Route113/map.bin
diff --git a/data/maps/Route114/border.bin b/data/layouts/Route114/border.bin
index 23e2a92e5..23e2a92e5 100644
--- a/data/maps/Route114/border.bin
+++ b/data/layouts/Route114/border.bin
diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc
new file mode 100644
index 000000000..440eaf330
--- /dev/null
+++ b/data/layouts/Route114/layout.inc
@@ -0,0 +1,14 @@
+Route114_MapBorder:: @ 82A17FC
+	.incbin "data/layouts/Route114/border.bin"
+
+Route114_MapBlockdata:: @ 82A1804
+	.incbin "data/layouts/Route114/map.bin"
+
+	.align 2
+Route114_Layout:: @ 82A3104
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route114_MapBorder
+	.4byte Route114_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route114/map.bin b/data/layouts/Route114/map.bin
index 0d92450f4..0d92450f4 100644
--- a/data/maps/Route114/map.bin
+++ b/data/layouts/Route114/map.bin
diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route114_LanettesHouse/border.bin
+++ b/data/layouts/Route114_FossilManiacsHouse/border.bin
diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc
new file mode 100644
index 000000000..10011c507
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc
@@ -0,0 +1,14 @@
+Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
+	.incbin "data/layouts/Route114_FossilManiacsHouse/border.bin"
+
+Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C
+	.incbin "data/layouts/Route114_FossilManiacsHouse/map.bin"
+
+	.align 2
+Route114_FossilManiacsHouse_Layout:: @ 82D4ECC
+	.4byte 0xa
+	.4byte 0x8
+	.4byte Route114_FossilManiacsHouse_MapBorder
+	.4byte Route114_FossilManiacsHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/layouts/Route114_FossilManiacsHouse/map.bin
index ea2d94fda..ea2d94fda 100644
--- a/data/maps/Route114_FossilManiacsHouse/map.bin
+++ b/data/layouts/Route114_FossilManiacsHouse/map.bin
diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin
index 580a207f4..580a207f4 100644
--- a/data/maps/Route114_FossilManiacsTunnel/border.bin
+++ b/data/layouts/Route114_FossilManiacsTunnel/border.bin
diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
new file mode 100644
index 000000000..0bd281050
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
@@ -0,0 +1,14 @@
+Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
+	.incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin"
+
+Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC
+	.incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin"
+
+	.align 2
+Route114_FossilManiacsTunnel_Layout:: @ 82D5190
+	.4byte 0xd
+	.4byte 0x1a
+	.4byte Route114_FossilManiacsTunnel_MapBorder
+	.4byte Route114_FossilManiacsTunnel_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/layouts/Route114_FossilManiacsTunnel/map.bin
index 586216000..586216000 100644
--- a/data/maps/Route114_FossilManiacsTunnel/map.bin
+++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin
diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route116_TunnelersRestHouse/border.bin
+++ b/data/layouts/Route114_LanettesHouse/border.bin
diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc
new file mode 100644
index 000000000..2018011c3
--- /dev/null
+++ b/data/layouts/Route114_LanettesHouse/layout.inc
@@ -0,0 +1,14 @@
+Route114_LanettesHouse_MapBorder:: @ 82D51A8
+	.incbin "data/layouts/Route114_LanettesHouse/border.bin"
+
+Route114_LanettesHouse_MapBlockdata:: @ 82D51B0
+	.incbin "data/layouts/Route114_LanettesHouse/map.bin"
+
+	.align 2
+Route114_LanettesHouse_Layout:: @ 82D5260
+	.4byte 0xb
+	.4byte 0x8
+	.4byte Route114_LanettesHouse_MapBorder
+	.4byte Route114_LanettesHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/layouts/Route114_LanettesHouse/map.bin
index de1858be4..de1858be4 100644
--- a/data/maps/Route114_LanettesHouse/map.bin
+++ b/data/layouts/Route114_LanettesHouse/map.bin
diff --git a/data/maps/Route115/border.bin b/data/layouts/Route115/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route115/border.bin
+++ b/data/layouts/Route115/border.bin
diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc
new file mode 100644
index 000000000..fb1b3d99b
--- /dev/null
+++ b/data/layouts/Route115/layout.inc
@@ -0,0 +1,14 @@
+Route115_MapBorder:: @ 82A311C
+	.incbin "data/layouts/Route115/border.bin"
+
+Route115_MapBlockdata:: @ 82A3124
+	.incbin "data/layouts/Route115/map.bin"
+
+	.align 2
+Route115_Layout:: @ 82A4A24
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route115_MapBorder
+	.4byte Route115_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route115/map.bin b/data/layouts/Route115/map.bin
index d6e8e9f1c..d6e8e9f1c 100644
--- a/data/maps/Route115/map.bin
+++ b/data/layouts/Route115/map.bin
diff --git a/data/maps/Route116/border.bin b/data/layouts/Route116/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route116/border.bin
+++ b/data/layouts/Route116/border.bin
diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc
new file mode 100644
index 000000000..d7c24705b
--- /dev/null
+++ b/data/layouts/Route116/layout.inc
@@ -0,0 +1,14 @@
+Route116_MapBorder:: @ 82A4A3C
+	.incbin "data/layouts/Route116/border.bin"
+
+Route116_MapBlockdata:: @ 82A4A44
+	.incbin "data/layouts/Route116/map.bin"
+
+	.align 2
+Route116_Layout:: @ 82A59E4
+	.4byte 0x64
+	.4byte 0x14
+	.4byte Route116_MapBorder
+	.4byte Route116_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/Route116/map.bin b/data/layouts/Route116/map.bin
index 055562dbb..055562dbb 100644
--- a/data/maps/Route116/map.bin
+++ b/data/layouts/Route116/map.bin
diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route119_WeatherInstitute_1F/border.bin
+++ b/data/layouts/Route116_TunnelersRestHouse/border.bin
diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc
new file mode 100644
index 000000000..7a2a6997c
--- /dev/null
+++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc
@@ -0,0 +1,14 @@
+Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
+	.incbin "data/layouts/Route116_TunnelersRestHouse/border.bin"
+
+Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280
+	.incbin "data/layouts/Route116_TunnelersRestHouse/map.bin"
+
+	.align 2
+Route116_TunnelersRestHouse_Layout:: @ 82D5334
+	.4byte 0xa
+	.4byte 0x9
+	.4byte Route116_TunnelersRestHouse_MapBorder
+	.4byte Route116_TunnelersRestHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/layouts/Route116_TunnelersRestHouse/map.bin
index 91e2c2019..91e2c2019 100644
--- a/data/maps/Route116_TunnelersRestHouse/map.bin
+++ b/data/layouts/Route116_TunnelersRestHouse/map.bin
diff --git a/data/maps/Route117/border.bin b/data/layouts/Route117/border.bin
index addb5d6ce..addb5d6ce 100644
--- a/data/maps/Route117/border.bin
+++ b/data/layouts/Route117/border.bin
diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc
new file mode 100644
index 000000000..552c03c84
--- /dev/null
+++ b/data/layouts/Route117/layout.inc
@@ -0,0 +1,14 @@
+Route117_MapBorder:: @ 82A59FC
+	.incbin "data/layouts/Route117/border.bin"
+
+Route117_MapBlockdata:: @ 82A5A04
+	.incbin "data/layouts/Route117/map.bin"
+
+	.align 2
+Route117_Layout:: @ 82A6364
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route117_MapBorder
+	.4byte Route117_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route117/map.bin b/data/layouts/Route117/map.bin
index 9aaa06fef..9aaa06fef 100644
--- a/data/maps/Route117/map.bin
+++ b/data/layouts/Route117/map.bin
diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin
index 7f603e844..7f603e844 100644
--- a/data/maps/Route117_PokemonDayCare/border.bin
+++ b/data/layouts/Route117_PokemonDayCare/border.bin
diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc
new file mode 100644
index 000000000..2fa028a7b
--- /dev/null
+++ b/data/layouts/Route117_PokemonDayCare/layout.inc
@@ -0,0 +1,14 @@
+Route117_PokemonDayCare_MapBorder:: @ 82D534C
+	.incbin "data/layouts/Route117_PokemonDayCare/border.bin"
+
+Route117_PokemonDayCare_MapBlockdata:: @ 82D5354
+	.incbin "data/layouts/Route117_PokemonDayCare/map.bin"
+
+	.align 2
+Route117_PokemonDayCare_Layout:: @ 82D542C
+	.4byte 0xc
+	.4byte 0x9
+	.4byte Route117_PokemonDayCare_MapBorder
+	.4byte Route117_PokemonDayCare_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonDayCare
diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/layouts/Route117_PokemonDayCare/map.bin
index bd4b64e13..bd4b64e13 100644
--- a/data/maps/Route117_PokemonDayCare/map.bin
+++ b/data/layouts/Route117_PokemonDayCare/map.bin
diff --git a/data/maps/Route118/border.bin b/data/layouts/Route118/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route118/border.bin
+++ b/data/layouts/Route118/border.bin
diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc
new file mode 100644
index 000000000..f61ce1f82
--- /dev/null
+++ b/data/layouts/Route118/layout.inc
@@ -0,0 +1,14 @@
+Route118_MapBorder:: @ 82A637C
+	.incbin "data/layouts/Route118/border.bin"
+
+Route118_MapBlockdata:: @ 82A6384
+	.incbin "data/layouts/Route118/map.bin"
+
+	.align 2
+Route118_Layout:: @ 82A7004
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route118_MapBorder
+	.4byte Route118_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route118/map.bin b/data/layouts/Route118/map.bin
index c8b0865d0..c8b0865d0 100644
--- a/data/maps/Route118/map.bin
+++ b/data/layouts/Route118/map.bin
diff --git a/data/maps/Route119/border.bin b/data/layouts/Route119/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route119/border.bin
+++ b/data/layouts/Route119/border.bin
diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc
new file mode 100644
index 000000000..ed5f8777a
--- /dev/null
+++ b/data/layouts/Route119/layout.inc
@@ -0,0 +1,14 @@
+Route119_MapBorder:: @ 82A701C
+	.incbin "data/layouts/Route119/border.bin"
+
+Route119_MapBlockdata:: @ 82A7024
+	.incbin "data/layouts/Route119/map.bin"
+
+	.align 2
+Route119_Layout:: @ 82A9BE4
+	.4byte 0x28
+	.4byte 0x8c
+	.4byte Route119_MapBorder
+	.4byte Route119_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
diff --git a/data/maps/Route119/map.bin b/data/layouts/Route119/map.bin
index cd1c748d9..cd1c748d9 100644
--- a/data/maps/Route119/map.bin
+++ b/data/layouts/Route119/map.bin
diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route119_WeatherInstitute_2F/border.bin
+++ b/data/layouts/Route119_WeatherInstitute_1F/border.bin
diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
new file mode 100644
index 000000000..bc0f92dfe
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
@@ -0,0 +1,14 @@
+Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
+	.incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin"
+
+Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0
+	.incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin"
+
+	.align 2
+Route119_WeatherInstitute_1F_Layout:: @ 82F2CD8
+	.4byte 0x14
+	.4byte 0xd
+	.4byte Route119_WeatherInstitute_1F_MapBorder
+	.4byte Route119_WeatherInstitute_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/layouts/Route119_WeatherInstitute_1F/map.bin
index 07a4e7ebb..07a4e7ebb 100644
--- a/data/maps/Route119_WeatherInstitute_1F/map.bin
+++ b/data/layouts/Route119_WeatherInstitute_1F/map.bin
diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_CuttersHouse/border.bin
+++ b/data/layouts/Route119_WeatherInstitute_2F/border.bin
diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
new file mode 100644
index 000000000..df864d9de
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
@@ -0,0 +1,14 @@
+Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
+	.incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin"
+
+Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8
+	.incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin"
+
+	.align 2
+Route119_WeatherInstitute_2F_Layout:: @ 82F2EB0
+	.4byte 0x14
+	.4byte 0xb
+	.4byte Route119_WeatherInstitute_2F_MapBorder
+	.4byte Route119_WeatherInstitute_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/layouts/Route119_WeatherInstitute_2F/map.bin
index 97953f463..97953f463 100644
--- a/data/maps/Route119_WeatherInstitute_2F/map.bin
+++ b/data/layouts/Route119_WeatherInstitute_2F/map.bin
diff --git a/data/maps/Route120/border.bin b/data/layouts/Route120/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route120/border.bin
+++ b/data/layouts/Route120/border.bin
diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc
new file mode 100644
index 000000000..bc1d57778
--- /dev/null
+++ b/data/layouts/Route120/layout.inc
@@ -0,0 +1,14 @@
+Route120_MapBorder:: @ 82A9BFC
+	.incbin "data/layouts/Route120/border.bin"
+
+Route120_MapBlockdata:: @ 82A9C04
+	.incbin "data/layouts/Route120/map.bin"
+
+	.align 2
+Route120_Layout:: @ 82ABB44
+	.4byte 0x28
+	.4byte 0x64
+	.4byte Route120_MapBorder
+	.4byte Route120_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
diff --git a/data/maps/Route120/map.bin b/data/layouts/Route120/map.bin
index bb98e751c..bb98e751c 100644
--- a/data/maps/Route120/map.bin
+++ b/data/layouts/Route120/map.bin
diff --git a/data/maps/Route121/border.bin b/data/layouts/Route121/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route121/border.bin
+++ b/data/layouts/Route121/border.bin
diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc
new file mode 100644
index 000000000..a65e5c17d
--- /dev/null
+++ b/data/layouts/Route121/layout.inc
@@ -0,0 +1,14 @@
+Route121_MapBorder:: @ 82ABB5C
+	.incbin "data/layouts/Route121/border.bin"
+
+Route121_MapBlockdata:: @ 82ABB64
+	.incbin "data/layouts/Route121/map.bin"
+
+	.align 2
+Route121_Layout:: @ 82AC7E4
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route121_MapBorder
+	.4byte Route121_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/Route121/map.bin b/data/layouts/Route121/map.bin
index 5c5397c0b..5c5397c0b 100644
--- a/data/maps/Route121/map.bin
+++ b/data/layouts/Route121/map.bin
diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route121_SafariZoneEntrance/border.bin
+++ b/data/layouts/Route121_SafariZoneEntrance/border.bin
diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc
new file mode 100644
index 000000000..db083c158
--- /dev/null
+++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc
@@ -0,0 +1,14 @@
+Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
+	.incbin "data/layouts/Route121_SafariZoneEntrance/border.bin"
+
+Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C
+	.incbin "data/layouts/Route121_SafariZoneEntrance/map.bin"
+
+	.align 2
+Route121_SafariZoneEntrance_Layout:: @ 82D5644
+	.4byte 0x12
+	.4byte 0xe
+	.4byte Route121_SafariZoneEntrance_MapBorder
+	.4byte Route121_SafariZoneEntrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/layouts/Route121_SafariZoneEntrance/map.bin
index 35c1badac..35c1badac 100644
--- a/data/maps/Route121_SafariZoneEntrance/map.bin
+++ b/data/layouts/Route121_SafariZoneEntrance/map.bin
diff --git a/data/maps/Route122/border.bin b/data/layouts/Route122/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route122/border.bin
+++ b/data/layouts/Route122/border.bin
diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc
new file mode 100644
index 000000000..ce89713e3
--- /dev/null
+++ b/data/layouts/Route122/layout.inc
@@ -0,0 +1,14 @@
+Route122_MapBorder:: @ 82AC7FC
+	.incbin "data/layouts/Route122/border.bin"
+
+Route122_MapBlockdata:: @ 82AC804
+	.incbin "data/layouts/Route122/map.bin"
+
+	.align 2
+Route122_Layout:: @ 82AD484
+	.4byte 0x28
+	.4byte 0x28
+	.4byte Route122_MapBorder
+	.4byte Route122_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/Route122/map.bin b/data/layouts/Route122/map.bin
index 1c76b0b0a..1c76b0b0a 100644
--- a/data/maps/Route122/map.bin
+++ b/data/layouts/Route122/map.bin
diff --git a/data/maps/Route123/border.bin b/data/layouts/Route123/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route123/border.bin
+++ b/data/layouts/Route123/border.bin
diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc
new file mode 100644
index 000000000..0acdf7008
--- /dev/null
+++ b/data/layouts/Route123/layout.inc
@@ -0,0 +1,14 @@
+Route123_MapBorder:: @ 82AD49C
+	.incbin "data/layouts/Route123/border.bin"
+
+Route123_MapBlockdata:: @ 82AD4A4
+	.incbin "data/layouts/Route123/map.bin"
+
+	.align 2
+Route123_Layout:: @ 82AEA84
+	.4byte 0x8c
+	.4byte 0x14
+	.4byte Route123_MapBorder
+	.4byte Route123_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/Route123/map.bin b/data/layouts/Route123/map.bin
index 9b5573cc5..9b5573cc5 100644
--- a/data/maps/Route123/map.bin
+++ b/data/layouts/Route123/map.bin
diff --git a/data/maps/Route124/border.bin b/data/layouts/Route124/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route124/border.bin
+++ b/data/layouts/Route124/border.bin
diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc
new file mode 100644
index 000000000..dddf9ad05
--- /dev/null
+++ b/data/layouts/Route124/layout.inc
@@ -0,0 +1,14 @@
+Route124_MapBorder:: @ 82AEA9C
+	.incbin "data/layouts/Route124/border.bin"
+
+Route124_MapBlockdata:: @ 82AEAA4
+	.incbin "data/layouts/Route124/map.bin"
+
+	.align 2
+Route124_Layout:: @ 82B1CA4
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route124_MapBorder
+	.4byte Route124_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route124/map.bin b/data/layouts/Route124/map.bin
index 212135178..212135178 100644
--- a/data/maps/Route124/map.bin
+++ b/data/layouts/Route124/map.bin
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
new file mode 100644
index 000000000..31f8a8ebf
--- /dev/null
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
@@ -0,0 +1,14 @@
+Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
+	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin"
+
+Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4
+	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin"
+
+	.align 2
+Route124_DivingTreasureHuntersHouse_Layout:: @ 82FC8A8
+	.4byte 0xa
+	.4byte 0x9
+	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
+	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
index 8f1f6cbef..8f1f6cbef 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
diff --git a/data/maps/Route125/border.bin b/data/layouts/Route125/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route125/border.bin
+++ b/data/layouts/Route125/border.bin
diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc
new file mode 100644
index 000000000..43bb875c9
--- /dev/null
+++ b/data/layouts/Route125/layout.inc
@@ -0,0 +1,14 @@
+Route125_MapBorder:: @ 82B1CBC
+	.incbin "data/layouts/Route125/border.bin"
+
+Route125_MapBlockdata:: @ 82B1CC4
+	.incbin "data/layouts/Route125/map.bin"
+
+	.align 2
+Route125_Layout:: @ 82B35C4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route125_MapBorder
+	.4byte Route125_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route125/map.bin b/data/layouts/Route125/map.bin
index 12dab2a0b..12dab2a0b 100644
--- a/data/maps/Route125/map.bin
+++ b/data/layouts/Route125/map.bin
diff --git a/data/maps/Route126/border.bin b/data/layouts/Route126/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route126/border.bin
+++ b/data/layouts/Route126/border.bin
diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc
new file mode 100644
index 000000000..ad03b109b
--- /dev/null
+++ b/data/layouts/Route126/layout.inc
@@ -0,0 +1,14 @@
+Route126_MapBorder:: @ 82B35DC
+	.incbin "data/layouts/Route126/border.bin"
+
+Route126_MapBlockdata:: @ 82B35E4
+	.incbin "data/layouts/Route126/map.bin"
+
+	.align 2
+Route126_Layout:: @ 82B67E4
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route126_MapBorder
+	.4byte Route126_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route126/map.bin b/data/layouts/Route126/map.bin
index 2d684cf64..2d684cf64 100644
--- a/data/maps/Route126/map.bin
+++ b/data/layouts/Route126/map.bin
diff --git a/data/maps/Route127/border.bin b/data/layouts/Route127/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route127/border.bin
+++ b/data/layouts/Route127/border.bin
diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc
new file mode 100644
index 000000000..dcb0e27bc
--- /dev/null
+++ b/data/layouts/Route127/layout.inc
@@ -0,0 +1,14 @@
+Route127_MapBorder:: @ 82B67FC
+	.incbin "data/layouts/Route127/border.bin"
+
+Route127_MapBlockdata:: @ 82B6804
+	.incbin "data/layouts/Route127/map.bin"
+
+	.align 2
+Route127_Layout:: @ 82B9A04
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route127_MapBorder
+	.4byte Route127_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route127/map.bin b/data/layouts/Route127/map.bin
index 3d4690c18..3d4690c18 100644
--- a/data/maps/Route127/map.bin
+++ b/data/layouts/Route127/map.bin
diff --git a/data/maps/Route128/border.bin b/data/layouts/Route128/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route128/border.bin
+++ b/data/layouts/Route128/border.bin
diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc
new file mode 100644
index 000000000..056baadf4
--- /dev/null
+++ b/data/layouts/Route128/layout.inc
@@ -0,0 +1,14 @@
+Route128_MapBorder:: @ 82B9A1C
+	.incbin "data/layouts/Route128/border.bin"
+
+Route128_MapBlockdata:: @ 82B9A24
+	.incbin "data/layouts/Route128/map.bin"
+
+	.align 2
+Route128_Layout:: @ 82BBFA4
+	.4byte 0x78
+	.4byte 0x28
+	.4byte Route128_MapBorder
+	.4byte Route128_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route128/map.bin b/data/layouts/Route128/map.bin
index fae8a373e..fae8a373e 100644
--- a/data/maps/Route128/map.bin
+++ b/data/layouts/Route128/map.bin
diff --git a/data/maps/Route129/border.bin b/data/layouts/Route129/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route129/border.bin
+++ b/data/layouts/Route129/border.bin
diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc
new file mode 100644
index 000000000..ba264dc1e
--- /dev/null
+++ b/data/layouts/Route129/layout.inc
@@ -0,0 +1,14 @@
+Route129_MapBorder:: @ 82BBFBC
+	.incbin "data/layouts/Route129/border.bin"
+
+Route129_MapBlockdata:: @ 82BBFC4
+	.incbin "data/layouts/Route129/map.bin"
+
+	.align 2
+Route129_Layout:: @ 82BD8C4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route129_MapBorder
+	.4byte Route129_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route129/map.bin b/data/layouts/Route129/map.bin
index 8d09787fd..8d09787fd 100644
--- a/data/maps/Route129/map.bin
+++ b/data/layouts/Route129/map.bin
diff --git a/data/maps/Route130/border.bin b/data/layouts/Route130/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route130/border.bin
+++ b/data/layouts/Route130/border.bin
diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc
new file mode 100644
index 000000000..234824abf
--- /dev/null
+++ b/data/layouts/Route130/layout.inc
@@ -0,0 +1,14 @@
+Route130_MapBorder:: @ 82F0448
+	.incbin "data/layouts/Route130/border.bin"
+
+Route130_MapBlockdata:: @ 82F0450
+	.incbin "data/layouts/Route130/map.bin"
+
+	.align 2
+Route130_Layout:: @ 82F1D50
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route130_MapBorder
+	.4byte Route130_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/Route130/map.bin b/data/layouts/Route130/map.bin
index b06fa74dc..b06fa74dc 100644
--- a/data/maps/Route130/map.bin
+++ b/data/layouts/Route130/map.bin
diff --git a/data/maps/Route131/border.bin b/data/layouts/Route131/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route131/border.bin
+++ b/data/layouts/Route131/border.bin
diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc
new file mode 100644
index 000000000..86467c2d4
--- /dev/null
+++ b/data/layouts/Route131/layout.inc
@@ -0,0 +1,14 @@
+Route131_MapBorder:: @ 82BF1FC
+	.incbin "data/layouts/Route131/border.bin"
+
+Route131_MapBlockdata:: @ 82BF204
+	.incbin "data/layouts/Route131/map.bin"
+
+	.align 2
+Route131_Layout:: @ 82C04C4
+	.4byte 0x3c
+	.4byte 0x28
+	.4byte Route131_MapBorder
+	.4byte Route131_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route131/map.bin b/data/layouts/Route131/map.bin
index ca8079e0f..ca8079e0f 100644
--- a/data/maps/Route131/map.bin
+++ b/data/layouts/Route131/map.bin
diff --git a/data/maps/Route132/border.bin b/data/layouts/Route132/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route132/border.bin
+++ b/data/layouts/Route132/border.bin
diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc
new file mode 100644
index 000000000..f59bbc923
--- /dev/null
+++ b/data/layouts/Route132/layout.inc
@@ -0,0 +1,14 @@
+Route132_MapBorder:: @ 82C04DC
+	.incbin "data/layouts/Route132/border.bin"
+
+Route132_MapBlockdata:: @ 82C04E4
+	.incbin "data/layouts/Route132/map.bin"
+
+	.align 2
+Route132_Layout:: @ 82C1DE4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route132_MapBorder
+	.4byte Route132_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route132/map.bin b/data/layouts/Route132/map.bin
index f122b2865..f122b2865 100644
--- a/data/maps/Route132/map.bin
+++ b/data/layouts/Route132/map.bin
diff --git a/data/maps/Route133/border.bin b/data/layouts/Route133/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route133/border.bin
+++ b/data/layouts/Route133/border.bin
diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc
new file mode 100644
index 000000000..e9be93e17
--- /dev/null
+++ b/data/layouts/Route133/layout.inc
@@ -0,0 +1,14 @@
+Route133_MapBorder:: @ 82C1DFC
+	.incbin "data/layouts/Route133/border.bin"
+
+Route133_MapBlockdata:: @ 82C1E04
+	.incbin "data/layouts/Route133/map.bin"
+
+	.align 2
+Route133_Layout:: @ 82C3704
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route133_MapBorder
+	.4byte Route133_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route133/map.bin b/data/layouts/Route133/map.bin
index dfb44fe81..dfb44fe81 100644
--- a/data/maps/Route133/map.bin
+++ b/data/layouts/Route133/map.bin
diff --git a/data/maps/Route134/border.bin b/data/layouts/Route134/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route134/border.bin
+++ b/data/layouts/Route134/border.bin
diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc
new file mode 100644
index 000000000..91e9cab8a
--- /dev/null
+++ b/data/layouts/Route134/layout.inc
@@ -0,0 +1,14 @@
+Route134_MapBorder:: @ 82C371C
+	.incbin "data/layouts/Route134/border.bin"
+
+Route134_MapBlockdata:: @ 82C3724
+	.incbin "data/layouts/Route134/map.bin"
+
+	.align 2
+Route134_Layout:: @ 82C5024
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route134_MapBorder
+	.4byte Route134_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route134/map.bin b/data/layouts/Route134/map.bin
index fbb491539..fbb491539 100644
--- a/data/maps/Route134/map.bin
+++ b/data/layouts/Route134/map.bin
diff --git a/data/maps/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/RustboroCity/border.bin
+++ b/data/layouts/RustboroCity/border.bin
diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc
new file mode 100644
index 000000000..7f37d8f74
--- /dev/null
+++ b/data/layouts/RustboroCity/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_MapBorder:: @ 82892CC
+	.incbin "data/layouts/RustboroCity/border.bin"
+
+RustboroCity_MapBlockdata:: @ 82892D4
+	.incbin "data/layouts/RustboroCity/map.bin"
+
+	.align 2
+RustboroCity_Layout:: @ 828A594
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte RustboroCity_MapBorder
+	.4byte RustboroCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin
index d8921ec3f..d8921ec3f 100644
--- a/data/maps/RustboroCity/map.bin
+++ b/data/layouts/RustboroCity/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/border.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc
new file mode 100644
index 000000000..c13b660d9
--- /dev/null
+++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
+	.incbin "data/layouts/RustboroCity_CuttersHouse/border.bin"
+
+RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4
+	.incbin "data/layouts/RustboroCity_CuttersHouse/map.bin"
+
+	.align 2
+RustboroCity_CuttersHouse_Layout:: @ 82D1ABC
+	.4byte 0xb
+	.4byte 0x9
+	.4byte RustboroCity_CuttersHouse_MapBorder
+	.4byte RustboroCity_CuttersHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin
index 5515d00cf..5515d00cf 100644
--- a/data/maps/RustboroCity_CuttersHouse/map.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
new file mode 100644
index 000000000..d5c85b2a6
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
+	.incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin"
+
+RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230
+	.incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_1F_Layout:: @ 82D1388
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_1F_MapBorder
+	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
index 78cc0c199..78cc0c199 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
new file mode 100644
index 000000000..aa13c9810
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
+	.incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin"
+
+RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8
+	.incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_2F_Layout:: @ 82D1500
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_2F_MapBorder
+	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
index 03985c572..03985c572 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat1_1F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
new file mode 100644
index 000000000..b033a84f1
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
+	.incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin"
+
+RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770
+	.incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_3F_Layout:: @ 82F28C8
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_3F_MapBorder
+	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
index 8333a8bc3..8333a8bc3 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat1_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc
new file mode 100644
index 000000000..449157295
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
+	.incbin "data/layouts/RustboroCity_Flat1_1F/border.bin"
+
+RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4
+	.incbin "data/layouts/RustboroCity_Flat1_1F/map.bin"
+
+	.align 2
+RustboroCity_Flat1_1F_Layout:: @ 82FF994
+	.4byte 0xe
+	.4byte 0x8
+	.4byte RustboroCity_Flat1_1F_MapBorder
+	.4byte RustboroCity_Flat1_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin
index 017298e71..017298e71 100644
--- a/data/maps/RustboroCity_Flat1_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_1F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc
new file mode 100644
index 000000000..804f8af4f
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
+	.incbin "data/layouts/RustboroCity_Flat1_2F/border.bin"
+
+RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4
+	.incbin "data/layouts/RustboroCity_Flat1_2F/map.bin"
+
+	.align 2
+RustboroCity_Flat1_2F_Layout:: @ 82FFA94
+	.4byte 0xe
+	.4byte 0x8
+	.4byte RustboroCity_Flat1_2F_MapBorder
+	.4byte RustboroCity_Flat1_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin
index 17a611343..17a611343 100644
--- a/data/maps/RustboroCity_Flat1_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc
new file mode 100644
index 000000000..8f25d160e
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
+	.incbin "data/layouts/RustboroCity_Flat2_1F/border.bin"
+
+RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000
+	.incbin "data/layouts/RustboroCity_Flat2_1F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_1F_Layout:: @ 82FC0FC
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_1F_MapBorder
+	.4byte RustboroCity_Flat2_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin
index 0f6829f9c..0f6829f9c 100644
--- a/data/maps/RustboroCity_Flat2_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_3F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc
new file mode 100644
index 000000000..3d08ed34e
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
+	.incbin "data/layouts/RustboroCity_Flat2_2F/border.bin"
+
+RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C
+	.incbin "data/layouts/RustboroCity_Flat2_2F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_2F_Layout:: @ 82FC218
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_2F_MapBorder
+	.4byte RustboroCity_Flat2_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin
index 9f3750fb4..9f3750fb4 100644
--- a/data/maps/RustboroCity_Flat2_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
diff --git a/data/maps/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_House1/border.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc
new file mode 100644
index 000000000..c4b09da1c
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
+	.incbin "data/layouts/RustboroCity_Flat2_3F/border.bin"
+
+RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238
+	.incbin "data/layouts/RustboroCity_Flat2_3F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_3F_Layout:: @ 82FC334
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_3F_MapBorder
+	.4byte RustboroCity_Flat2_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin
index 2112fe799..2112fe799 100644
--- a/data/maps/RustboroCity_Flat2_3F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/RustboroCity_Gym/border.bin
+++ b/data/layouts/RustboroCity_Gym/border.bin
diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc
new file mode 100644
index 000000000..5c17a62ef
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Gym_MapBorder:: @ 82D1518
+	.incbin "data/layouts/RustboroCity_Gym/border.bin"
+
+RustboroCity_Gym_MapBlockdata:: @ 82D1520
+	.incbin "data/layouts/RustboroCity_Gym/map.bin"
+
+	.align 2
+RustboroCity_Gym_Layout:: @ 82D16C4
+	.4byte 0xb
+	.4byte 0x13
+	.4byte RustboroCity_Gym_MapBorder
+	.4byte RustboroCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_RustboroGym
diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/layouts/RustboroCity_Gym/map.bin
index bc69d8879..bc69d8879 100644
--- a/data/maps/RustboroCity_Gym/map.bin
+++ b/data/layouts/RustboroCity_Gym/map.bin
diff --git a/data/maps/RustboroCity_House2/border.bin b/data/layouts/RustboroCity_House/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_House2/border.bin
+++ b/data/layouts/RustboroCity_House/border.bin
diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc
new file mode 100644
index 000000000..9d523190e
--- /dev/null
+++ b/data/layouts/RustboroCity_House/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_House_MapBorder:: @ 82D1804
+	.incbin "data/layouts/RustboroCity_House/border.bin"
+
+RustboroCity_House_MapBlockdata:: @ 82D180C
+	.incbin "data/layouts/RustboroCity_House/map.bin"
+
+	.align 2
+RustboroCity_House_Layout:: @ 82D18E4
+	.4byte 0xc
+	.4byte 0x9
+	.4byte RustboroCity_House_MapBorder
+	.4byte RustboroCity_House_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_House2/map.bin b/data/layouts/RustboroCity_House/map.bin
index 5a53bbc77..5a53bbc77 100644
--- a/data/maps/RustboroCity_House2/map.bin
+++ b/data/layouts/RustboroCity_House/map.bin
diff --git a/data/maps/SSTidalCorridor/border.bin b/data/layouts/RustboroCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalCorridor/border.bin
+++ b/data/layouts/RustboroCity_House1/border.bin
diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc
new file mode 100644
index 000000000..8635c91af
--- /dev/null
+++ b/data/layouts/RustboroCity_House1/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_House1_MapBorder:: @ 82D18FC
+	.incbin "data/layouts/RustboroCity_House1/border.bin"
+
+RustboroCity_House1_MapBlockdata:: @ 82D1904
+	.incbin "data/layouts/RustboroCity_House1/map.bin"
+
+	.align 2
+RustboroCity_House1_Layout:: @ 82D19D4
+	.4byte 0xd
+	.4byte 0x8
+	.4byte RustboroCity_House1_MapBorder
+	.4byte RustboroCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_House1/map.bin b/data/layouts/RustboroCity_House1/map.bin
index a14fc0405..a14fc0405 100644
--- a/data/maps/RustboroCity_House1/map.bin
+++ b/data/layouts/RustboroCity_House1/map.bin
diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin
index 8f857616b..8f857616b 100644
--- a/data/maps/RustboroCity_PokemonSchool/border.bin
+++ b/data/layouts/RustboroCity_PokemonSchool/border.bin
diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc
new file mode 100644
index 000000000..7c284c712
--- /dev/null
+++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
+	.incbin "data/layouts/RustboroCity_PokemonSchool/border.bin"
+
+RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4
+	.incbin "data/layouts/RustboroCity_PokemonSchool/map.bin"
+
+	.align 2
+RustboroCity_PokemonSchool_Layout:: @ 82D17EC
+	.4byte 0xc
+	.4byte 0xb
+	.4byte RustboroCity_PokemonSchool_MapBorder
+	.4byte RustboroCity_PokemonSchool_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonSchool
diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/layouts/RustboroCity_PokemonSchool/map.bin
index 3f3b183d3..3f3b183d3 100644
--- a/data/maps/RustboroCity_PokemonSchool/map.bin
+++ b/data/layouts/RustboroCity_PokemonSchool/map.bin
diff --git a/data/maps/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/RusturfTunnel/border.bin
+++ b/data/layouts/RusturfTunnel/border.bin
diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc
new file mode 100644
index 000000000..94e2c858b
--- /dev/null
+++ b/data/layouts/RusturfTunnel/layout.inc
@@ -0,0 +1,14 @@
+RusturfTunnel_MapBorder:: @ 82D725C
+	.incbin "data/layouts/RusturfTunnel/border.bin"
+
+RusturfTunnel_MapBlockdata:: @ 82D7264
+	.incbin "data/layouts/RusturfTunnel/map.bin"
+
+	.align 2
+RusturfTunnel_Layout:: @ 82D7924
+	.4byte 0x24
+	.4byte 0x18
+	.4byte RusturfTunnel_MapBorder
+	.4byte RusturfTunnel_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_RusturfTunnel
diff --git a/data/maps/RusturfTunnel/map.bin b/data/layouts/RusturfTunnel/map.bin
index 87ce9bc73..87ce9bc73 100644
--- a/data/maps/RusturfTunnel/map.bin
+++ b/data/layouts/RusturfTunnel/map.bin
diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalCorridor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalLowerDeck/border.bin
+++ b/data/layouts/SSTidalCorridor/border.bin
diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc
new file mode 100644
index 000000000..7e6ce5d5e
--- /dev/null
+++ b/data/layouts/SSTidalCorridor/layout.inc
@@ -0,0 +1,14 @@
+SSTidalCorridor_MapBorder:: @ 82F63F8
+	.incbin "data/layouts/SSTidalCorridor/border.bin"
+
+SSTidalCorridor_MapBlockdata:: @ 82F6400
+	.incbin "data/layouts/SSTidalCorridor/map.bin"
+
+	.align 2
+SSTidalCorridor_Layout:: @ 82F65D4
+	.4byte 0x12
+	.4byte 0xd
+	.4byte SSTidalCorridor_MapBorder
+	.4byte SSTidalCorridor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/SSTidalCorridor/map.bin b/data/layouts/SSTidalCorridor/map.bin
index f8cf1725d..f8cf1725d 100644
--- a/data/maps/SSTidalCorridor/map.bin
+++ b/data/layouts/SSTidalCorridor/map.bin
diff --git a/data/maps/SSTidalRooms/border.bin b/data/layouts/SSTidalLowerDeck/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalRooms/border.bin
+++ b/data/layouts/SSTidalLowerDeck/border.bin
diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc
new file mode 100644
index 000000000..5054d8c1d
--- /dev/null
+++ b/data/layouts/SSTidalLowerDeck/layout.inc
@@ -0,0 +1,14 @@
+SSTidalLowerDeck_MapBorder:: @ 82F65EC
+	.incbin "data/layouts/SSTidalLowerDeck/border.bin"
+
+SSTidalLowerDeck_MapBlockdata:: @ 82F65F4
+	.incbin "data/layouts/SSTidalLowerDeck/map.bin"
+
+	.align 2
+SSTidalLowerDeck_Layout:: @ 82F67B0
+	.4byte 0x11
+	.4byte 0xd
+	.4byte SSTidalLowerDeck_MapBorder
+	.4byte SSTidalLowerDeck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/layouts/SSTidalLowerDeck/map.bin
index 059ce30fe..059ce30fe 100644
--- a/data/maps/SSTidalLowerDeck/map.bin
+++ b/data/layouts/SSTidalLowerDeck/map.bin
diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/layouts/SSTidalRooms/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SingleBattleColosseum/border.bin
+++ b/data/layouts/SSTidalRooms/border.bin
diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc
new file mode 100644
index 000000000..cbfe5ba5c
--- /dev/null
+++ b/data/layouts/SSTidalRooms/layout.inc
@@ -0,0 +1,14 @@
+SSTidalRooms_MapBorder:: @ 82F67C8
+	.incbin "data/layouts/SSTidalRooms/border.bin"
+
+SSTidalRooms_MapBlockdata:: @ 82F67D0
+	.incbin "data/layouts/SSTidalRooms/map.bin"
+
+	.align 2
+SSTidalRooms_Layout:: @ 82F6CE0
+	.4byte 0x24
+	.4byte 0x12
+	.4byte SSTidalRooms_MapBorder
+	.4byte SSTidalRooms_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/SSTidalRooms/map.bin b/data/layouts/SSTidalRooms/map.bin
index 6103ad0c2..6103ad0c2 100644
--- a/data/maps/SSTidalRooms/map.bin
+++ b/data/layouts/SSTidalRooms/map.bin
diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Northeast/border.bin
+++ b/data/layouts/SafariZone_Northeast/border.bin
diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc
new file mode 100644
index 000000000..9fa27626e
--- /dev/null
+++ b/data/layouts/SafariZone_Northeast/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Northeast_MapBorder:: @ 82EAD80
+	.incbin "data/layouts/SafariZone_Northeast/border.bin"
+
+SafariZone_Northeast_MapBlockdata:: @ 82EAD88
+	.incbin "data/layouts/SafariZone_Northeast/map.bin"
+
+	.align 2
+SafariZone_Northeast_Layout:: @ 82EBA08
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Northeast_MapBorder
+	.4byte SafariZone_Northeast_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/layouts/SafariZone_Northeast/map.bin
index d5e7fd825..d5e7fd825 100644
--- a/data/maps/SafariZone_Northeast/map.bin
+++ b/data/layouts/SafariZone_Northeast/map.bin
diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Northwest/border.bin
+++ b/data/layouts/SafariZone_Northwest/border.bin
diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc
new file mode 100644
index 000000000..b3a82fd0f
--- /dev/null
+++ b/data/layouts/SafariZone_Northwest/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Northwest_MapBorder:: @ 82EA0E0
+	.incbin "data/layouts/SafariZone_Northwest/border.bin"
+
+SafariZone_Northwest_MapBlockdata:: @ 82EA0E8
+	.incbin "data/layouts/SafariZone_Northwest/map.bin"
+
+	.align 2
+SafariZone_Northwest_Layout:: @ 82EAD68
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Northwest_MapBorder
+	.4byte SafariZone_Northwest_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/layouts/SafariZone_Northwest/map.bin
index 1825a1c92..1825a1c92 100644
--- a/data/maps/SafariZone_Northwest/map.bin
+++ b/data/layouts/SafariZone_Northwest/map.bin
diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SafariZone_RestHouse/border.bin
+++ b/data/layouts/SafariZone_RestHouse/border.bin
diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc
new file mode 100644
index 000000000..127289873
--- /dev/null
+++ b/data/layouts/SafariZone_RestHouse/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_RestHouse_MapBorder:: @ 830476C
+	.incbin "data/layouts/SafariZone_RestHouse/border.bin"
+
+SafariZone_RestHouse_MapBlockdata:: @ 8304774
+	.incbin "data/layouts/SafariZone_RestHouse/map.bin"
+
+	.align 2
+SafariZone_RestHouse_Layout:: @ 8304828
+	.4byte 0xa
+	.4byte 0x9
+	.4byte SafariZone_RestHouse_MapBorder
+	.4byte SafariZone_RestHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/layouts/SafariZone_RestHouse/map.bin
index c57c99c7b..c57c99c7b 100644
--- a/data/maps/SafariZone_RestHouse/map.bin
+++ b/data/layouts/SafariZone_RestHouse/map.bin
diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Southeast/border.bin
+++ b/data/layouts/SafariZone_Southeast/border.bin
diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc
new file mode 100644
index 000000000..8893cb6a1
--- /dev/null
+++ b/data/layouts/SafariZone_Southeast/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Southeast_MapBorder:: @ 82EC6C0
+	.incbin "data/layouts/SafariZone_Southeast/border.bin"
+
+SafariZone_Southeast_MapBlockdata:: @ 82EC6C8
+	.incbin "data/layouts/SafariZone_Southeast/map.bin"
+
+	.align 2
+SafariZone_Southeast_Layout:: @ 82ED348
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Southeast_MapBorder
+	.4byte SafariZone_Southeast_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/layouts/SafariZone_Southeast/map.bin
index 540798144..540798144 100644
--- a/data/maps/SafariZone_Southeast/map.bin
+++ b/data/layouts/SafariZone_Southeast/map.bin
diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Southwest/border.bin
+++ b/data/layouts/SafariZone_Southwest/border.bin
diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc
new file mode 100644
index 000000000..58f199ac6
--- /dev/null
+++ b/data/layouts/SafariZone_Southwest/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Southwest_MapBorder:: @ 82EBA20
+	.incbin "data/layouts/SafariZone_Southwest/border.bin"
+
+SafariZone_Southwest_MapBlockdata:: @ 82EBA28
+	.incbin "data/layouts/SafariZone_Southwest/map.bin"
+
+	.align 2
+SafariZone_Southwest_Layout:: @ 82EC6A8
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Southwest_MapBorder
+	.4byte SafariZone_Southwest_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/layouts/SafariZone_Southwest/map.bin
index 0074b6e55..0074b6e55 100644
--- a/data/maps/SafariZone_Southwest/map.bin
+++ b/data/layouts/SafariZone_Southwest/map.bin
diff --git a/data/maps/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ScorchedSlab/border.bin
+++ b/data/layouts/ScorchedSlab/border.bin
diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc
new file mode 100644
index 000000000..52d172a89
--- /dev/null
+++ b/data/layouts/ScorchedSlab/layout.inc
@@ -0,0 +1,14 @@
+ScorchedSlab_MapBorder:: @ 82FF340
+	.incbin "data/layouts/ScorchedSlab/border.bin"
+
+ScorchedSlab_MapBlockdata:: @ 82FF348
+	.incbin "data/layouts/ScorchedSlab/map.bin"
+
+	.align 2
+ScorchedSlab_Layout:: @ 82FF5A0
+	.4byte 0xf
+	.4byte 0x14
+	.4byte ScorchedSlab_MapBorder
+	.4byte ScorchedSlab_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ScorchedSlab/map.bin b/data/layouts/ScorchedSlab/map.bin
index edbd982ee..edbd982ee 100644
--- a/data/maps/ScorchedSlab/map.bin
+++ b/data/layouts/ScorchedSlab/map.bin
diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Entrance/border.bin
+++ b/data/layouts/SeafloorCavern_Entrance/border.bin
diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc
new file mode 100644
index 000000000..bfdb7cdbd
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Entrance/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
+	.incbin "data/layouts/SeafloorCavern_Entrance/border.bin"
+
+SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8
+	.incbin "data/layouts/SeafloorCavern_Entrance/map.bin"
+
+	.align 2
+SeafloorCavern_Entrance_Layout:: @ 82DD6F8
+	.4byte 0x14
+	.4byte 0x14
+	.4byte SeafloorCavern_Entrance_MapBorder
+	.4byte SeafloorCavern_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/layouts/SeafloorCavern_Entrance/map.bin
index 3861044dd..3861044dd 100644
--- a/data/maps/SeafloorCavern_Entrance/map.bin
+++ b/data/layouts/SeafloorCavern_Entrance/map.bin
diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room1/border.bin
+++ b/data/layouts/SeafloorCavern_Room1/border.bin
diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc
new file mode 100644
index 000000000..3ebfd886f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room1/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room1_MapBorder:: @ 82DD710
+	.incbin "data/layouts/SeafloorCavern_Room1/border.bin"
+
+SeafloorCavern_Room1_MapBlockdata:: @ 82DD718
+	.incbin "data/layouts/SeafloorCavern_Room1/map.bin"
+
+	.align 2
+SeafloorCavern_Room1_Layout:: @ 82DDA60
+	.4byte 0x14
+	.4byte 0x15
+	.4byte SeafloorCavern_Room1_MapBorder
+	.4byte SeafloorCavern_Room1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/layouts/SeafloorCavern_Room1/map.bin
index 57cd82f78..57cd82f78 100644
--- a/data/maps/SeafloorCavern_Room1/map.bin
+++ b/data/layouts/SeafloorCavern_Room1/map.bin
diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room2/border.bin
+++ b/data/layouts/SeafloorCavern_Room2/border.bin
diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc
new file mode 100644
index 000000000..86a7134ed
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room2_MapBorder:: @ 82DDA78
+	.incbin "data/layouts/SeafloorCavern_Room2/border.bin"
+
+SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80
+	.incbin "data/layouts/SeafloorCavern_Room2/map.bin"
+
+	.align 2
+SeafloorCavern_Room2_Layout:: @ 82DDD74
+	.4byte 0x12
+	.4byte 0x15
+	.4byte SeafloorCavern_Room2_MapBorder
+	.4byte SeafloorCavern_Room2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/layouts/SeafloorCavern_Room2/map.bin
index 01b66f2f3..01b66f2f3 100644
--- a/data/maps/SeafloorCavern_Room2/map.bin
+++ b/data/layouts/SeafloorCavern_Room2/map.bin
diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room3/border.bin
+++ b/data/layouts/SeafloorCavern_Room3/border.bin
diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc
new file mode 100644
index 000000000..0e660f4f3
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
+	.incbin "data/layouts/SeafloorCavern_Room3/border.bin"
+
+SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94
+	.incbin "data/layouts/SeafloorCavern_Room3/map.bin"
+
+	.align 2
+SeafloorCavern_Room3_Layout:: @ 82DDFB4
+	.4byte 0x10
+	.4byte 0x11
+	.4byte SeafloorCavern_Room3_MapBorder
+	.4byte SeafloorCavern_Room3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/layouts/SeafloorCavern_Room3/map.bin
index b5e92ca20..b5e92ca20 100644
--- a/data/maps/SeafloorCavern_Room3/map.bin
+++ b/data/layouts/SeafloorCavern_Room3/map.bin
diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room4/border.bin
+++ b/data/layouts/SeafloorCavern_Room4/border.bin
diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc
new file mode 100644
index 000000000..013e2d74e
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room4/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
+	.incbin "data/layouts/SeafloorCavern_Room4/border.bin"
+
+SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4
+	.incbin "data/layouts/SeafloorCavern_Room4/map.bin"
+
+	.align 2
+SeafloorCavern_Room4_Layout:: @ 82DE280
+	.4byte 0x12
+	.4byte 0x13
+	.4byte SeafloorCavern_Room4_MapBorder
+	.4byte SeafloorCavern_Room4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/layouts/SeafloorCavern_Room4/map.bin
index 928749c95..928749c95 100644
--- a/data/maps/SeafloorCavern_Room4/map.bin
+++ b/data/layouts/SeafloorCavern_Room4/map.bin
diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room5/border.bin
+++ b/data/layouts/SeafloorCavern_Room5/border.bin
diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc
new file mode 100644
index 000000000..ede193527
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room5/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room5_MapBorder:: @ 82DE298
+	.incbin "data/layouts/SeafloorCavern_Room5/border.bin"
+
+SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0
+	.incbin "data/layouts/SeafloorCavern_Room5/map.bin"
+
+	.align 2
+SeafloorCavern_Room5_Layout:: @ 82DE5C0
+	.4byte 0x14
+	.4byte 0x14
+	.4byte SeafloorCavern_Room5_MapBorder
+	.4byte SeafloorCavern_Room5_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/layouts/SeafloorCavern_Room5/map.bin
index 386430fe4..386430fe4 100644
--- a/data/maps/SeafloorCavern_Room5/map.bin
+++ b/data/layouts/SeafloorCavern_Room5/map.bin
diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin
index a00c39057..a00c39057 100644
--- a/data/maps/SeafloorCavern_Room6/border.bin
+++ b/data/layouts/SeafloorCavern_Room6/border.bin
diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc
new file mode 100644
index 000000000..0b6b1026e
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
+	.incbin "data/layouts/SeafloorCavern_Room6/border.bin"
+
+SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0
+	.incbin "data/layouts/SeafloorCavern_Room6/map.bin"
+
+	.align 2
+SeafloorCavern_Room6_Layout:: @ 82DEA30
+	.4byte 0x18
+	.4byte 0x17
+	.4byte SeafloorCavern_Room6_MapBorder
+	.4byte SeafloorCavern_Room6_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/layouts/SeafloorCavern_Room6/map.bin
index 3776cc4c7..3776cc4c7 100644
--- a/data/maps/SeafloorCavern_Room6/map.bin
+++ b/data/layouts/SeafloorCavern_Room6/map.bin
diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin
index a00c39057..a00c39057 100644
--- a/data/maps/SeafloorCavern_Room7/border.bin
+++ b/data/layouts/SeafloorCavern_Room7/border.bin
diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc
new file mode 100644
index 000000000..c4d799bfd
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room7_MapBorder:: @ 82DEA48
+	.incbin "data/layouts/SeafloorCavern_Room7/border.bin"
+
+SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50
+	.incbin "data/layouts/SeafloorCavern_Room7/map.bin"
+
+	.align 2
+SeafloorCavern_Room7_Layout:: @ 82DEED0
+	.4byte 0x17
+	.4byte 0x19
+	.4byte SeafloorCavern_Room7_MapBorder
+	.4byte SeafloorCavern_Room7_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/layouts/SeafloorCavern_Room7/map.bin
index c1afaebcf..c1afaebcf 100644
--- a/data/maps/SeafloorCavern_Room7/map.bin
+++ b/data/layouts/SeafloorCavern_Room7/map.bin
diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room8/border.bin
+++ b/data/layouts/SeafloorCavern_Room8/border.bin
diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc
new file mode 100644
index 000000000..3c5ba6912
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room8/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
+	.incbin "data/layouts/SeafloorCavern_Room8/border.bin"
+
+SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0
+	.incbin "data/layouts/SeafloorCavern_Room8/map.bin"
+
+	.align 2
+SeafloorCavern_Room8_Layout:: @ 82DF024
+	.4byte 0xb
+	.4byte 0xe
+	.4byte SeafloorCavern_Room8_MapBorder
+	.4byte SeafloorCavern_Room8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/layouts/SeafloorCavern_Room8/map.bin
index e70e95b47..e70e95b47 100644
--- a/data/maps/SeafloorCavern_Room8/map.bin
+++ b/data/layouts/SeafloorCavern_Room8/map.bin
diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room9/border.bin
+++ b/data/layouts/SeafloorCavern_Room9/border.bin
diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc
new file mode 100644
index 000000000..c0cf63b78
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room9_MapBorder:: @ 82DF03C
+	.incbin "data/layouts/SeafloorCavern_Room9/border.bin"
+
+SeafloorCavern_Room9_MapBlockdata:: @ 82DF044
+	.incbin "data/layouts/SeafloorCavern_Room9/map.bin"
+
+	.align 2
+SeafloorCavern_Room9_Layout:: @ 82DF9F8
+	.4byte 0x1b
+	.4byte 0x2e
+	.4byte SeafloorCavern_Room9_MapBorder
+	.4byte SeafloorCavern_Room9_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/layouts/SeafloorCavern_Room9/map.bin
index 252112ac2..252112ac2 100644
--- a/data/maps/SeafloorCavern_Room9/map.bin
+++ b/data/layouts/SeafloorCavern_Room9/map.bin
diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/SealedChamber_InnerRoom/border.bin
+++ b/data/layouts/SealedChamber_InnerRoom/border.bin
diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc
new file mode 100644
index 000000000..2bd90e419
--- /dev/null
+++ b/data/layouts/SealedChamber_InnerRoom/layout.inc
@@ -0,0 +1,14 @@
+SealedChamber_InnerRoom_MapBorder:: @ 82FE698
+	.incbin "data/layouts/SealedChamber_InnerRoom/border.bin"
+
+SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0
+	.incbin "data/layouts/SealedChamber_InnerRoom/map.bin"
+
+	.align 2
+SealedChamber_InnerRoom_Layout:: @ 82FEA68
+	.4byte 0x15
+	.4byte 0x17
+	.4byte SealedChamber_InnerRoom_MapBorder
+	.4byte SealedChamber_InnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/layouts/SealedChamber_InnerRoom/map.bin
index 823fa5fab..823fa5fab 100644
--- a/data/maps/SealedChamber_InnerRoom/map.bin
+++ b/data/layouts/SealedChamber_InnerRoom/map.bin
diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/SealedChamber_OuterRoom/border.bin
+++ b/data/layouts/SealedChamber_OuterRoom/border.bin
diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc
new file mode 100644
index 000000000..f248eff53
--- /dev/null
+++ b/data/layouts/SealedChamber_OuterRoom/layout.inc
@@ -0,0 +1,14 @@
+SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
+	.incbin "data/layouts/SealedChamber_OuterRoom/border.bin"
+
+SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0
+	.incbin "data/layouts/SealedChamber_OuterRoom/map.bin"
+
+	.align 2
+SealedChamber_OuterRoom_Layout:: @ 82F83B8
+	.4byte 0x15
+	.4byte 0x17
+	.4byte SealedChamber_OuterRoom_MapBorder
+	.4byte SealedChamber_OuterRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/layouts/SealedChamber_OuterRoom/map.bin
index bf1482f97..bf1482f97 100644
--- a/data/maps/SealedChamber_OuterRoom/map.bin
+++ b/data/layouts/SealedChamber_OuterRoom/map.bin
diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave1/border.bin
+++ b/data/layouts/SecretBase_BlueCave1/border.bin
diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc
new file mode 100644
index 000000000..e07296cc3
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave1_MapBorder:: @ 82E7888
+	.incbin "data/layouts/SecretBase_BlueCave1/border.bin"
+
+SecretBase_BlueCave1_MapBlockdata:: @ 82E7890
+	.incbin "data/layouts/SecretBase_BlueCave1/map.bin"
+
+	.align 2
+SecretBase_BlueCave1_Layout:: @ 82E7958
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_BlueCave1_MapBorder
+	.4byte SecretBase_BlueCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/layouts/SecretBase_BlueCave1/map.bin
index 371b2a8d5..371b2a8d5 100644
--- a/data/maps/SecretBase_BlueCave1/map.bin
+++ b/data/layouts/SecretBase_BlueCave1/map.bin
diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave2/border.bin
+++ b/data/layouts/SecretBase_BlueCave2/border.bin
diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc
new file mode 100644
index 000000000..2bed0ca4f
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave2_MapBorder:: @ 82E7E44
+	.incbin "data/layouts/SecretBase_BlueCave2/border.bin"
+
+SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C
+	.incbin "data/layouts/SecretBase_BlueCave2/map.bin"
+
+	.align 2
+SecretBase_BlueCave2_Layout:: @ 82E7F20
+	.4byte 0xf
+	.4byte 0x7
+	.4byte SecretBase_BlueCave2_MapBorder
+	.4byte SecretBase_BlueCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/layouts/SecretBase_BlueCave2/map.bin
index 4993e5b65..4993e5b65 100644
--- a/data/maps/SecretBase_BlueCave2/map.bin
+++ b/data/layouts/SecretBase_BlueCave2/map.bin
diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave3/border.bin
+++ b/data/layouts/SecretBase_BlueCave3/border.bin
diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc
new file mode 100644
index 000000000..ef34dff34
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave3_MapBorder:: @ 82E84C4
+	.incbin "data/layouts/SecretBase_BlueCave3/border.bin"
+
+SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC
+	.incbin "data/layouts/SecretBase_BlueCave3/map.bin"
+
+	.align 2
+SecretBase_BlueCave3_Layout:: @ 82E8620
+	.4byte 0xa
+	.4byte 0x11
+	.4byte SecretBase_BlueCave3_MapBorder
+	.4byte SecretBase_BlueCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/layouts/SecretBase_BlueCave3/map.bin
index 968aade07..968aade07 100644
--- a/data/maps/SecretBase_BlueCave3/map.bin
+++ b/data/layouts/SecretBase_BlueCave3/map.bin
diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave4/border.bin
+++ b/data/layouts/SecretBase_BlueCave4/border.bin
diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc
new file mode 100644
index 000000000..b05de46b6
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave4_MapBorder:: @ 82E8C70
+	.incbin "data/layouts/SecretBase_BlueCave4/border.bin"
+
+SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78
+	.incbin "data/layouts/SecretBase_BlueCave4/map.bin"
+
+	.align 2
+SecretBase_BlueCave4_Layout:: @ 82E8DAC
+	.4byte 0x9
+	.4byte 0x11
+	.4byte SecretBase_BlueCave4_MapBorder
+	.4byte SecretBase_BlueCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/layouts/SecretBase_BlueCave4/map.bin
index 631ac0f81..631ac0f81 100644
--- a/data/maps/SecretBase_BlueCave4/map.bin
+++ b/data/layouts/SecretBase_BlueCave4/map.bin
diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave1/border.bin
+++ b/data/layouts/SecretBase_BrownCave1/border.bin
diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc
new file mode 100644
index 000000000..8b33aa0a0
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave1_MapBorder:: @ 82E77A0
+	.incbin "data/layouts/SecretBase_BrownCave1/border.bin"
+
+SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8
+	.incbin "data/layouts/SecretBase_BrownCave1/map.bin"
+
+	.align 2
+SecretBase_BrownCave1_Layout:: @ 82E7870
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_BrownCave1_MapBorder
+	.4byte SecretBase_BrownCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/layouts/SecretBase_BrownCave1/map.bin
index 56d3436ca..56d3436ca 100644
--- a/data/maps/SecretBase_BrownCave1/map.bin
+++ b/data/layouts/SecretBase_BrownCave1/map.bin
diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave2/border.bin
+++ b/data/layouts/SecretBase_BrownCave2/border.bin
diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc
new file mode 100644
index 000000000..afce94e36
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave2_MapBorder:: @ 82E7D28
+	.incbin "data/layouts/SecretBase_BrownCave2/border.bin"
+
+SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30
+	.incbin "data/layouts/SecretBase_BrownCave2/map.bin"
+
+	.align 2
+SecretBase_BrownCave2_Layout:: @ 82E7E2C
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SecretBase_BrownCave2_MapBorder
+	.4byte SecretBase_BrownCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/layouts/SecretBase_BrownCave2/map.bin
index 184896975..184896975 100644
--- a/data/maps/SecretBase_BrownCave2/map.bin
+++ b/data/layouts/SecretBase_BrownCave2/map.bin
diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave3/border.bin
+++ b/data/layouts/SecretBase_BrownCave3/border.bin
diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc
new file mode 100644
index 000000000..01ad3ff05
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave3_MapBorder:: @ 82E8358
+	.incbin "data/layouts/SecretBase_BrownCave3/border.bin"
+
+SecretBase_BrownCave3_MapBlockdata:: @ 82E8360
+	.incbin "data/layouts/SecretBase_BrownCave3/map.bin"
+
+	.align 2
+SecretBase_BrownCave3_Layout:: @ 82E84AC
+	.4byte 0xf
+	.4byte 0xb
+	.4byte SecretBase_BrownCave3_MapBorder
+	.4byte SecretBase_BrownCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/layouts/SecretBase_BrownCave3/map.bin
index d9967522a..d9967522a 100644
--- a/data/maps/SecretBase_BrownCave3/map.bin
+++ b/data/layouts/SecretBase_BrownCave3/map.bin
diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave4/border.bin
+++ b/data/layouts/SecretBase_BrownCave4/border.bin
diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc
new file mode 100644
index 000000000..cb3b6288c
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave4_MapBorder:: @ 82E8B00
+	.incbin "data/layouts/SecretBase_BrownCave4/border.bin"
+
+SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08
+	.incbin "data/layouts/SecretBase_BrownCave4/map.bin"
+
+	.align 2
+SecretBase_BrownCave4_Layout:: @ 82E8C58
+	.4byte 0xe
+	.4byte 0xc
+	.4byte SecretBase_BrownCave4_MapBorder
+	.4byte SecretBase_BrownCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/layouts/SecretBase_BrownCave4/map.bin
index 8b5a763c4..8b5a763c4 100644
--- a/data/maps/SecretBase_BrownCave4/map.bin
+++ b/data/layouts/SecretBase_BrownCave4/map.bin
diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave1/border.bin
+++ b/data/layouts/SecretBase_RedCave1/border.bin
diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc
new file mode 100644
index 000000000..0f93b246d
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave1_MapBorder:: @ 82E76B8
+	.incbin "data/layouts/SecretBase_RedCave1/border.bin"
+
+SecretBase_RedCave1_MapBlockdata:: @ 82E76C0
+	.incbin "data/layouts/SecretBase_RedCave1/map.bin"
+
+	.align 2
+SecretBase_RedCave1_Layout:: @ 82E7788
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_RedCave1_MapBorder
+	.4byte SecretBase_RedCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/layouts/SecretBase_RedCave1/map.bin
index ce666b57d..ce666b57d 100644
--- a/data/maps/SecretBase_RedCave1/map.bin
+++ b/data/layouts/SecretBase_RedCave1/map.bin
diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave2/border.bin
+++ b/data/layouts/SecretBase_RedCave2/border.bin
diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc
new file mode 100644
index 000000000..f3a14a012
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave2_MapBorder:: @ 82E7C28
+	.incbin "data/layouts/SecretBase_RedCave2/border.bin"
+
+SecretBase_RedCave2_MapBlockdata:: @ 82E7C30
+	.incbin "data/layouts/SecretBase_RedCave2/map.bin"
+
+	.align 2
+SecretBase_RedCave2_Layout:: @ 82E7D10
+	.4byte 0x7
+	.4byte 0x10
+	.4byte SecretBase_RedCave2_MapBorder
+	.4byte SecretBase_RedCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/layouts/SecretBase_RedCave2/map.bin
index 4fa03acfe..4fa03acfe 100644
--- a/data/maps/SecretBase_RedCave2/map.bin
+++ b/data/layouts/SecretBase_RedCave2/map.bin
diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave3/border.bin
+++ b/data/layouts/SecretBase_RedCave3/border.bin
diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc
new file mode 100644
index 000000000..6cd683f8e
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave3_MapBorder:: @ 82E8248
+	.incbin "data/layouts/SecretBase_RedCave3/border.bin"
+
+SecretBase_RedCave3_MapBlockdata:: @ 82E8250
+	.incbin "data/layouts/SecretBase_RedCave3/map.bin"
+
+	.align 2
+SecretBase_RedCave3_Layout:: @ 82E8340
+	.4byte 0xf
+	.4byte 0x8
+	.4byte SecretBase_RedCave3_MapBorder
+	.4byte SecretBase_RedCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/layouts/SecretBase_RedCave3/map.bin
index 0528e565d..0528e565d 100644
--- a/data/maps/SecretBase_RedCave3/map.bin
+++ b/data/layouts/SecretBase_RedCave3/map.bin
diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave4/border.bin
+++ b/data/layouts/SecretBase_RedCave4/border.bin
diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc
new file mode 100644
index 000000000..1baa61276
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave4_MapBorder:: @ 82E89D0
+	.incbin "data/layouts/SecretBase_RedCave4/border.bin"
+
+SecretBase_RedCave4_MapBlockdata:: @ 82E89D8
+	.incbin "data/layouts/SecretBase_RedCave4/map.bin"
+
+	.align 2
+SecretBase_RedCave4_Layout:: @ 82E8AE8
+	.4byte 0x9
+	.4byte 0xf
+	.4byte SecretBase_RedCave4_MapBorder
+	.4byte SecretBase_RedCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/layouts/SecretBase_RedCave4/map.bin
index 526763290..526763290 100644
--- a/data/maps/SecretBase_RedCave4/map.bin
+++ b/data/layouts/SecretBase_RedCave4/map.bin
diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub1/border.bin
+++ b/data/layouts/SecretBase_Shrub1/border.bin
diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc
new file mode 100644
index 000000000..68cbf0df3
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub1_MapBorder:: @ 82E7B40
+	.incbin "data/layouts/SecretBase_Shrub1/border.bin"
+
+SecretBase_Shrub1_MapBlockdata:: @ 82E7B48
+	.incbin "data/layouts/SecretBase_Shrub1/map.bin"
+
+	.align 2
+SecretBase_Shrub1_Layout:: @ 82E7C10
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_Shrub1_MapBorder
+	.4byte SecretBase_Shrub1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/layouts/SecretBase_Shrub1/map.bin
index 4b566cc1b..4b566cc1b 100644
--- a/data/maps/SecretBase_Shrub1/map.bin
+++ b/data/layouts/SecretBase_Shrub1/map.bin
diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub2/border.bin
+++ b/data/layouts/SecretBase_Shrub2/border.bin
diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc
new file mode 100644
index 000000000..8e246a6ad
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub2_MapBorder:: @ 82E8154
+	.incbin "data/layouts/SecretBase_Shrub2/border.bin"
+
+SecretBase_Shrub2_MapBlockdata:: @ 82E815C
+	.incbin "data/layouts/SecretBase_Shrub2/map.bin"
+
+	.align 2
+SecretBase_Shrub2_Layout:: @ 82E8230
+	.4byte 0xf
+	.4byte 0x7
+	.4byte SecretBase_Shrub2_MapBorder
+	.4byte SecretBase_Shrub2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/layouts/SecretBase_Shrub2/map.bin
index 8cb88cc44..8cb88cc44 100644
--- a/data/maps/SecretBase_Shrub2/map.bin
+++ b/data/layouts/SecretBase_Shrub2/map.bin
diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub3/border.bin
+++ b/data/layouts/SecretBase_Shrub3/border.bin
diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc
new file mode 100644
index 000000000..ddae76b6e
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub3_MapBorder:: @ 82E8890
+	.incbin "data/layouts/SecretBase_Shrub3/border.bin"
+
+SecretBase_Shrub3_MapBlockdata:: @ 82E8898
+	.incbin "data/layouts/SecretBase_Shrub3/map.bin"
+
+	.align 2
+SecretBase_Shrub3_Layout:: @ 82E89B8
+	.4byte 0xd
+	.4byte 0xb
+	.4byte SecretBase_Shrub3_MapBorder
+	.4byte SecretBase_Shrub3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/layouts/SecretBase_Shrub3/map.bin
index d51aeea21..d51aeea21 100644
--- a/data/maps/SecretBase_Shrub3/map.bin
+++ b/data/layouts/SecretBase_Shrub3/map.bin
diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub4/border.bin
+++ b/data/layouts/SecretBase_Shrub4/border.bin
diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc
new file mode 100644
index 000000000..62ddf14f0
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub4_MapBorder:: @ 82E90F8
+	.incbin "data/layouts/SecretBase_Shrub4/border.bin"
+
+SecretBase_Shrub4_MapBlockdata:: @ 82E9100
+	.incbin "data/layouts/SecretBase_Shrub4/map.bin"
+
+	.align 2
+SecretBase_Shrub4_Layout:: @ 82E9234
+	.4byte 0xe
+	.4byte 0xb
+	.4byte SecretBase_Shrub4_MapBorder
+	.4byte SecretBase_Shrub4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/layouts/SecretBase_Shrub4/map.bin
index 8a4cf836d..8a4cf836d 100644
--- a/data/maps/SecretBase_Shrub4/map.bin
+++ b/data/layouts/SecretBase_Shrub4/map.bin
diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree1/border.bin
+++ b/data/layouts/SecretBase_Tree1/border.bin
diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc
new file mode 100644
index 000000000..3b29d0302
--- /dev/null
+++ b/data/layouts/SecretBase_Tree1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree1_MapBorder:: @ 82E7A58
+	.incbin "data/layouts/SecretBase_Tree1/border.bin"
+
+SecretBase_Tree1_MapBlockdata:: @ 82E7A60
+	.incbin "data/layouts/SecretBase_Tree1/map.bin"
+
+	.align 2
+SecretBase_Tree1_Layout:: @ 82E7B28
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_Tree1_MapBorder
+	.4byte SecretBase_Tree1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/layouts/SecretBase_Tree1/map.bin
index 907f1486a..907f1486a 100644
--- a/data/maps/SecretBase_Tree1/map.bin
+++ b/data/layouts/SecretBase_Tree1/map.bin
diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree2/border.bin
+++ b/data/layouts/SecretBase_Tree2/border.bin
diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc
new file mode 100644
index 000000000..71722bcdb
--- /dev/null
+++ b/data/layouts/SecretBase_Tree2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree2_MapBorder:: @ 82E8054
+	.incbin "data/layouts/SecretBase_Tree2/border.bin"
+
+SecretBase_Tree2_MapBlockdata:: @ 82E805C
+	.incbin "data/layouts/SecretBase_Tree2/map.bin"
+
+	.align 2
+SecretBase_Tree2_Layout:: @ 82E813C
+	.4byte 0x7
+	.4byte 0x10
+	.4byte SecretBase_Tree2_MapBorder
+	.4byte SecretBase_Tree2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/layouts/SecretBase_Tree2/map.bin
index c2e5698b0..c2e5698b0 100644
--- a/data/maps/SecretBase_Tree2/map.bin
+++ b/data/layouts/SecretBase_Tree2/map.bin
diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree3/border.bin
+++ b/data/layouts/SecretBase_Tree3/border.bin
diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc
new file mode 100644
index 000000000..425369a5f
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree3_MapBorder:: @ 82E8760
+	.incbin "data/layouts/SecretBase_Tree3/border.bin"
+
+SecretBase_Tree3_MapBlockdata:: @ 82E8768
+	.incbin "data/layouts/SecretBase_Tree3/map.bin"
+
+	.align 2
+SecretBase_Tree3_Layout:: @ 82E8878
+	.4byte 0x11
+	.4byte 0x8
+	.4byte SecretBase_Tree3_MapBorder
+	.4byte SecretBase_Tree3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin
index b6ae04b00..b6ae04b00 100644
--- a/data/maps/SecretBase_Tree3/map.bin
+++ b/data/layouts/SecretBase_Tree3/map.bin
diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree4/border.bin
+++ b/data/layouts/SecretBase_Tree4/border.bin
diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc
new file mode 100644
index 000000000..85b921292
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree4_MapBorder:: @ 82E8F50
+	.incbin "data/layouts/SecretBase_Tree4/border.bin"
+
+SecretBase_Tree4_MapBlockdata:: @ 82E8F58
+	.incbin "data/layouts/SecretBase_Tree4/map.bin"
+
+	.align 2
+SecretBase_Tree4_Layout:: @ 82E90E0
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SecretBase_Tree4_MapBorder
+	.4byte SecretBase_Tree4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin
index b3b381d9e..b3b381d9e 100644
--- a/data/maps/SecretBase_Tree4/map.bin
+++ b/data/layouts/SecretBase_Tree4/map.bin
diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave1/border.bin
+++ b/data/layouts/SecretBase_YellowCave1/border.bin
diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc
new file mode 100644
index 000000000..6ae6cddf1
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave1_MapBorder:: @ 82E7970
+	.incbin "data/layouts/SecretBase_YellowCave1/border.bin"
+
+SecretBase_YellowCave1_MapBlockdata:: @ 82E7978
+	.incbin "data/layouts/SecretBase_YellowCave1/map.bin"
+
+	.align 2
+SecretBase_YellowCave1_Layout:: @ 82E7A40
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_YellowCave1_MapBorder
+	.4byte SecretBase_YellowCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/layouts/SecretBase_YellowCave1/map.bin
index 1301e7317..1301e7317 100644
--- a/data/maps/SecretBase_YellowCave1/map.bin
+++ b/data/layouts/SecretBase_YellowCave1/map.bin
diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave2/border.bin
+++ b/data/layouts/SecretBase_YellowCave2/border.bin
diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc
new file mode 100644
index 000000000..dc206e31d
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave2_MapBorder:: @ 82E7F38
+	.incbin "data/layouts/SecretBase_YellowCave2/border.bin"
+
+SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40
+	.incbin "data/layouts/SecretBase_YellowCave2/map.bin"
+
+	.align 2
+SecretBase_YellowCave2_Layout:: @ 82E803C
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SecretBase_YellowCave2_MapBorder
+	.4byte SecretBase_YellowCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/layouts/SecretBase_YellowCave2/map.bin
index e18cb47c6..e18cb47c6 100644
--- a/data/maps/SecretBase_YellowCave2/map.bin
+++ b/data/layouts/SecretBase_YellowCave2/map.bin
diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave3/border.bin
+++ b/data/layouts/SecretBase_YellowCave3/border.bin
diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc
new file mode 100644
index 000000000..af6b14601
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave3_MapBorder:: @ 82E8638
+	.incbin "data/layouts/SecretBase_YellowCave3/border.bin"
+
+SecretBase_YellowCave3_MapBlockdata:: @ 82E8640
+	.incbin "data/layouts/SecretBase_YellowCave3/map.bin"
+
+	.align 2
+SecretBase_YellowCave3_Layout:: @ 82E8748
+	.4byte 0xc
+	.4byte 0xb
+	.4byte SecretBase_YellowCave3_MapBorder
+	.4byte SecretBase_YellowCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/layouts/SecretBase_YellowCave3/map.bin
index b7d80a0ab..b7d80a0ab 100644
--- a/data/maps/SecretBase_YellowCave3/map.bin
+++ b/data/layouts/SecretBase_YellowCave3/map.bin
diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave4/border.bin
+++ b/data/layouts/SecretBase_YellowCave4/border.bin
diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc
new file mode 100644
index 000000000..94bf59ab5
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
+	.incbin "data/layouts/SecretBase_YellowCave4/border.bin"
+
+SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC
+	.incbin "data/layouts/SecretBase_YellowCave4/map.bin"
+
+	.align 2
+SecretBase_YellowCave4_Layout:: @ 82E8F38
+	.4byte 0xd
+	.4byte 0xe
+	.4byte SecretBase_YellowCave4_MapBorder
+	.4byte SecretBase_YellowCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/layouts/SecretBase_YellowCave4/map.bin
index d3c3e0204..d3c3e0204 100644
--- a/data/maps/SecretBase_YellowCave4/map.bin
+++ b/data/layouts/SecretBase_YellowCave4/map.bin
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..5745b09c2
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
+	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin"
+
+ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48
+	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin"
+
+	.align 2
+ShoalCave_HighTideEntranceRoom_Layout:: @ 82E47DC
+	.4byte 0x23
+	.4byte 0x23
+	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
+	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
index 0e4b88c8f..0e4b88c8f 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
new file mode 100644
index 000000000..d95827791
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
+	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin"
+
+ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC
+	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
+
+	.align 2
+ShoalCave_HighTideInnerRoom_Layout:: @ 82E55A4
+	.4byte 0x2e
+	.4byte 0x26
+	.4byte ShoalCave_HighTideInnerRoom_MapBorder
+	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
index c540a4008..c540a4008 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..ceb41f7e8
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
+	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin"
+
+ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0
+	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideEntranceRoom_Layout:: @ 82E2A44
+	.4byte 0x23
+	.4byte 0x23
+	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
+	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
index 1cf7c87f2..1cf7c87f2 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
index 206bd63f8..206bd63f8 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
new file mode 100644
index 000000000..b2ef09f0e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
+	.incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin"
+
+ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4
+	.incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideIceRoom_Layout:: @ 8304754
+	.4byte 0x14
+	.4byte 0x1e
+	.4byte ShoalCave_LowTideIceRoom_MapBorder
+	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
index 222f1f26c..222f1f26c 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
new file mode 100644
index 000000000..10a1948ca
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
+	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin"
+
+ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64
+	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideInnerRoom_Layout:: @ 82E380C
+	.4byte 0x2e
+	.4byte 0x26
+	.4byte ShoalCave_LowTideInnerRoom_MapBorder
+	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
index 87df28cf4..87df28cf4 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
new file mode 100644
index 000000000..c57b1b20e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
+	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin"
+
+ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4
+	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideLowerRoom_Layout:: @ 82E3E28
+	.4byte 0x1f
+	.4byte 0xe
+	.4byte ShoalCave_LowTideLowerRoom_MapBorder
+	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
index 04bf2baf3..04bf2baf3 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
new file mode 100644
index 000000000..ded7e7cfb
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
+	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin"
+
+ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C
+	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideStairsRoom_Layout:: @ 82E3AA4
+	.4byte 0x15
+	.4byte 0xf
+	.4byte ShoalCave_LowTideStairsRoom_MapBorder
+	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
index f2b56644d..f2b56644d 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
diff --git a/data/maps/SkyPillar_1F/border.bin b/data/layouts/SingleBattleColosseum/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_1F/border.bin
+++ b/data/layouts/SingleBattleColosseum/border.bin
diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc
new file mode 100644
index 000000000..636af1a0f
--- /dev/null
+++ b/data/layouts/SingleBattleColosseum/layout.inc
@@ -0,0 +1,14 @@
+SingleBattleColosseum_MapBorder:: @ 82E924C
+	.incbin "data/layouts/SingleBattleColosseum/border.bin"
+
+SingleBattleColosseum_MapBlockdata:: @ 82E9254
+	.incbin "data/layouts/SingleBattleColosseum/map.bin"
+
+	.align 2
+SingleBattleColosseum_Layout:: @ 82E9350
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SingleBattleColosseum_MapBorder
+	.4byte SingleBattleColosseum_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/layouts/SingleBattleColosseum/map.bin
index 1f66ab707..1f66ab707 100644
--- a/data/maps/SingleBattleColosseum/map.bin
+++ b/data/layouts/SingleBattleColosseum/map.bin
diff --git a/data/maps/SkyPillar_2F/border.bin b/data/layouts/SkyPillar_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_2F/border.bin
+++ b/data/layouts/SkyPillar_1F/border.bin
diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc
new file mode 100644
index 000000000..e53e06ff2
--- /dev/null
+++ b/data/layouts/SkyPillar_1F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_1F_MapBorder:: @ 8303158
+	.incbin "data/layouts/SkyPillar_1F/border.bin"
+
+SkyPillar_1F_MapBlockdata:: @ 8303160
+	.incbin "data/layouts/SkyPillar_1F/map.bin"
+
+	.align 2
+SkyPillar_1F_Layout:: @ 83032E8
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_1F_MapBorder
+	.4byte SkyPillar_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_1F/map.bin b/data/layouts/SkyPillar_1F/map.bin
index 1eb299c49..1eb299c49 100644
--- a/data/maps/SkyPillar_1F/map.bin
+++ b/data/layouts/SkyPillar_1F/map.bin
diff --git a/data/maps/SkyPillar_3F/border.bin b/data/layouts/SkyPillar_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_3F/border.bin
+++ b/data/layouts/SkyPillar_2F/border.bin
diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc
new file mode 100644
index 000000000..67cf18b57
--- /dev/null
+++ b/data/layouts/SkyPillar_2F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_2F_MapBorder:: @ 8303300
+	.incbin "data/layouts/SkyPillar_2F/border.bin"
+
+SkyPillar_2F_MapBlockdata:: @ 8303308
+	.incbin "data/layouts/SkyPillar_2F/map.bin"
+
+	.align 2
+SkyPillar_2F_Layout:: @ 8303490
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_2F_MapBorder
+	.4byte SkyPillar_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_2F/map.bin b/data/layouts/SkyPillar_2F/map.bin
index 8ec9bf213..8ec9bf213 100644
--- a/data/maps/SkyPillar_2F/map.bin
+++ b/data/layouts/SkyPillar_2F/map.bin
diff --git a/data/maps/SkyPillar_4F/border.bin b/data/layouts/SkyPillar_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_4F/border.bin
+++ b/data/layouts/SkyPillar_3F/border.bin
diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc
new file mode 100644
index 000000000..533a1ca2d
--- /dev/null
+++ b/data/layouts/SkyPillar_3F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_3F_MapBorder:: @ 83034A8
+	.incbin "data/layouts/SkyPillar_3F/border.bin"
+
+SkyPillar_3F_MapBlockdata:: @ 83034B0
+	.incbin "data/layouts/SkyPillar_3F/map.bin"
+
+	.align 2
+SkyPillar_3F_Layout:: @ 8303638
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_3F_MapBorder
+	.4byte SkyPillar_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_3F/map.bin b/data/layouts/SkyPillar_3F/map.bin
index d6c76d48c..d6c76d48c 100644
--- a/data/maps/SkyPillar_3F/map.bin
+++ b/data/layouts/SkyPillar_3F/map.bin
diff --git a/data/maps/SkyPillar_5F/border.bin b/data/layouts/SkyPillar_4F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_5F/border.bin
+++ b/data/layouts/SkyPillar_4F/border.bin
diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc
new file mode 100644
index 000000000..c4a651ea1
--- /dev/null
+++ b/data/layouts/SkyPillar_4F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_4F_MapBorder:: @ 8303650
+	.incbin "data/layouts/SkyPillar_4F/border.bin"
+
+SkyPillar_4F_MapBlockdata:: @ 8303658
+	.incbin "data/layouts/SkyPillar_4F/map.bin"
+
+	.align 2
+SkyPillar_4F_Layout:: @ 83037E0
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_4F_MapBorder
+	.4byte SkyPillar_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_4F/map.bin b/data/layouts/SkyPillar_4F/map.bin
index 02e82bb4f..02e82bb4f 100644
--- a/data/maps/SkyPillar_4F/map.bin
+++ b/data/layouts/SkyPillar_4F/map.bin
diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/layouts/SkyPillar_5F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_Harbor/border.bin
+++ b/data/layouts/SkyPillar_5F/border.bin
diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc
new file mode 100644
index 000000000..ed9c9b0d0
--- /dev/null
+++ b/data/layouts/SkyPillar_5F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_5F_MapBorder:: @ 8304840
+	.incbin "data/layouts/SkyPillar_5F/border.bin"
+
+SkyPillar_5F_MapBlockdata:: @ 8304848
+	.incbin "data/layouts/SkyPillar_5F/map.bin"
+
+	.align 2
+SkyPillar_5F_Layout:: @ 83049D0
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_5F_MapBorder
+	.4byte SkyPillar_5F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_5F/map.bin b/data/layouts/SkyPillar_5F/map.bin
index b8cd541d5..b8cd541d5 100644
--- a/data/maps/SkyPillar_5F/map.bin
+++ b/data/layouts/SkyPillar_5F/map.bin
diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/layouts/SkyPillar_Entrance/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/SkyPillar_Entrance/border.bin
+++ b/data/layouts/SkyPillar_Entrance/border.bin
diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc
new file mode 100644
index 000000000..1523383e3
--- /dev/null
+++ b/data/layouts/SkyPillar_Entrance/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Entrance_MapBorder:: @ 8302988
+	.incbin "data/layouts/SkyPillar_Entrance/border.bin"
+
+SkyPillar_Entrance_MapBlockdata:: @ 8302990
+	.incbin "data/layouts/SkyPillar_Entrance/map.bin"
+
+	.align 2
+SkyPillar_Entrance_Layout:: @ 8302C18
+	.4byte 0x12
+	.4byte 0x12
+	.4byte SkyPillar_Entrance_MapBorder
+	.4byte SkyPillar_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/layouts/SkyPillar_Entrance/map.bin
index b215b86ef..b215b86ef 100644
--- a/data/maps/SkyPillar_Entrance/map.bin
+++ b/data/layouts/SkyPillar_Entrance/map.bin
diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/layouts/SkyPillar_Outside/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SkyPillar_Outside/border.bin
+++ b/data/layouts/SkyPillar_Outside/border.bin
diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc
new file mode 100644
index 000000000..f535e7bc6
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Outside_MapBorder:: @ 8302C30
+	.incbin "data/layouts/SkyPillar_Outside/border.bin"
+
+SkyPillar_Outside_MapBlockdata:: @ 8302C38
+	.incbin "data/layouts/SkyPillar_Outside/map.bin"
+
+	.align 2
+SkyPillar_Outside_Layout:: @ 8303140
+	.4byte 0x1c
+	.4byte 0x17
+	.4byte SkyPillar_Outside_MapBorder
+	.4byte SkyPillar_Outside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/layouts/SkyPillar_Outside/map.bin
index 4517589d0..4517589d0 100644
--- a/data/maps/SkyPillar_Outside/map.bin
+++ b/data/layouts/SkyPillar_Outside/map.bin
diff --git a/data/maps/SkyPillar_Top/border.bin b/data/layouts/SkyPillar_Top/border.bin
index e0241fa60..e0241fa60 100644
--- a/data/maps/SkyPillar_Top/border.bin
+++ b/data/layouts/SkyPillar_Top/border.bin
diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc
new file mode 100644
index 000000000..ee456e707
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Top_MapBorder:: @ 83049E8
+	.incbin "data/layouts/SkyPillar_Top/border.bin"
+
+SkyPillar_Top_MapBlockdata:: @ 83049F0
+	.incbin "data/layouts/SkyPillar_Top/map.bin"
+
+	.align 2
+SkyPillar_Top_Layout:: @ 8304F00
+	.4byte 0x1b
+	.4byte 0x18
+	.4byte SkyPillar_Top_MapBorder
+	.4byte SkyPillar_Top_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_Top/map.bin b/data/layouts/SkyPillar_Top/map.bin
index fe6c2ad43..fe6c2ad43 100644
--- a/data/maps/SkyPillar_Top/map.bin
+++ b/data/layouts/SkyPillar_Top/map.bin
diff --git a/data/maps/SlateportCity/border.bin b/data/layouts/SlateportCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SlateportCity/border.bin
+++ b/data/layouts/SlateportCity/border.bin
diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc
new file mode 100644
index 000000000..2d52b7280
--- /dev/null
+++ b/data/layouts/SlateportCity/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_MapBorder:: @ 828798C
+	.incbin "data/layouts/SlateportCity/border.bin"
+
+SlateportCity_MapBlockdata:: @ 8287994
+	.incbin "data/layouts/SlateportCity/map.bin"
+
+	.align 2
+SlateportCity_Layout:: @ 8288C54
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte SlateportCity_MapBorder
+	.4byte SlateportCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
diff --git a/data/maps/SlateportCity/map.bin b/data/layouts/SlateportCity/map.bin
index 97046ab59..97046ab59 100644
--- a/data/maps/SlateportCity/map.bin
+++ b/data/layouts/SlateportCity/map.bin
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
new file mode 100644
index 000000000..ab05ae00f
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin"
+
+SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin"
+
+	.align 2
+SlateportCity_OceanicMuseum_1F_Layout:: @ 82D08D8
+	.4byte 0x14
+	.4byte 0x9
+	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
+	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
index f18b01e49..f18b01e49 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
new file mode 100644
index 000000000..75f2d93ae
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin"
+
+SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin"
+
+	.align 2
+SlateportCity_OceanicMuseum_2F_Layout:: @ 82D0A60
+	.4byte 0x14
+	.4byte 0x9
+	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
+	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
index 1fa2cdc18..1fa2cdc18 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_PokemonFanClub/border.bin
+++ b/data/layouts/SlateportCity_PokemonFanClub/border.bin
diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
new file mode 100644
index 000000000..3013872d5
--- /dev/null
+++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
+	.incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin"
+
+SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C
+	.incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin"
+
+	.align 2
+SlateportCity_PokemonFanClub_Layout:: @ 82D0750
+	.4byte 0xe
+	.4byte 0xb
+	.4byte SlateportCity_PokemonFanClub_MapBorder
+	.4byte SlateportCity_PokemonFanClub_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonFanClub
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/layouts/SlateportCity_PokemonFanClub/map.bin
index 71ae8c7c9..71ae8c7c9 100644
--- a/data/maps/SlateportCity_PokemonFanClub/map.bin
+++ b/data/layouts/SlateportCity_PokemonFanClub/map.bin
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
new file mode 100644
index 000000000..59e301313
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
+	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin"
+
+SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C
+	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin"
+
+	.align 2
+SlateportCity_SternsShipyard_1F_Layout:: @ 82D0394
+	.4byte 0x15
+	.4byte 0xf
+	.4byte SlateportCity_SternsShipyard_1F_MapBorder
+	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
index 036f5ce26..036f5ce26 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
new file mode 100644
index 000000000..4e3bcfb46
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
+	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin"
+
+SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4
+	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
+
+	.align 2
+SlateportCity_SternsShipyard_2F_Layout:: @ 82D05B4
+	.4byte 0x11
+	.4byte 0xf
+	.4byte SlateportCity_SternsShipyard_2F_MapBorder
+	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
index d10ed2ac2..d10ed2ac2 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
diff --git a/data/maps/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/SootopolisCity/border.bin
+++ b/data/layouts/SootopolisCity/border.bin
diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc
new file mode 100644
index 000000000..d5643288d
--- /dev/null
+++ b/data/layouts/SootopolisCity/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_MapBorder:: @ 828DE4C
+	.incbin "data/layouts/SootopolisCity/border.bin"
+
+SootopolisCity_MapBlockdata:: @ 828DE54
+	.incbin "data/layouts/SootopolisCity/map.bin"
+
+	.align 2
+SootopolisCity_Layout:: @ 828FA74
+	.4byte 0x3c
+	.4byte 0x3c
+	.4byte SootopolisCity_MapBorder
+	.4byte SootopolisCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Sootopolis
diff --git a/data/maps/SootopolisCity/map.bin b/data/layouts/SootopolisCity/map.bin
index 4269e22a6..4269e22a6 100644
--- a/data/maps/SootopolisCity/map.bin
+++ b/data/layouts/SootopolisCity/map.bin
diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin
index 12819766e..12819766e 100644
--- a/data/maps/SootopolisCity_Gym_1F/border.bin
+++ b/data/layouts/SootopolisCity_Gym_1F/border.bin
diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc
new file mode 100644
index 000000000..a38d2f5a2
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
+	.incbin "data/layouts/SootopolisCity_Gym_1F/border.bin"
+
+SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98
+	.incbin "data/layouts/SootopolisCity_Gym_1F/map.bin"
+
+	.align 2
+SootopolisCity_Gym_1F_Layout:: @ 82D3F0C
+	.4byte 0x11
+	.4byte 0x1a
+	.4byte SootopolisCity_Gym_1F_MapBorder
+	.4byte SootopolisCity_Gym_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/layouts/SootopolisCity_Gym_1F/map.bin
index a4a20d477..a4a20d477 100644
--- a/data/maps/SootopolisCity_Gym_1F/map.bin
+++ b/data/layouts/SootopolisCity_Gym_1F/map.bin
diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin
index 12819766e..12819766e 100644
--- a/data/maps/SootopolisCity_Gym_B1F/border.bin
+++ b/data/layouts/SootopolisCity_Gym_B1F/border.bin
diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
new file mode 100644
index 000000000..cf568b83a
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
+	.incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin"
+
+SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C
+	.incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin"
+
+	.align 2
+SootopolisCity_Gym_B1F_Layout:: @ 82D42A0
+	.4byte 0x11
+	.4byte 0x1a
+	.4byte SootopolisCity_Gym_B1F_MapBorder
+	.4byte SootopolisCity_Gym_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/layouts/SootopolisCity_Gym_B1F/map.bin
index eb73a4d2f..eb73a4d2f 100644
--- a/data/maps/SootopolisCity_Gym_B1F/map.bin
+++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin
diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House1/border.bin
+++ b/data/layouts/SootopolisCity_House1/border.bin
diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc
new file mode 100644
index 000000000..b202d6bd1
--- /dev/null
+++ b/data/layouts/SootopolisCity_House1/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House1_MapBorder:: @ 82FEC48
+	.incbin "data/layouts/SootopolisCity_House1/border.bin"
+
+SootopolisCity_House1_MapBlockdata:: @ 82FEC50
+	.incbin "data/layouts/SootopolisCity_House1/map.bin"
+
+	.align 2
+SootopolisCity_House1_Layout:: @ 82FECC0
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House1_MapBorder
+	.4byte SootopolisCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin
index 43f11b194..43f11b194 100644
--- a/data/maps/SootopolisCity_House1/map.bin
+++ b/data/layouts/SootopolisCity_House1/map.bin
diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House2/border.bin
+++ b/data/layouts/SootopolisCity_House2/border.bin
diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc
new file mode 100644
index 000000000..e57feaf86
--- /dev/null
+++ b/data/layouts/SootopolisCity_House2/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House2_MapBorder:: @ 82FECD8
+	.incbin "data/layouts/SootopolisCity_House2/border.bin"
+
+SootopolisCity_House2_MapBlockdata:: @ 82FECE0
+	.incbin "data/layouts/SootopolisCity_House2/map.bin"
+
+	.align 2
+SootopolisCity_House2_Layout:: @ 82FED50
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House2_MapBorder
+	.4byte SootopolisCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin
index 632e1e36a..632e1e36a 100644
--- a/data/maps/SootopolisCity_House2/map.bin
+++ b/data/layouts/SootopolisCity_House2/map.bin
diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House3/border.bin
+++ b/data/layouts/SootopolisCity_House3/border.bin
diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc
new file mode 100644
index 000000000..f86339f3b
--- /dev/null
+++ b/data/layouts/SootopolisCity_House3/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House3_MapBorder:: @ 82FED68
+	.incbin "data/layouts/SootopolisCity_House3/border.bin"
+
+SootopolisCity_House3_MapBlockdata:: @ 82FED70
+	.incbin "data/layouts/SootopolisCity_House3/map.bin"
+
+	.align 2
+SootopolisCity_House3_Layout:: @ 82FEDE0
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House3_MapBorder
+	.4byte SootopolisCity_House3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin
index 8bbd6c517..8bbd6c517 100644
--- a/data/maps/SootopolisCity_House3/map.bin
+++ b/data/layouts/SootopolisCity_House3/map.bin
diff --git a/data/maps/SootopolisCity_House8/border.bin b/data/layouts/SootopolisCity_House8/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SootopolisCity_House8/border.bin
+++ b/data/layouts/SootopolisCity_House8/border.bin
diff --git a/data/layouts/SootopolisCity_House8/layout.inc b/data/layouts/SootopolisCity_House8/layout.inc
new file mode 100644
index 000000000..05f0fca93
--- /dev/null
+++ b/data/layouts/SootopolisCity_House8/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House8_MapBorder:: @ 82FC34C
+	.incbin "data/layouts/SootopolisCity_House8/border.bin"
+
+SootopolisCity_House8_MapBlockdata:: @ 82FC354
+	.incbin "data/layouts/SootopolisCity_House8/map.bin"
+
+	.align 2
+SootopolisCity_House8_Layout:: @ 82FC3C4
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House8_MapBorder
+	.4byte SootopolisCity_House8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House8/map.bin b/data/layouts/SootopolisCity_House8/map.bin
index ffeea7269..ffeea7269 100644
--- a/data/maps/SootopolisCity_House8/map.bin
+++ b/data/layouts/SootopolisCity_House8/map.bin
diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SouthernIsland_Exterior/border.bin
+++ b/data/layouts/SouthernIsland_Exterior/border.bin
diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc
new file mode 100644
index 000000000..c043bfaf9
--- /dev/null
+++ b/data/layouts/SouthernIsland_Exterior/layout.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Exterior_MapBorder:: @ 82F9D80
+	.incbin "data/layouts/SouthernIsland_Exterior/border.bin"
+
+SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88
+	.incbin "data/layouts/SouthernIsland_Exterior/map.bin"
+
+	.align 2
+SouthernIsland_Exterior_Layout:: @ 82FA544
+	.4byte 0x21
+	.4byte 0x1e
+	.4byte SouthernIsland_Exterior_MapBorder
+	.4byte SouthernIsland_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/layouts/SouthernIsland_Exterior/map.bin
index 8c2c2df4a..8c2c2df4a 100644
--- a/data/maps/SouthernIsland_Exterior/map.bin
+++ b/data/layouts/SouthernIsland_Exterior/map.bin
diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SouthernIsland_Interior/border.bin
+++ b/data/layouts/SouthernIsland_Interior/border.bin
diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc
new file mode 100644
index 000000000..8a231303c
--- /dev/null
+++ b/data/layouts/SouthernIsland_Interior/layout.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Interior_MapBorder:: @ 82FA55C
+	.incbin "data/layouts/SouthernIsland_Interior/border.bin"
+
+SouthernIsland_Interior_MapBlockdata:: @ 82FA564
+	.incbin "data/layouts/SouthernIsland_Interior/map.bin"
+
+	.align 2
+SouthernIsland_Interior_Layout:: @ 82FAA74
+	.4byte 0x1b
+	.4byte 0x18
+	.4byte SouthernIsland_Interior_MapBorder
+	.4byte SouthernIsland_Interior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/layouts/SouthernIsland_Interior/map.bin
index db1e4b153..db1e4b153 100644
--- a/data/maps/SouthernIsland_Interior/map.bin
+++ b/data/layouts/SouthernIsland_Interior/map.bin
diff --git a/data/maps/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/TradeCenter/border.bin
+++ b/data/layouts/TradeCenter/border.bin
diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc
new file mode 100644
index 000000000..906fb254a
--- /dev/null
+++ b/data/layouts/TradeCenter/layout.inc
@@ -0,0 +1,14 @@
+TradeCenter_MapBorder:: @ 82E9368
+	.incbin "data/layouts/TradeCenter/border.bin"
+
+TradeCenter_MapBlockdata:: @ 82E9370
+	.incbin "data/layouts/TradeCenter/map.bin"
+
+	.align 2
+TradeCenter_Layout:: @ 82E9448
+	.4byte 0xc
+	.4byte 0x9
+	.4byte TradeCenter_MapBorder
+	.4byte TradeCenter_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/TradeCenter/map.bin b/data/layouts/TradeCenter/map.bin
index 7e592dbe6..7e592dbe6 100644
--- a/data/maps/TradeCenter/map.bin
+++ b/data/layouts/TradeCenter/map.bin
diff --git a/data/maps/Underwater1/border.bin b/data/layouts/Underwater1/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater1/border.bin
+++ b/data/layouts/Underwater1/border.bin
diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc
new file mode 100644
index 000000000..e020da990
--- /dev/null
+++ b/data/layouts/Underwater1/layout.inc
@@ -0,0 +1,14 @@
+Underwater1_MapBorder:: @ 82F2F18
+	.incbin "data/layouts/Underwater1/border.bin"
+
+Underwater1_MapBlockdata:: @ 82F2F20
+	.incbin "data/layouts/Underwater1/map.bin"
+
+	.align 2
+Underwater1_Layout:: @ 82F6120
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater1_MapBorder
+	.4byte Underwater1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater1/map.bin b/data/layouts/Underwater1/map.bin
index 230e3dcd2..230e3dcd2 100644
--- a/data/maps/Underwater1/map.bin
+++ b/data/layouts/Underwater1/map.bin
diff --git a/data/maps/Underwater2/border.bin b/data/layouts/Underwater2/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater2/border.bin
+++ b/data/layouts/Underwater2/border.bin
diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc
new file mode 100644
index 000000000..6ba018c3b
--- /dev/null
+++ b/data/layouts/Underwater2/layout.inc
@@ -0,0 +1,14 @@
+Underwater2_MapBorder:: @ 82C503C
+	.incbin "data/layouts/Underwater2/border.bin"
+
+Underwater2_MapBlockdata:: @ 82C5044
+	.incbin "data/layouts/Underwater2/map.bin"
+
+	.align 2
+Underwater2_Layout:: @ 82C8244
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater2_MapBorder
+	.4byte Underwater2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater2/map.bin b/data/layouts/Underwater2/map.bin
index 0c6377c30..0c6377c30 100644
--- a/data/maps/Underwater2/map.bin
+++ b/data/layouts/Underwater2/map.bin
diff --git a/data/maps/Underwater3/border.bin b/data/layouts/Underwater3/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater3/border.bin
+++ b/data/layouts/Underwater3/border.bin
diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc
new file mode 100644
index 000000000..be0ebc363
--- /dev/null
+++ b/data/layouts/Underwater3/layout.inc
@@ -0,0 +1,14 @@
+Underwater3_MapBorder:: @ 82C825C
+	.incbin "data/layouts/Underwater3/border.bin"
+
+Underwater3_MapBlockdata:: @ 82C8264
+	.incbin "data/layouts/Underwater3/map.bin"
+
+	.align 2
+Underwater3_Layout:: @ 82CB464
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater3_MapBorder
+	.4byte Underwater3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater3/map.bin b/data/layouts/Underwater3/map.bin
index 1f7addb2d..1f7addb2d 100644
--- a/data/maps/Underwater3/map.bin
+++ b/data/layouts/Underwater3/map.bin
diff --git a/data/maps/Underwater4/border.bin b/data/layouts/Underwater4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater4/border.bin
+++ b/data/layouts/Underwater4/border.bin
diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc
new file mode 100644
index 000000000..cef9e4eb8
--- /dev/null
+++ b/data/layouts/Underwater4/layout.inc
@@ -0,0 +1,14 @@
+Underwater4_MapBorder:: @ 82CB47C
+	.incbin "data/layouts/Underwater4/border.bin"
+
+Underwater4_MapBlockdata:: @ 82CB484
+	.incbin "data/layouts/Underwater4/map.bin"
+
+	.align 2
+Underwater4_Layout:: @ 82CDA04
+	.4byte 0x78
+	.4byte 0x28
+	.4byte Underwater4_MapBorder
+	.4byte Underwater4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater4/map.bin b/data/layouts/Underwater4/map.bin
index 23f987681..23f987681 100644
--- a/data/maps/Underwater4/map.bin
+++ b/data/layouts/Underwater4/map.bin
diff --git a/data/maps/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_Route134/border.bin
+++ b/data/layouts/Underwater_Route134/border.bin
diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc
new file mode 100644
index 000000000..523c9f5e3
--- /dev/null
+++ b/data/layouts/Underwater_Route134/layout.inc
@@ -0,0 +1,14 @@
+Underwater_Route134_MapBorder:: @ 82F7600
+	.incbin "data/layouts/Underwater_Route134/border.bin"
+
+Underwater_Route134_MapBlockdata:: @ 82F7608
+	.incbin "data/layouts/Underwater_Route134/map.bin"
+
+	.align 2
+Underwater_Route134_Layout:: @ 82F7770
+	.4byte 0x12
+	.4byte 0xa
+	.4byte Underwater_Route134_MapBorder
+	.4byte Underwater_Route134_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_Route134/map.bin b/data/layouts/Underwater_Route134/map.bin
index 77bdd37aa..77bdd37aa 100644
--- a/data/maps/Underwater_Route134/map.bin
+++ b/data/layouts/Underwater_Route134/map.bin
diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SeafloorCavern/border.bin
+++ b/data/layouts/Underwater_SeafloorCavern/border.bin
diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc
new file mode 100644
index 000000000..fa9352663
--- /dev/null
+++ b/data/layouts/Underwater_SeafloorCavern/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
+	.incbin "data/layouts/Underwater_SeafloorCavern/border.bin"
+
+Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC
+	.incbin "data/layouts/Underwater_SeafloorCavern/map.bin"
+
+	.align 2
+Underwater_SeafloorCavern_Layout:: @ 82DD3B8
+	.4byte 0xe
+	.4byte 0x9
+	.4byte Underwater_SeafloorCavern_MapBorder
+	.4byte Underwater_SeafloorCavern_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/layouts/Underwater_SeafloorCavern/map.bin
index 4cacc495e..4cacc495e 100644
--- a/data/maps/Underwater_SeafloorCavern/map.bin
+++ b/data/layouts/Underwater_SeafloorCavern/map.bin
diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SealedChamber/border.bin
+++ b/data/layouts/Underwater_SealedChamber/border.bin
diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc
new file mode 100644
index 000000000..9bf4ac1bf
--- /dev/null
+++ b/data/layouts/Underwater_SealedChamber/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SealedChamber_MapBorder:: @ 82F7788
+	.incbin "data/layouts/Underwater_SealedChamber/border.bin"
+
+Underwater_SealedChamber_MapBlockdata:: @ 82F7790
+	.incbin "data/layouts/Underwater_SealedChamber/map.bin"
+
+	.align 2
+Underwater_SealedChamber_Layout:: @ 82F7FD0
+	.4byte 0x16
+	.4byte 0x30
+	.4byte Underwater_SealedChamber_MapBorder
+	.4byte Underwater_SealedChamber_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/layouts/Underwater_SealedChamber/map.bin
index 5ac0b4a73..5ac0b4a73 100644
--- a/data/maps/Underwater_SealedChamber/map.bin
+++ b/data/layouts/Underwater_SealedChamber/map.bin
diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SootopolisCity/border.bin
+++ b/data/layouts/Underwater_SootopolisCity/border.bin
diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc
new file mode 100644
index 000000000..f5049c9d2
--- /dev/null
+++ b/data/layouts/Underwater_SootopolisCity/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SootopolisCity_MapBorder:: @ 82D793C
+	.incbin "data/layouts/Underwater_SootopolisCity/border.bin"
+
+Underwater_SootopolisCity_MapBlockdata:: @ 82D7944
+	.incbin "data/layouts/Underwater_SootopolisCity/map.bin"
+
+	.align 2
+Underwater_SootopolisCity_Layout:: @ 82D7AD4
+	.4byte 0x14
+	.4byte 0xa
+	.4byte Underwater_SootopolisCity_MapBorder
+	.4byte Underwater_SootopolisCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/layouts/Underwater_SootopolisCity/map.bin
index 71346ab72..71346ab72 100644
--- a/data/maps/Underwater_SootopolisCity/map.bin
+++ b/data/layouts/Underwater_SootopolisCity/map.bin
diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/layouts/UnknownMap_082CF564/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_082CF564/border.bin
+++ b/data/layouts/UnknownMap_082CF564/border.bin
diff --git a/data/layouts/UnknownMap_082CF564/layout.inc b/data/layouts/UnknownMap_082CF564/layout.inc
new file mode 100644
index 000000000..df2be91f2
--- /dev/null
+++ b/data/layouts/UnknownMap_082CF564/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082CF564_MapBorder::
+	.incbin "data/layouts/UnknownMap_082CF564/border.bin"
+
+UnknownMap_082CF564_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082CF564/map.bin"
+
+	.align 2
+UnknownMap_082CF564_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082CF564_MapBorder
+	.4byte UnknownMap_082CF564_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/layouts/UnknownMap_082CF564/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/maps/UnknownMap_082CF564/map.bin
+++ b/data/layouts/UnknownMap_082CF564/map.bin
diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/layouts/UnknownMap_082D05D8/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_082D05D8/border.bin
+++ b/data/layouts/UnknownMap_082D05D8/border.bin
diff --git a/data/layouts/UnknownMap_082D05D8/layout.inc b/data/layouts/UnknownMap_082D05D8/layout.inc
new file mode 100644
index 000000000..f35922aea
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05D8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082D05D8_MapBorder::
+	.incbin "data/layouts/UnknownMap_082D05D8/border.bin"
+
+UnknownMap_082D05D8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082D05D8/map.bin"
+
+	.align 2
+UnknownMap_082D05D8_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082D05D8_MapBorder
+	.4byte UnknownMap_082D05D8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/layouts/UnknownMap_082D05D8/map.bin
index 37f05b971..37f05b971 100644
--- a/data/maps/UnknownMap_082D05D8/map.bin
+++ b/data/layouts/UnknownMap_082D05D8/map.bin
diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/layouts/UnknownMap_082D05FC/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_082D05FC/border.bin
+++ b/data/layouts/UnknownMap_082D05FC/border.bin
diff --git a/data/layouts/UnknownMap_082D05FC/layout.inc b/data/layouts/UnknownMap_082D05FC/layout.inc
new file mode 100644
index 000000000..646dab5cf
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05FC/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082D05FC_MapBorder::
+	.incbin "data/layouts/UnknownMap_082D05FC/border.bin"
+
+UnknownMap_082D05FC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082D05FC/map.bin"
+
+	.align 2
+UnknownMap_082D05FC_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082D05FC_MapBorder
+	.4byte UnknownMap_082D05FC_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/layouts/UnknownMap_082D05FC/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/maps/UnknownMap_082D05FC/map.bin
+++ b/data/layouts/UnknownMap_082D05FC/map.bin
diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/layouts/UnknownMap_082E55C8/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E55C8/border.bin
+++ b/data/layouts/UnknownMap_082E55C8/border.bin
diff --git a/data/layouts/UnknownMap_082E55C8/layout.inc b/data/layouts/UnknownMap_082E55C8/layout.inc
new file mode 100644
index 000000000..c6b6e0347
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55C8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E55C8_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E55C8/border.bin"
+
+UnknownMap_082E55C8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E55C8/map.bin"
+
+	.align 2
+UnknownMap_082E55C8_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E55C8_MapBorder
+	.4byte UnknownMap_082E55C8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/layouts/UnknownMap_082E55C8/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E55C8/map.bin
+++ b/data/layouts/UnknownMap_082E55C8/map.bin
diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/layouts/UnknownMap_082E55EC/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E55EC/border.bin
+++ b/data/layouts/UnknownMap_082E55EC/border.bin
diff --git a/data/layouts/UnknownMap_082E55EC/layout.inc b/data/layouts/UnknownMap_082E55EC/layout.inc
new file mode 100644
index 000000000..8b1f2c21a
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55EC/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E55EC_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E55EC/border.bin"
+
+UnknownMap_082E55EC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E55EC/map.bin"
+
+	.align 2
+UnknownMap_082E55EC_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E55EC_MapBorder
+	.4byte UnknownMap_082E55EC_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/layouts/UnknownMap_082E55EC/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E55EC/map.bin
+++ b/data/layouts/UnknownMap_082E55EC/map.bin
diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/layouts/UnknownMap_082E5610/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5610/border.bin
+++ b/data/layouts/UnknownMap_082E5610/border.bin
diff --git a/data/layouts/UnknownMap_082E5610/layout.inc b/data/layouts/UnknownMap_082E5610/layout.inc
new file mode 100644
index 000000000..87c11b97b
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5610/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5610_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5610/border.bin"
+
+UnknownMap_082E5610_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5610/map.bin"
+
+	.align 2
+UnknownMap_082E5610_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5610_MapBorder
+	.4byte UnknownMap_082E5610_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/layouts/UnknownMap_082E5610/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5610/map.bin
+++ b/data/layouts/UnknownMap_082E5610/map.bin
diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/layouts/UnknownMap_082E5634/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5634/border.bin
+++ b/data/layouts/UnknownMap_082E5634/border.bin
diff --git a/data/layouts/UnknownMap_082E5634/layout.inc b/data/layouts/UnknownMap_082E5634/layout.inc
new file mode 100644
index 000000000..a4d1675f4
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5634/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5634_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5634/border.bin"
+
+UnknownMap_082E5634_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5634/map.bin"
+
+	.align 2
+UnknownMap_082E5634_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5634_MapBorder
+	.4byte UnknownMap_082E5634_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/layouts/UnknownMap_082E5634/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5634/map.bin
+++ b/data/layouts/UnknownMap_082E5634/map.bin
diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/layouts/UnknownMap_082E5658/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5658/border.bin
+++ b/data/layouts/UnknownMap_082E5658/border.bin
diff --git a/data/layouts/UnknownMap_082E5658/layout.inc b/data/layouts/UnknownMap_082E5658/layout.inc
new file mode 100644
index 000000000..b7608b96d
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5658/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5658_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5658/border.bin"
+
+UnknownMap_082E5658_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5658/map.bin"
+
+	.align 2
+UnknownMap_082E5658_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5658_MapBorder
+	.4byte UnknownMap_082E5658_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/layouts/UnknownMap_082E5658/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5658/map.bin
+++ b/data/layouts/UnknownMap_082E5658/map.bin
diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/layouts/UnknownMap_082E567C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E567C/border.bin
+++ b/data/layouts/UnknownMap_082E567C/border.bin
diff --git a/data/layouts/UnknownMap_082E567C/layout.inc b/data/layouts/UnknownMap_082E567C/layout.inc
new file mode 100644
index 000000000..6f427bee6
--- /dev/null
+++ b/data/layouts/UnknownMap_082E567C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E567C_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E567C/border.bin"
+
+UnknownMap_082E567C_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E567C/map.bin"
+
+	.align 2
+UnknownMap_082E567C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E567C_MapBorder
+	.4byte UnknownMap_082E567C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/layouts/UnknownMap_082E567C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E567C/map.bin
+++ b/data/layouts/UnknownMap_082E567C/map.bin
diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/layouts/UnknownMap_082E56A0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E56A0/border.bin
+++ b/data/layouts/UnknownMap_082E56A0/border.bin
diff --git a/data/layouts/UnknownMap_082E56A0/layout.inc b/data/layouts/UnknownMap_082E56A0/layout.inc
new file mode 100644
index 000000000..24964ef39
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56A0/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56A0_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E56A0/border.bin"
+
+UnknownMap_082E56A0_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E56A0/map.bin"
+
+	.align 2
+UnknownMap_082E56A0_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E56A0_MapBorder
+	.4byte UnknownMap_082E56A0_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/layouts/UnknownMap_082E56A0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E56A0/map.bin
+++ b/data/layouts/UnknownMap_082E56A0/map.bin
diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/layouts/UnknownMap_082E56C4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E56C4/border.bin
+++ b/data/layouts/UnknownMap_082E56C4/border.bin
diff --git a/data/layouts/UnknownMap_082E56C4/layout.inc b/data/layouts/UnknownMap_082E56C4/layout.inc
new file mode 100644
index 000000000..e0d2eca7d
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56C4/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56C4_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E56C4/border.bin"
+
+UnknownMap_082E56C4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E56C4/map.bin"
+
+	.align 2
+UnknownMap_082E56C4_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E56C4_MapBorder
+	.4byte UnknownMap_082E56C4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/layouts/UnknownMap_082E56C4/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E56C4/map.bin
+++ b/data/layouts/UnknownMap_082E56C4/map.bin
diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/layouts/UnknownMap_082E56E8/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E56E8/border.bin
+++ b/data/layouts/UnknownMap_082E56E8/border.bin
diff --git a/data/layouts/UnknownMap_082E56E8/layout.inc b/data/layouts/UnknownMap_082E56E8/layout.inc
new file mode 100644
index 000000000..c163fd44e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56E8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56E8_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E56E8/border.bin"
+
+UnknownMap_082E56E8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E56E8/map.bin"
+
+	.align 2
+UnknownMap_082E56E8_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E56E8_MapBorder
+	.4byte UnknownMap_082E56E8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/layouts/UnknownMap_082E56E8/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E56E8/map.bin
+++ b/data/layouts/UnknownMap_082E56E8/map.bin
diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/layouts/UnknownMap_082E570C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E570C/border.bin
+++ b/data/layouts/UnknownMap_082E570C/border.bin
diff --git a/data/layouts/UnknownMap_082E570C/layout.inc b/data/layouts/UnknownMap_082E570C/layout.inc
new file mode 100644
index 000000000..543decba8
--- /dev/null
+++ b/data/layouts/UnknownMap_082E570C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E570C_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E570C/border.bin"
+
+UnknownMap_082E570C_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E570C/map.bin"
+
+	.align 2
+UnknownMap_082E570C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E570C_MapBorder
+	.4byte UnknownMap_082E570C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/layouts/UnknownMap_082E570C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E570C/map.bin
+++ b/data/layouts/UnknownMap_082E570C/map.bin
diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/layouts/UnknownMap_082E5730/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5730/border.bin
+++ b/data/layouts/UnknownMap_082E5730/border.bin
diff --git a/data/layouts/UnknownMap_082E5730/layout.inc b/data/layouts/UnknownMap_082E5730/layout.inc
new file mode 100644
index 000000000..e1b39f931
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5730/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5730_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5730/border.bin"
+
+UnknownMap_082E5730_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5730/map.bin"
+
+	.align 2
+UnknownMap_082E5730_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5730_MapBorder
+	.4byte UnknownMap_082E5730_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/layouts/UnknownMap_082E5730/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5730/map.bin
+++ b/data/layouts/UnknownMap_082E5730/map.bin
diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/layouts/UnknownMap_082E5754/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5754/border.bin
+++ b/data/layouts/UnknownMap_082E5754/border.bin
diff --git a/data/layouts/UnknownMap_082E5754/layout.inc b/data/layouts/UnknownMap_082E5754/layout.inc
new file mode 100644
index 000000000..f1b3970f9
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5754/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5754_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5754/border.bin"
+
+UnknownMap_082E5754_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5754/map.bin"
+
+	.align 2
+UnknownMap_082E5754_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5754_MapBorder
+	.4byte UnknownMap_082E5754_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/layouts/UnknownMap_082E5754/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5754/map.bin
+++ b/data/layouts/UnknownMap_082E5754/map.bin
diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/layouts/UnknownMap_082E5778/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5778/border.bin
+++ b/data/layouts/UnknownMap_082E5778/border.bin
diff --git a/data/layouts/UnknownMap_082E5778/layout.inc b/data/layouts/UnknownMap_082E5778/layout.inc
new file mode 100644
index 000000000..457b16610
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5778/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5778_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5778/border.bin"
+
+UnknownMap_082E5778_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5778/map.bin"
+
+	.align 2
+UnknownMap_082E5778_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5778_MapBorder
+	.4byte UnknownMap_082E5778_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/layouts/UnknownMap_082E5778/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5778/map.bin
+++ b/data/layouts/UnknownMap_082E5778/map.bin
diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/layouts/UnknownMap_082E579C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E579C/border.bin
+++ b/data/layouts/UnknownMap_082E579C/border.bin
diff --git a/data/layouts/UnknownMap_082E579C/layout.inc b/data/layouts/UnknownMap_082E579C/layout.inc
new file mode 100644
index 000000000..9550a7acc
--- /dev/null
+++ b/data/layouts/UnknownMap_082E579C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E579C_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E579C/border.bin"
+
+UnknownMap_082E579C_MapBlockdata:
+	.incbin "data/layouts/UnknownMap_082E579C/map.bin"
+
+	.align 2
+UnknownMap_082E579C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E579C_MapBorder
+	.4byte UnknownMap_082E579C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/layouts/UnknownMap_082E579C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E579C/map.bin
+++ b/data/layouts/UnknownMap_082E579C/map.bin
diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/layouts/UnknownMap_082EDF30/border.bin
index 9e4b3fb7a..9e4b3fb7a 100644
--- a/data/maps/UnknownMap_082EDF30/border.bin
+++ b/data/layouts/UnknownMap_082EDF30/border.bin
diff --git a/data/layouts/UnknownMap_082EDF30/layout.inc b/data/layouts/UnknownMap_082EDF30/layout.inc
new file mode 100644
index 000000000..483b21ac5
--- /dev/null
+++ b/data/layouts/UnknownMap_082EDF30/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082EDF30_MapBorder::
+	.incbin "data/layouts/UnknownMap_082EDF30/border.bin"
+
+UnknownMap_082EDF30_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082EDF30/map.bin"
+
+	.align 2
+UnknownMap_082EDF30_Layout::
+	.4byte 0x3A
+	.4byte 0x1A
+	.4byte UnknownMap_082EDF30_MapBorder
+	.4byte UnknownMap_082EDF30_MapBlockdata
+	.4byte gTileset_General
+	.4byte 0
diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/layouts/UnknownMap_082EDF30/map.bin
index 028da0526..028da0526 100644
--- a/data/maps/UnknownMap_082EDF30/map.bin
+++ b/data/layouts/UnknownMap_082EDF30/map.bin
diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/layouts/UnknownMap_082FF894/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/UnknownMap_082FF894/border.bin
+++ b/data/layouts/UnknownMap_082FF894/border.bin
diff --git a/data/layouts/UnknownMap_082FF894/layout.inc b/data/layouts/UnknownMap_082FF894/layout.inc
new file mode 100644
index 000000000..b353645bf
--- /dev/null
+++ b/data/layouts/UnknownMap_082FF894/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082FF894_MapBorder::
+	.incbin "data/layouts/UnknownMap_082FF894/border.bin"
+
+UnknownMap_082FF894_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082FF894/map.bin"
+
+	.align 2
+UnknownMap_082FF894_Layout::
+	.4byte 0x13
+	.4byte 0x13
+	.4byte UnknownMap_082FF894_MapBorder
+	.4byte UnknownMap_082FF894_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/layouts/UnknownMap_082FF894/map.bin
index fd294d9b6..fd294d9b6 100644
--- a/data/maps/UnknownMap_082FF894/map.bin
+++ b/data/layouts/UnknownMap_082FF894/map.bin
diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/layouts/UnknownMap_08302970/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/UnknownMap_08302970/border.bin
+++ b/data/layouts/UnknownMap_08302970/border.bin
diff --git a/data/layouts/UnknownMap_08302970/layout.inc b/data/layouts/UnknownMap_08302970/layout.inc
new file mode 100644
index 000000000..7e4299a89
--- /dev/null
+++ b/data/layouts/UnknownMap_08302970/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_08302970_MapBorder::
+	.incbin "data/layouts/UnknownMap_08302970/border.bin"
+
+UnknownMap_08302970_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08302970/map.bin"
+
+	.align 2
+UnknownMap_08302970_Layout::
+	.4byte 0x3C
+	.4byte 0x28
+	.4byte UnknownMap_08302970_MapBorder
+	.4byte UnknownMap_08302970_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/layouts/UnknownMap_08302970/map.bin
index dd82c58d3..dd82c58d3 100644
--- a/data/maps/UnknownMap_08302970/map.bin
+++ b/data/layouts/UnknownMap_08302970/map.bin
diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/layouts/UnknownMap_083041B4/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/UnknownMap_083041B4/border.bin
+++ b/data/layouts/UnknownMap_083041B4/border.bin
diff --git a/data/layouts/UnknownMap_083041B4/layout.inc b/data/layouts/UnknownMap_083041B4/layout.inc
new file mode 100644
index 000000000..4fd4f176c
--- /dev/null
+++ b/data/layouts/UnknownMap_083041B4/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_083041B4_MapBorder::
+	.incbin "data/layouts/UnknownMap_083041B4/border.bin"
+
+UnknownMap_083041B4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_083041B4/map.bin"
+
+	.align 2
+UnknownMap_083041B4_Layout::
+	.4byte 0x1B
+	.4byte 0x2E
+	.4byte UnknownMap_083041B4_MapBorder
+	.4byte UnknownMap_083041B4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/layouts/UnknownMap_083041B4/map.bin
index ec344933f..ec344933f 100644
--- a/data/maps/UnknownMap_083041B4/map.bin
+++ b/data/layouts/UnknownMap_083041B4/map.bin
diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_29/border.bin
+++ b/data/layouts/UnknownMap_25_29/border.bin
diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc
new file mode 100644
index 000000000..159e6d561
--- /dev/null
+++ b/data/layouts/UnknownMap_25_29/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_29_MapBorder:: @ 82E9898
+	.incbin "data/layouts/UnknownMap_25_29/border.bin"
+
+UnknownMap_25_29_MapBlockdata:: @ 82E98A0
+	.incbin "data/layouts/UnknownMap_25_29/map.bin"
+
+	.align 2
+UnknownMap_25_29_Layout:: @ 82E98A4
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_29_MapBorder
+	.4byte UnknownMap_25_29_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_29/map.bin
+++ b/data/layouts/UnknownMap_25_29/map.bin
diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_30/border.bin
+++ b/data/layouts/UnknownMap_25_30/border.bin
diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc
new file mode 100644
index 000000000..b721ecfa1
--- /dev/null
+++ b/data/layouts/UnknownMap_25_30/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_30_MapBorder:: @ 82E98BC
+	.incbin "data/layouts/UnknownMap_25_30/border.bin"
+
+UnknownMap_25_30_MapBlockdata:: @ 82E98C4
+	.incbin "data/layouts/UnknownMap_25_30/map.bin"
+
+	.align 2
+UnknownMap_25_30_Layout:: @ 82E98C8
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_30_MapBorder
+	.4byte UnknownMap_25_30_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_30/map.bin
+++ b/data/layouts/UnknownMap_25_30/map.bin
diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_31/border.bin
+++ b/data/layouts/UnknownMap_25_31/border.bin
diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc
new file mode 100644
index 000000000..9ac9130f1
--- /dev/null
+++ b/data/layouts/UnknownMap_25_31/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_31_MapBorder:: @ 82E98E0
+	.incbin "data/layouts/UnknownMap_25_31/border.bin"
+
+UnknownMap_25_31_MapBlockdata:: @ 82E98E8
+	.incbin "data/layouts/UnknownMap_25_31/map.bin"
+
+	.align 2
+UnknownMap_25_31_Layout:: @ 82E98EC
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_31_MapBorder
+	.4byte UnknownMap_25_31_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_31/map.bin
+++ b/data/layouts/UnknownMap_25_31/map.bin
diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_32/border.bin
+++ b/data/layouts/UnknownMap_25_32/border.bin
diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc
new file mode 100644
index 000000000..3b7b4b459
--- /dev/null
+++ b/data/layouts/UnknownMap_25_32/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_32_MapBorder:: @ 82E9904
+	.incbin "data/layouts/UnknownMap_25_32/border.bin"
+
+UnknownMap_25_32_MapBlockdata:: @ 82E990C
+	.incbin "data/layouts/UnknownMap_25_32/map.bin"
+
+	.align 2
+UnknownMap_25_32_Layout:: @ 82E9910
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_32_MapBorder
+	.4byte UnknownMap_25_32_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_32/map.bin
+++ b/data/layouts/UnknownMap_25_32/map.bin
diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_33/border.bin
+++ b/data/layouts/UnknownMap_25_33/border.bin
diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc
new file mode 100644
index 000000000..6564dfe6b
--- /dev/null
+++ b/data/layouts/UnknownMap_25_33/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_33_MapBorder:: @ 82E9928
+	.incbin "data/layouts/UnknownMap_25_33/border.bin"
+
+UnknownMap_25_33_MapBlockdata:: @ 82E9930
+	.incbin "data/layouts/UnknownMap_25_33/map.bin"
+
+	.align 2
+UnknownMap_25_33_Layout:: @ 82E9934
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_33_MapBorder
+	.4byte UnknownMap_25_33_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_33/map.bin
+++ b/data/layouts/UnknownMap_25_33/map.bin
diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_34/border.bin
+++ b/data/layouts/UnknownMap_25_34/border.bin
diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc
new file mode 100644
index 000000000..178449d2f
--- /dev/null
+++ b/data/layouts/UnknownMap_25_34/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_34_MapBorder:: @ 82E994C
+	.incbin "data/layouts/UnknownMap_25_34/border.bin"
+
+UnknownMap_25_34_MapBlockdata:: @ 82E9954
+	.incbin "data/layouts/UnknownMap_25_34/map.bin"
+
+	.align 2
+UnknownMap_25_34_Layout:: @ 82E9958
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_34_MapBorder
+	.4byte UnknownMap_25_34_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_34/map.bin
+++ b/data/layouts/UnknownMap_25_34/map.bin
diff --git a/data/maps/UnreferencedMap/border.bin b/data/layouts/UnreferencedMap/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/UnreferencedMap/border.bin
+++ b/data/layouts/UnreferencedMap/border.bin
diff --git a/data/layouts/UnreferencedMap/layout.inc b/data/layouts/UnreferencedMap/layout.inc
new file mode 100644
index 000000000..14edbb25d
--- /dev/null
+++ b/data/layouts/UnreferencedMap/layout.inc
@@ -0,0 +1,14 @@
+UnreferencedMap_MapBorder:: @ 82BD8DC
+	.incbin "data/layouts/UnreferencedMap/border.bin"
+
+UnreferencedMap_MapBlockdata: @ 82BD8E4
+	.incbin "data/layouts/UnreferencedMap/map.bin"
+
+	.align 2
+UnreferencedMap_Layout:: @ 82BF1E4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte UnreferencedMap_MapBorder
+	.4byte UnreferencedMap_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnreferencedMap/map.bin b/data/layouts/UnreferencedMap/map.bin
index 17a14a8d5..17a14a8d5 100644
--- a/data/maps/UnreferencedMap/map.bin
+++ b/data/layouts/UnreferencedMap/map.bin
diff --git a/data/maps/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/VerdanturfTown/border.bin
+++ b/data/layouts/VerdanturfTown/border.bin
diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc
new file mode 100644
index 000000000..1e69e75c1
--- /dev/null
+++ b/data/layouts/VerdanturfTown/layout.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_MapBorder:: @ 82923EC
+	.incbin "data/layouts/VerdanturfTown/border.bin"
+
+VerdanturfTown_MapBlockdata:: @ 82923F4
+	.incbin "data/layouts/VerdanturfTown/map.bin"
+
+	.align 2
+VerdanturfTown_Layout:: @ 8292714
+	.4byte 0x14
+	.4byte 0x14
+	.4byte VerdanturfTown_MapBorder
+	.4byte VerdanturfTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/VerdanturfTown/map.bin b/data/layouts/VerdanturfTown/map.bin
index 0dbece956..0dbece956 100644
--- a/data/maps/VerdanturfTown/map.bin
+++ b/data/layouts/VerdanturfTown/map.bin
diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/VerdanturfTown_WandasHouse/border.bin
+++ b/data/layouts/VerdanturfTown_WandasHouse/border.bin
diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
new file mode 100644
index 000000000..a6922408b
--- /dev/null
+++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
+	.incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin"
+
+VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584
+	.incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin"
+
+	.align 2
+VerdanturfTown_WandasHouse_Layout:: @ 82CF694
+	.4byte 0x11
+	.4byte 0x8
+	.4byte VerdanturfTown_WandasHouse_MapBorder
+	.4byte VerdanturfTown_WandasHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/layouts/VerdanturfTown_WandasHouse/map.bin
index 95d14d3c4..95d14d3c4 100644
--- a/data/maps/VerdanturfTown_WandasHouse/map.bin
+++ b/data/layouts/VerdanturfTown_WandasHouse/map.bin
diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_1F/border.bin
+++ b/data/layouts/VictoryRoad_1F/border.bin
diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc
new file mode 100644
index 000000000..5d0bd41d1
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_1F_MapBorder:: @ 82E105C
+	.incbin "data/layouts/VictoryRoad_1F/border.bin"
+
+VictoryRoad_1F_MapBlockdata:: @ 82E1064
+	.incbin "data/layouts/VictoryRoad_1F/map.bin"
+
+	.align 2
+VictoryRoad_1F_Layout:: @ 82E2090
+	.4byte 0x2e
+	.4byte 0x2d
+	.4byte VictoryRoad_1F_MapBorder
+	.4byte VictoryRoad_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin
index a78316ef9..a78316ef9 100644
--- a/data/maps/VictoryRoad_1F/map.bin
+++ b/data/layouts/VictoryRoad_1F/map.bin
diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_B1F/border.bin
+++ b/data/layouts/VictoryRoad_B1F/border.bin
diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc
new file mode 100644
index 000000000..1613743cf
--- /dev/null
+++ b/data/layouts/VictoryRoad_B1F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_B1F_MapBorder:: @ 82F83D0
+	.incbin "data/layouts/VictoryRoad_B1F/border.bin"
+
+VictoryRoad_B1F_MapBlockdata:: @ 82F83D8
+	.incbin "data/layouts/VictoryRoad_B1F/map.bin"
+
+	.align 2
+VictoryRoad_B1F_Layout:: @ 82F8EFC
+	.4byte 0x2e
+	.4byte 0x1f
+	.4byte VictoryRoad_B1F_MapBorder
+	.4byte VictoryRoad_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/layouts/VictoryRoad_B1F/map.bin
index 706c96974..706c96974 100644
--- a/data/maps/VictoryRoad_B1F/map.bin
+++ b/data/layouts/VictoryRoad_B1F/map.bin
diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_B2F/border.bin
+++ b/data/layouts/VictoryRoad_B2F/border.bin
diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc
new file mode 100644
index 000000000..ff4ddb865
--- /dev/null
+++ b/data/layouts/VictoryRoad_B2F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_B2F_MapBorder:: @ 82F8F14
+	.incbin "data/layouts/VictoryRoad_B2F/border.bin"
+
+VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C
+	.incbin "data/layouts/VictoryRoad_B2F/map.bin"
+
+	.align 2
+VictoryRoad_B2F_Layout:: @ 82F9A40
+	.4byte 0x2e
+	.4byte 0x1f
+	.4byte VictoryRoad_B2F_MapBorder
+	.4byte VictoryRoad_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/layouts/VictoryRoad_B2F/map.bin
index 682c31764..682c31764 100644
--- a/data/maps/VictoryRoad_B2F/map.bin
+++ b/data/layouts/VictoryRoad_B2F/map.bin
diff --git a/data/layouts_table.inc b/data/layouts_table.inc
new file mode 100644
index 000000000..cda6e5423
--- /dev/null
+++ b/data/layouts_table.inc
@@ -0,0 +1,334 @@
+	.align 2
+gMapLayouts:: @ 8304F18
+	.4byte PetalburgCity_Layout
+	.4byte SlateportCity_Layout
+	.4byte MauvilleCity_Layout
+	.4byte RustboroCity_Layout
+	.4byte FortreeCity_Layout
+	.4byte LilycoveCity_Layout
+	.4byte MossdeepCity_Layout
+	.4byte SootopolisCity_Layout
+	.4byte EverGrandeCity_Layout
+	.4byte LittlerootTown_Layout
+	.4byte OldaleTown_Layout
+	.4byte DewfordTown_Layout
+	.4byte LavaridgeTown_Layout
+	.4byte FallarborTown_Layout
+	.4byte VerdanturfTown_Layout
+	.4byte PacifidlogTown_Layout
+	.4byte Route101_Layout
+	.4byte Route102_Layout
+	.4byte Route103_Layout
+	.4byte Route104_Layout
+	.4byte Route105_Layout
+	.4byte Route106_Layout
+	.4byte Route107_Layout
+	.4byte Route108_Layout
+	.4byte Route109_Layout
+	.4byte Route110_Layout
+	.4byte Route111_Layout
+	.4byte Route112_Layout
+	.4byte Route113_Layout
+	.4byte Route114_Layout
+	.4byte Route115_Layout
+	.4byte Route116_Layout
+	.4byte Route117_Layout
+	.4byte Route118_Layout
+	.4byte Route119_Layout
+	.4byte Route120_Layout
+	.4byte Route121_Layout
+	.4byte Route122_Layout
+	.4byte Route123_Layout
+	.4byte Route124_Layout
+	.4byte Route125_Layout
+	.4byte Route126_Layout
+	.4byte Route127_Layout
+	.4byte Route128_Layout
+	.4byte Route129_Layout
+	.4byte UnreferencedMap_Layout
+	.4byte Route131_Layout
+	.4byte Route132_Layout
+	.4byte Route133_Layout
+	.4byte Route134_Layout
+	.4byte Underwater2_Layout
+	.4byte Underwater3_Layout
+	.4byte Underwater4_Layout
+	.4byte LittlerootTown_BrendansHouse_1F_Layout
+	.4byte LittlerootTown_BrendansHouse_2F_Layout
+	.4byte LittlerootTown_MaysHouse_1F_Layout
+	.4byte LittlerootTown_MaysHouse_2F_Layout
+	.4byte LittlerootTown_ProfessorBirchsLab_Layout
+	.4byte House1_Layout
+	.4byte House2_Layout
+	.4byte PokemonCenter_1F_Layout
+	.4byte PokemonCenter_2F_Layout
+	.4byte PokeMart_Layout
+	.4byte House3_Layout
+	.4byte DewfordTown_Gym_Layout
+	.4byte DewfordTown_Hall_Layout
+	.4byte House4_Layout
+	.4byte LavaridgeTown_HerbShop_Layout
+	.4byte LavaridgeTown_Gym_1F_Layout
+	.4byte LavaridgeTown_Gym_B1F_Layout
+	.4byte LavaridgeTown_PokemonCenter_1F_Layout
+	.4byte ContestLobby_Layout
+	.4byte ContestHall_Layout
+	.4byte LilycoveCity_House2_Layout
+	.4byte UnknownMap_082CF564_Layout
+	.4byte VerdanturfTown_WandasHouse_Layout
+	.4byte PacifidlogTown_House1_Layout
+	.4byte PacifidlogTown_House2_Layout
+	.4byte PetalburgCity_Gym_Layout
+	.4byte HouseWithBed_Layout
+	.4byte SlateportCity_SternsShipyard_1F_Layout
+	.4byte SlateportCity_SternsShipyard_2F_Layout
+	.4byte UnknownMap_082D05D8_Layout
+	.4byte UnknownMap_082D05FC_Layout
+	.4byte SlateportCity_PokemonFanClub_Layout
+	.4byte SlateportCity_OceanicMuseum_1F_Layout
+	.4byte SlateportCity_OceanicMuseum_2F_Layout
+	.4byte Harbor_Layout
+	.4byte MauvilleCity_Gym_Layout
+	.4byte MauvilleCity_BikeShop_Layout
+	.4byte MauvilleCity_GameCorner_Layout
+	.4byte RustboroCity_DevonCorp_1F_Layout
+	.4byte RustboroCity_DevonCorp_2F_Layout
+	.4byte RustboroCity_Gym_Layout
+	.4byte RustboroCity_PokemonSchool_Layout
+	.4byte RustboroCity_House_Layout
+	.4byte RustboroCity_House1_Layout
+	.4byte RustboroCity_CuttersHouse_Layout
+	.4byte FortreeCity_House1_Layout
+	.4byte FortreeCity_Gym_Layout
+	.4byte FortreeCity_House2_Layout
+	.4byte Route104_MrBrineysHouse_Layout
+	.4byte LilycoveCity_LilycoveMuseum_1F_Layout
+	.4byte LilycoveCity_LilycoveMuseum_2F_Layout
+	.4byte LilycoveCity_ContestLobby_Layout
+	.4byte LilycoveCity_ContestHall_Layout
+	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
+	.4byte LilycoveCity_EmptyMap_Layout
+	.4byte MossdeepCity_Gym_Layout
+	.4byte SootopolisCity_Gym_1F_Layout
+	.4byte SootopolisCity_Gym_B1F_Layout
+	.4byte EverGrandeCity_SidneysRoom_Layout
+	.4byte EverGrandeCity_PhoebesRoom_Layout
+	.4byte EverGrandeCity_GlaciasRoom_Layout
+	.4byte EverGrandeCity_DrakesRoom_Layout
+	.4byte EverGrandeCity_ChampionsRoom_Layout
+	.4byte EverGrandeCity_ShortCorridor_Layout
+	.4byte Route104_PrettyPetalFlowerShop_Layout
+	.4byte CableCarStation_Layout
+	.4byte Route114_FossilManiacsHouse_Layout
+	.4byte Route114_FossilManiacsTunnel_Layout
+	.4byte Route114_LanettesHouse_Layout
+	.4byte Route116_TunnelersRestHouse_Layout
+	.4byte Route117_PokemonDayCare_Layout
+	.4byte Route121_SafariZoneEntrance_Layout
+	.4byte MeteorFalls_1F_1R_Layout
+	.4byte MeteorFalls_1F_2R_Layout
+	.4byte MeteorFalls_B1F_1R_Layout
+	.4byte MeteorFalls_B1F_2R_Layout
+	.4byte RusturfTunnel_Layout
+	.4byte Underwater_SootopolisCity_Layout
+	.4byte DesertRuins_Layout
+	.4byte GraniteCave_1F_Layout
+	.4byte GraniteCave_B1F_Layout
+	.4byte GraniteCave_B2F_Layout
+	.4byte PetalburgWoods_Layout
+	.4byte MtChimney_Layout
+	.4byte MtPyre_1F_Layout
+	.4byte MtPyre_2F_Layout
+	.4byte MtPyre_3F_Layout
+	.4byte MtPyre_4F_Layout
+	.4byte MtPyre_5F_Layout
+	.4byte MtPyre_6F_Layout
+	.4byte AquaHideout_1F_Layout
+	.4byte AquaHideout_B1F_Layout
+	.4byte AquaHideout_B2F_Layout
+	.4byte Underwater_SeafloorCavern_Layout
+	.4byte SeafloorCavern_Entrance_Layout
+	.4byte SeafloorCavern_Room1_Layout
+	.4byte SeafloorCavern_Room2_Layout
+	.4byte SeafloorCavern_Room3_Layout
+	.4byte SeafloorCavern_Room4_Layout
+	.4byte SeafloorCavern_Room5_Layout
+	.4byte SeafloorCavern_Room6_Layout
+	.4byte SeafloorCavern_Room7_Layout
+	.4byte SeafloorCavern_Room8_Layout
+	.4byte SeafloorCavern_Room9_Layout
+	.4byte CaveOfOrigin_Entrance_Layout
+	.4byte CaveOfOrigin_1F_Layout
+	.4byte CaveOfOrigin_B1F_Layout
+	.4byte CaveOfOrigin_B2F_Layout
+	.4byte CaveOfOrigin_B3F_Layout
+	.4byte CaveOfOrigin_B4F_Layout
+	.4byte VictoryRoad_1F_Layout
+	.4byte ShoalCave_LowTideEntranceRoom_Layout
+	.4byte ShoalCave_LowTideInnerRoom_Layout
+	.4byte ShoalCave_LowTideStairsRoom_Layout
+	.4byte ShoalCave_LowTideLowerRoom_Layout
+	.4byte ShoalCave_HighTideEntranceRoom_Layout
+	.4byte ShoalCave_HighTideInnerRoom_Layout
+	.4byte UnknownMap_082E55C8_Layout @ unused maps
+	.4byte UnknownMap_082E55EC_Layout
+	.4byte UnknownMap_082E5610_Layout
+	.4byte UnknownMap_082E5634_Layout
+	.4byte UnknownMap_082E5658_Layout
+	.4byte UnknownMap_082E567C_Layout
+	.4byte UnknownMap_082E56A0_Layout
+	.4byte UnknownMap_082E56C4_Layout
+	.4byte UnknownMap_082E56E8_Layout
+	.4byte UnknownMap_082E570C_Layout
+	.4byte UnknownMap_082E5730_Layout
+	.4byte UnknownMap_082E5754_Layout
+	.4byte UnknownMap_082E5778_Layout
+	.4byte UnknownMap_082E579C_Layout
+	.4byte NewMauville_Entrance_Layout
+	.4byte NewMauville_Inside_Layout
+	.4byte AbandonedShip_Deck_Layout
+	.4byte AbandonedShip_Corridors_1F_Layout
+	.4byte AbandonedShip_Rooms_1F_Layout
+	.4byte AbandonedShip_Corridors_B1F_Layout
+	.4byte AbandonedShip_Rooms_B1F_Layout
+	.4byte AbandonedShip_Rooms2_B1F_Layout
+	.4byte AbandonedShip_Underwater1_Layout
+	.4byte AbandonedShip_Room_B1F_Layout
+	.4byte AbandonedShip_Rooms2_1F_Layout
+	.4byte AbandonedShip_CaptainsOffice_Layout
+	.4byte AbandonedShip_Underwater2_Layout
+	.4byte SecretBase_RedCave1_Layout
+	.4byte SecretBase_BrownCave1_Layout
+	.4byte SecretBase_BlueCave1_Layout
+	.4byte SecretBase_YellowCave1_Layout
+	.4byte SecretBase_Tree1_Layout
+	.4byte SecretBase_Shrub1_Layout
+	.4byte SecretBase_RedCave2_Layout
+	.4byte SecretBase_BrownCave2_Layout
+	.4byte SecretBase_BlueCave2_Layout
+	.4byte SecretBase_YellowCave2_Layout
+	.4byte SecretBase_Tree2_Layout
+	.4byte SecretBase_Shrub2_Layout
+	.4byte SecretBase_RedCave3_Layout
+	.4byte SecretBase_BrownCave3_Layout
+	.4byte SecretBase_BlueCave3_Layout
+	.4byte SecretBase_YellowCave3_Layout
+	.4byte SecretBase_Tree3_Layout
+	.4byte SecretBase_Shrub3_Layout
+	.4byte SecretBase_RedCave4_Layout
+	.4byte SecretBase_BrownCave4_Layout
+	.4byte SecretBase_BlueCave4_Layout
+	.4byte SecretBase_YellowCave4_Layout
+	.4byte SecretBase_Tree4_Layout
+	.4byte SecretBase_Shrub4_Layout
+	.4byte SingleBattleColosseum_Layout
+	.4byte TradeCenter_Layout
+	.4byte RecordCorner_Layout
+	.4byte DoubleBattleColosseum_Layout
+	.4byte LinkContestRoom1_Layout
+	.4byte UnknownMap_25_29_Layout
+	.4byte UnknownMap_25_30_Layout
+	.4byte UnknownMap_25_31_Layout
+	.4byte UnknownMap_25_32_Layout
+	.4byte UnknownMap_25_33_Layout
+	.4byte UnknownMap_25_34_Layout
+	.4byte LinkContestRoom2_Layout
+	.4byte LinkContestRoom3_Layout
+	.4byte LinkContestRoom4_Layout
+	.4byte LinkContestRoom5_Layout
+	.4byte LinkContestRoom6_Layout
+	.4byte InsideOfTruck_Layout
+	.4byte SafariZone_Northwest_Layout
+	.4byte SafariZone_Northeast_Layout
+	.4byte SafariZone_Southwest_Layout
+	.4byte SafariZone_Southeast_Layout
+	.4byte UnknownMap_082EDF30_Layout
+	.4byte Route109_SeashoreHouse_Layout
+	.4byte Route110_TrickHouseEntrance_Layout
+	.4byte Route110_TrickHouseEnd_Layout
+	.4byte Route110_TrickHouseCorridor_Layout
+	.4byte Route110_TrickHousePuzzle1_Layout
+	.4byte Route110_TrickHousePuzzle2_Layout
+	.4byte Route110_TrickHousePuzzle3_Layout
+	.4byte Route110_TrickHousePuzzle4_Layout
+	.4byte Route110_TrickHousePuzzle5_Layout
+	.4byte Route110_TrickHousePuzzle6_Layout
+	.4byte Route110_TrickHousePuzzle7_Layout
+	.4byte Route110_TrickHousePuzzle8_Layout
+	.4byte FortreeCity_DecorationShop_Layout
+	.4byte Route110_SeasideCyclingRoadEntrace_Layout
+	.4byte LilycoveCity_DepartmentStore_1F_Layout
+	.4byte LilycoveCity_DepartmentStore_2F_Layout
+	.4byte LilycoveCity_DepartmentStore_3F_Layout
+	.4byte LilycoveCity_DepartmentStore_4F_Layout
+	.4byte LilycoveCity_DepartmentStore_5F_Layout
+	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
+	.4byte Route130_Layout
+	.4byte BattleTower_Lobby_Layout
+	.4byte BattleTower_Outside_Layout
+	.4byte BattleTower_Elevator_Layout
+	.4byte BattleTower_Corridor_Layout
+	.4byte BattleTower_BattleRoom_Layout
+	.4byte RustboroCity_DevonCorp_3F_Layout
+	.4byte EverGrandeCity_PokemonLeague_Layout
+	.4byte Route119_WeatherInstitute_1F_Layout
+	.4byte Route119_WeatherInstitute_2F_Layout
+	.4byte LilycoveCity_DepartmentStoreElevator_Layout
+	.4byte Underwater1_Layout
+	.4byte MossdeepCity_SpaceCenter_1F_Layout
+	.4byte MossdeepCity_SpaceCenter_2F_Layout
+	.4byte SSTidalCorridor_Layout
+	.4byte SSTidalLowerDeck_Layout
+	.4byte SSTidalRooms_Layout
+	.4byte IslandCave_Layout
+	.4byte AncientTomb_Layout
+	.4byte Underwater_Route134_Layout
+	.4byte Underwater_SealedChamber_Layout
+	.4byte SealedChamber_OuterRoom_Layout
+	.4byte VictoryRoad_B1F_Layout
+	.4byte VictoryRoad_B2F_Layout
+	.4byte Route104_Prototype_Layout
+	.4byte GraniteCave_StevensRoom_Layout
+	.4byte AbandonedShip_HiddenFloorCorridors_Layout
+	.4byte SouthernIsland_Exterior_Layout
+	.4byte SouthernIsland_Interior_Layout
+	.4byte JaggedPass_Layout
+	.4byte FieryPath_Layout
+	.4byte RustboroCity_Flat2_1F_Layout
+	.4byte RustboroCity_Flat2_2F_Layout
+	.4byte RustboroCity_Flat2_3F_Layout
+	.4byte SootopolisCity_House8_Layout
+	.4byte EverGrandeCity_HallOfFame_Layout
+	.4byte LilycoveCity_CoveLilyMotel_1F_Layout
+	.4byte LilycoveCity_CoveLilyMotel_2F_Layout
+	.4byte Route124_DivingTreasureHuntersHouse_Layout
+	.4byte MtPyre_Exterior_Layout
+	.4byte MtPyre_Summit_Layout
+	.4byte SealedChamber_InnerRoom_Layout
+	.4byte MossdeepCity_GameCorner_1F_Layout
+	.4byte MossdeepCity_GameCorner_B1F_Layout
+	.4byte SootopolisCity_House1_Layout
+	.4byte SootopolisCity_House2_Layout
+	.4byte SootopolisCity_House3_Layout
+	.4byte AbandonedShip_HiddenFloorRooms_Layout
+	.4byte ScorchedSlab_Layout
+	.4byte UnknownMap_082FF894_Layout
+	.4byte RustboroCity_Flat1_1F_Layout
+	.4byte RustboroCity_Flat1_2F_Layout
+	.4byte EverGrandeCity_Corridor4_Layout
+	.4byte MagmaHideout_1F_Layout
+	.4byte MagmaHideout_B1F_Layout
+	.4byte MagmaHideout_B2F_Layout
+	.4byte UnknownMap_08302970_Layout
+	.4byte SkyPillar_Entrance_Layout
+	.4byte SkyPillar_Outside_Layout
+	.4byte SkyPillar_1F_Layout
+	.4byte SkyPillar_2F_Layout
+	.4byte SkyPillar_3F_Layout
+	.4byte SkyPillar_4F_Layout
+	.4byte UnknownMap_083041B4_Layout
+	.4byte MossdeepCity_StevensHouse_Layout
+	.4byte ShoalCave_LowTideIceRoom_Layout
+	.4byte SafariZone_RestHouse_Layout
+	.4byte SkyPillar_5F_Layout
+	.4byte SkyPillar_Top_Layout
diff --git a/data/map_events.s b/data/map_events.s
index 02050c401..e6fe363f8 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -5,402 +5,403 @@
 #include "constants/secret_bases.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
+
 	.include "include/macros.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
 
-	.include "data/maps/events/PetalburgCity.inc"
-	.include "data/maps/events/SlateportCity.inc"
-	.include "data/maps/events/MauvilleCity.inc"
-	.include "data/maps/events/RustboroCity.inc"
-	.include "data/maps/events/FortreeCity.inc"
-	.include "data/maps/events/LilycoveCity.inc"
-	.include "data/maps/events/MossdeepCity.inc"
-	.include "data/maps/events/SootopolisCity.inc"
-	.include "data/maps/events/EverGrandeCity.inc"
-	.include "data/maps/events/LittlerootTown.inc"
-	.include "data/maps/events/OldaleTown.inc"
-	.include "data/maps/events/DewfordTown.inc"
-	.include "data/maps/events/LavaridgeTown.inc"
-	.include "data/maps/events/FallarborTown.inc"
-	.include "data/maps/events/VerdanturfTown.inc"
-	.include "data/maps/events/PacifidlogTown.inc"
-	.include "data/maps/events/Route101.inc"
-	.include "data/maps/events/Route102.inc"
-	.include "data/maps/events/Route103.inc"
-	.include "data/maps/events/Route104.inc"
-	.include "data/maps/events/Route105.inc"
-	.include "data/maps/events/Route106.inc"
-	.include "data/maps/events/Route107.inc"
-	.include "data/maps/events/Route108.inc"
-	.include "data/maps/events/Route109.inc"
-	.include "data/maps/events/Route110.inc"
-	.include "data/maps/events/Route111.inc"
-	.include "data/maps/events/Route112.inc"
-	.include "data/maps/events/Route113.inc"
-	.include "data/maps/events/Route114.inc"
-	.include "data/maps/events/Route115.inc"
-	.include "data/maps/events/Route116.inc"
-	.include "data/maps/events/Route117.inc"
-	.include "data/maps/events/Route118.inc"
-	.include "data/maps/events/Route119.inc"
-	.include "data/maps/events/Route120.inc"
-	.include "data/maps/events/Route121.inc"
-	.include "data/maps/events/Route122.inc"
-	.include "data/maps/events/Route123.inc"
-	.include "data/maps/events/Route124.inc"
-	.include "data/maps/events/Route125.inc"
-	.include "data/maps/events/Route126.inc"
-	.include "data/maps/events/Route127.inc"
-	.include "data/maps/events/Route128.inc"
-	.include "data/maps/events/Route129.inc"
-	.include "data/maps/events/Route130.inc"
-	.include "data/maps/events/Route131.inc"
-	.include "data/maps/events/Route132.inc"
-	.include "data/maps/events/Route133.inc"
-	.include "data/maps/events/Route134.inc"
-	.include "data/maps/events/Underwater1.inc"
-	.include "data/maps/events/Underwater2.inc"
-	.include "data/maps/events/Underwater3.inc"
-	.include "data/maps/events/Underwater4.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/maps/events/OldaleTown_House1.inc"
-	.include "data/maps/events/OldaleTown_House2.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/OldaleTown_Mart.inc"
-	.include "data/maps/events/DewfordTown_House1.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/DewfordTown_Gym.inc"
-	.include "data/maps/events/DewfordTown_Hall.inc"
-	.include "data/maps/events/DewfordTown_House2.inc"
-	.include "data/maps/events/LavaridgeTown_HerbShop.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_1F.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_B1F.inc"
-	.include "data/maps/events/LavaridgeTown_House.inc"
-	.include "data/maps/events/LavaridgeTown_Mart.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_Mart.inc"
-	.include "data/maps/events/FallarborTown_ContestLobby.inc"
-	.include "data/maps/events/FallarborTown_ContestHall.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_House1.inc"
-	.include "data/maps/events/FallarborTown_House2.inc"
-	.include "data/maps/events/VerdanturfTown_ContestLobby.inc"
-	.include "data/maps/events/VerdanturfTown_ContestHall.inc"
-	.include "data/maps/events/VerdanturfTown_Mart.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/VerdanturfTown_WandasHouse.inc"
-	.include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/maps/events/VerdanturfTown_House.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/PacifidlogTown_House1.inc"
-	.include "data/maps/events/PacifidlogTown_House2.inc"
-	.include "data/maps/events/PacifidlogTown_House3.inc"
-	.include "data/maps/events/PacifidlogTown_House4.inc"
-	.include "data/maps/events/PacifidlogTown_House5.inc"
-	.include "data/maps/events/PetalburgCity_WallysHouse.inc"
-	.include "data/maps/events/PetalburgCity_Gym.inc"
-	.include "data/maps/events/PetalburgCity_House1.inc"
-	.include "data/maps/events/PetalburgCity_House2.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/PetalburgCity_Mart.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/maps/events/SlateportCity_ContestLobby.inc"
-	.include "data/maps/events/SlateportCity_ContestHall.inc"
-	.include "data/maps/events/SlateportCity_House1.inc"
-	.include "data/maps/events/SlateportCity_PokemonFanClub.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/maps/events/SlateportCity_Harbor.inc"
-	.include "data/maps/events/SlateportCity_House2.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SlateportCity_Mart.inc"
-	.include "data/maps/events/MauvilleCity_Gym.inc"
-	.include "data/maps/events/MauvilleCity_BikeShop.inc"
-	.include "data/maps/events/MauvilleCity_House1.inc"
-	.include "data/maps/events/MauvilleCity_GameCorner.inc"
-	.include "data/maps/events/MauvilleCity_House2.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MauvilleCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_1F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_2F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_3F.inc"
-	.include "data/maps/events/RustboroCity_Gym.inc"
-	.include "data/maps/events/RustboroCity_PokemonSchool.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/RustboroCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_Flat1_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat1_2F.inc"
-	.include "data/maps/events/RustboroCity_House1.inc"
-	.include "data/maps/events/RustboroCity_CuttersHouse.inc"
-	.include "data/maps/events/RustboroCity_House2.inc"
-	.include "data/maps/events/RustboroCity_Flat2_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_2F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_3F.inc"
-	.include "data/maps/events/RustboroCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House1.inc"
-	.include "data/maps/events/FortreeCity_Gym.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/FortreeCity_Mart.inc"
-	.include "data/maps/events/FortreeCity_House2.inc"
-	.include "data/maps/events/FortreeCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House4.inc"
-	.include "data/maps/events/FortreeCity_House5.inc"
-	.include "data/maps/events/FortreeCity_DecorationShop.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/maps/events/LilycoveCity_ContestLobby.inc"
-	.include "data/maps/events/LilycoveCity_ContestHall.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/LilycoveCity_UnusedMart.inc"
-	.include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/maps/events/LilycoveCity_Harbor.inc"
-	.include "data/maps/events/LilycoveCity_EmptyMap.inc"
-	.include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/maps/events/LilycoveCity_House1.inc"
-	.include "data/maps/events/LilycoveCity_House2.inc"
-	.include "data/maps/events/LilycoveCity_House3.inc"
-	.include "data/maps/events/LilycoveCity_House4.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/maps/events/MossdeepCity_Gym.inc"
-	.include "data/maps/events/MossdeepCity_House1.inc"
-	.include "data/maps/events/MossdeepCity_House2.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_Mart.inc"
-	.include "data/maps/events/MossdeepCity_House3.inc"
-	.include "data/maps/events/MossdeepCity_StevensHouse.inc"
-	.include "data/maps/events/MossdeepCity_House4.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_1F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_B1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SootopolisCity_Mart.inc"
-	.include "data/maps/events/SootopolisCity_House1.inc"
-	.include "data/maps/events/SootopolisCity_House2.inc"
-	.include "data/maps/events/SootopolisCity_House3.inc"
-	.include "data/maps/events/SootopolisCity_House4.inc"
-	.include "data/maps/events/SootopolisCity_House5.inc"
-	.include "data/maps/events/SootopolisCity_House6.inc"
-	.include "data/maps/events/SootopolisCity_House7.inc"
-	.include "data/maps/events/SootopolisCity_House8.inc"
-	.include "data/maps/events/EverGrandeCity_SidneysRoom.inc"
-	.include "data/maps/events/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/maps/events/EverGrandeCity_DrakesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor1.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor2.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor3.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor4.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor5.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague.inc"
-	.include "data/maps/events/EverGrandeCity_HallOfFame.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/Route104_MrBrineysHouse.inc"
-	.include "data/maps/events/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route111_WinstrateFamilysHouse.inc"
-	.include "data/maps/events/Route111_OldLadysRestStop.inc"
-	.include "data/maps/events/Route112_CableCarStation.inc"
-	.include "data/maps/events/MtChimney_CableCarStation.inc"
-	.include "data/maps/events/Route114_FossilManiacsHouse.inc"
-	.include "data/maps/events/Route114_FossilManiacsTunnel.inc"
-	.include "data/maps/events/Route114_LanettesHouse.inc"
-	.include "data/maps/events/Route116_TunnelersRestHouse.inc"
-	.include "data/maps/events/Route117_PokemonDayCare.inc"
-	.include "data/maps/events/Route121_SafariZoneEntrance.inc"
-	.include "data/maps/events/MeteorFalls_1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_1F_2R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_2R.inc"
-	.include "data/maps/events/RusturfTunnel.inc"
-	.include "data/maps/events/Underwater_SootopolisCity.inc"
-	.include "data/maps/events/DesertRuins.inc"
-	.include "data/maps/events/GraniteCave_1F.inc"
-	.include "data/maps/events/GraniteCave_B1F.inc"
-	.include "data/maps/events/GraniteCave_B2F.inc"
-	.include "data/maps/events/GraniteCave_StevensRoom.inc"
-	.include "data/maps/events/PetalburgWoods.inc"
-	.include "data/maps/events/MtChimney.inc"
-	.include "data/maps/events/JaggedPass.inc"
-	.include "data/maps/events/FieryPath.inc"
-	.include "data/maps/events/MtPyre_1F.inc"
-	.include "data/maps/events/MtPyre_2F.inc"
-	.include "data/maps/events/MtPyre_3F.inc"
-	.include "data/maps/events/MtPyre_4F.inc"
-	.include "data/maps/events/MtPyre_5F.inc"
-	.include "data/maps/events/MtPyre_6F.inc"
-	.include "data/maps/events/MtPyre_Exterior.inc"
-	.include "data/maps/events/MtPyre_Summit.inc"
-	.include "data/maps/events/AquaHideout_1F.inc"
-	.include "data/maps/events/AquaHideout_B1F.inc"
-	.include "data/maps/events/AquaHideout_B2F.inc"
-	.include "data/maps/events/Underwater_SeafloorCavern.inc"
-	.include "data/maps/events/SeafloorCavern_Entrance.inc"
-	.include "data/maps/events/SeafloorCavern_Room1.inc"
-	.include "data/maps/events/SeafloorCavern_Room2.inc"
-	.include "data/maps/events/SeafloorCavern_Room3.inc"
-	.include "data/maps/events/SeafloorCavern_Room4.inc"
-	.include "data/maps/events/SeafloorCavern_Room5.inc"
-	.include "data/maps/events/SeafloorCavern_Room6.inc"
-	.include "data/maps/events/SeafloorCavern_Room7.inc"
-	.include "data/maps/events/SeafloorCavern_Room8.inc"
-	.include "data/maps/events/SeafloorCavern_Room9.inc"
-	.include "data/maps/events/CaveOfOrigin_Entrance.inc"
-	.include "data/maps/events/CaveOfOrigin_1F.inc"
-	.include "data/maps/events/CaveOfOrigin_B1F.inc"
-	.include "data/maps/events/CaveOfOrigin_B2F.inc"
-	.include "data/maps/events/CaveOfOrigin_B3F.inc"
-	.include "data/maps/events/CaveOfOrigin_B4F.inc"
-	.include "data/maps/events/VictoryRoad_1F.inc"
-	.include "data/maps/events/VictoryRoad_B1F.inc"
-	.include "data/maps/events/VictoryRoad_B2F.inc"
-	.include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/maps/events/NewMauville_Entrance.inc"
-	.include "data/maps/events/NewMauville_Inside.inc"
-	.include "data/maps/events/AbandonedShip_Deck.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_1F.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Underwater1.inc"
-	.include "data/maps/events/AbandonedShip_Room_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_1F.inc"
-	.include "data/maps/events/AbandonedShip_CaptainsOffice.inc"
-	.include "data/maps/events/AbandonedShip_Underwater2.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/maps/events/IslandCave.inc"
-	.include "data/maps/events/AncientTomb.inc"
-	.include "data/maps/events/Underwater_Route134.inc"
-	.include "data/maps/events/Underwater_SealedChamber.inc"
-	.include "data/maps/events/SealedChamber_OuterRoom.inc"
-	.include "data/maps/events/SealedChamber_InnerRoom.inc"
-	.include "data/maps/events/ScorchedSlab.inc"
-	.include "data/maps/events/MagmaHideout_1F.inc"
-	.include "data/maps/events/MagmaHideout_B1F.inc"
-	.include "data/maps/events/MagmaHideout_B2F.inc"
-	.include "data/maps/events/SkyPillar_Entrance.inc"
-	.include "data/maps/events/SkyPillar_Outside.inc"
-	.include "data/maps/events/SkyPillar_1F.inc"
-	.include "data/maps/events/SkyPillar_2F.inc"
-	.include "data/maps/events/SkyPillar_3F.inc"
-	.include "data/maps/events/SkyPillar_4F.inc"
-	.include "data/maps/events/ShoalCave_LowTideIceRoom.inc"
-	.include "data/maps/events/SkyPillar_5F.inc"
-	.include "data/maps/events/SkyPillar_Top.inc"
-	.include "data/maps/events/SecretBase_RedCave1.inc"
-	.include "data/maps/events/SecretBase_BrownCave1.inc"
-	.include "data/maps/events/SecretBase_BlueCave1.inc"
-	.include "data/maps/events/SecretBase_YellowCave1.inc"
-	.include "data/maps/events/SecretBase_Tree1.inc"
-	.include "data/maps/events/SecretBase_Shrub1.inc"
-	.include "data/maps/events/SecretBase_RedCave2.inc"
-	.include "data/maps/events/SecretBase_BrownCave2.inc"
-	.include "data/maps/events/SecretBase_BlueCave2.inc"
-	.include "data/maps/events/SecretBase_YellowCave2.inc"
-	.include "data/maps/events/SecretBase_Tree2.inc"
-	.include "data/maps/events/SecretBase_Shrub2.inc"
-	.include "data/maps/events/SecretBase_RedCave3.inc"
-	.include "data/maps/events/SecretBase_BrownCave3.inc"
-	.include "data/maps/events/SecretBase_BlueCave3.inc"
-	.include "data/maps/events/SecretBase_YellowCave3.inc"
-	.include "data/maps/events/SecretBase_Tree3.inc"
-	.include "data/maps/events/SecretBase_Shrub3.inc"
-	.include "data/maps/events/SecretBase_RedCave4.inc"
-	.include "data/maps/events/SecretBase_BrownCave4.inc"
-	.include "data/maps/events/SecretBase_BlueCave4.inc"
-	.include "data/maps/events/SecretBase_YellowCave4.inc"
-	.include "data/maps/events/SecretBase_Tree4.inc"
-	.include "data/maps/events/SecretBase_Shrub4.inc"
-	.include "data/maps/events/SingleBattleColosseum.inc"
-	.include "data/maps/events/TradeCenter.inc"
-	.include "data/maps/events/RecordCorner.inc"
-	.include "data/maps/events/DoubleBattleColosseum.inc"
-	.include "data/maps/events/LinkContestRoom1.inc"
-	.include "data/maps/events/LinkContestRoom2.inc"
-	.include "data/maps/events/LinkContestRoom3.inc"
-	.include "data/maps/events/LinkContestRoom4.inc"
-	.include "data/maps/events/LinkContestRoom5.inc"
-	.include "data/maps/events/LinkContestRoom6.inc"
-	.include "data/maps/events/UnknownMap_25_29.inc"
-	.include "data/maps/events/UnknownMap_25_30.inc"
-	.include "data/maps/events/UnknownMap_25_31.inc"
-	.include "data/maps/events/UnknownMap_25_32.inc"
-	.include "data/maps/events/UnknownMap_25_33.inc"
-	.include "data/maps/events/UnknownMap_25_34.inc"
-	.include "data/maps/events/InsideOfTruck.inc"
-	.include "data/maps/events/SSTidalCorridor.inc"
-	.include "data/maps/events/SSTidalLowerDeck.inc"
-	.include "data/maps/events/SSTidalRooms.inc"
-	.include "data/maps/events/SafariZone_Northwest.inc"
-	.include "data/maps/events/SafariZone_Northeast.inc"
-	.include "data/maps/events/SafariZone_Southwest.inc"
-	.include "data/maps/events/SafariZone_Southeast.inc"
-	.include "data/maps/events/BattleTower_Outside.inc"
-	.include "data/maps/events/BattleTower_Lobby.inc"
-	.include "data/maps/events/BattleTower_Elevator.inc"
-	.include "data/maps/events/BattleTower_Corridor.inc"
-	.include "data/maps/events/BattleTower_BattleRoom.inc"
-	.include "data/maps/events/SouthernIsland_Exterior.inc"
-	.include "data/maps/events/SouthernIsland_Interior.inc"
-	.include "data/maps/events/SafariZone_RestHouse.inc"
-	.include "data/maps/events/Route104_Prototype.inc"
-	.include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route109_SeashoreHouse.inc"
-	.include "data/maps/events/Route110_TrickHouseEntrance.inc"
-	.include "data/maps/events/Route110_TrickHouseEnd.inc"
-	.include "data/maps/events/Route110_TrickHouseCorridor.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle1.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle2.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle3.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle4.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle5.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle6.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle7.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle8.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/maps/events/Route113_GlassWorkshop.inc"
-	.include "data/maps/events/Route123_BerryMastersHouse.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_1F.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_2F.inc"
-	.include "data/maps/events/Route119_House.inc"
-	.include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/PetalburgCity/events.inc"
+	.include "data/maps/SlateportCity/events.inc"
+	.include "data/maps/MauvilleCity/events.inc"
+	.include "data/maps/RustboroCity/events.inc"
+	.include "data/maps/FortreeCity/events.inc"
+	.include "data/maps/LilycoveCity/events.inc"
+	.include "data/maps/MossdeepCity/events.inc"
+	.include "data/maps/SootopolisCity/events.inc"
+	.include "data/maps/EverGrandeCity/events.inc"
+	.include "data/maps/LittlerootTown/events.inc"
+	.include "data/maps/OldaleTown/events.inc"
+	.include "data/maps/DewfordTown/events.inc"
+	.include "data/maps/LavaridgeTown/events.inc"
+	.include "data/maps/FallarborTown/events.inc"
+	.include "data/maps/VerdanturfTown/events.inc"
+	.include "data/maps/PacifidlogTown/events.inc"
+	.include "data/maps/Route101/events.inc"
+	.include "data/maps/Route102/events.inc"
+	.include "data/maps/Route103/events.inc"
+	.include "data/maps/Route104/events.inc"
+	.include "data/maps/Route105/events.inc"
+	.include "data/maps/Route106/events.inc"
+	.include "data/maps/Route107/events.inc"
+	.include "data/maps/Route108/events.inc"
+	.include "data/maps/Route109/events.inc"
+	.include "data/maps/Route110/events.inc"
+	.include "data/maps/Route111/events.inc"
+	.include "data/maps/Route112/events.inc"
+	.include "data/maps/Route113/events.inc"
+	.include "data/maps/Route114/events.inc"
+	.include "data/maps/Route115/events.inc"
+	.include "data/maps/Route116/events.inc"
+	.include "data/maps/Route117/events.inc"
+	.include "data/maps/Route118/events.inc"
+	.include "data/maps/Route119/events.inc"
+	.include "data/maps/Route120/events.inc"
+	.include "data/maps/Route121/events.inc"
+	.include "data/maps/Route122/events.inc"
+	.include "data/maps/Route123/events.inc"
+	.include "data/maps/Route124/events.inc"
+	.include "data/maps/Route125/events.inc"
+	.include "data/maps/Route126/events.inc"
+	.include "data/maps/Route127/events.inc"
+	.include "data/maps/Route128/events.inc"
+	.include "data/maps/Route129/events.inc"
+	.include "data/maps/Route130/events.inc"
+	.include "data/maps/Route131/events.inc"
+	.include "data/maps/Route132/events.inc"
+	.include "data/maps/Route133/events.inc"
+	.include "data/maps/Route134/events.inc"
+	.include "data/maps/Underwater1/events.inc"
+	.include "data/maps/Underwater2/events.inc"
+	.include "data/maps/Underwater3/events.inc"
+	.include "data/maps/Underwater4/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc"
+	.include "data/maps/OldaleTown_House1/events.inc"
+	.include "data/maps/OldaleTown_House2/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/OldaleTown_Mart/events.inc"
+	.include "data/maps/DewfordTown_House1/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/DewfordTown_Gym/events.inc"
+	.include "data/maps/DewfordTown_Hall/events.inc"
+	.include "data/maps/DewfordTown_House2/events.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/events.inc"
+	.include "data/maps/LavaridgeTown_House/events.inc"
+	.include "data/maps/LavaridgeTown_Mart/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_Mart/events.inc"
+	.include "data/maps/FallarborTown_ContestLobby/events.inc"
+	.include "data/maps/FallarborTown_ContestHall/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_House1/events.inc"
+	.include "data/maps/FallarborTown_House2/events.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/events.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/events.inc"
+	.include "data/maps/VerdanturfTown_Mart/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/events.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc"
+	.include "data/maps/VerdanturfTown_House/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/PacifidlogTown_House1/events.inc"
+	.include "data/maps/PacifidlogTown_House2/events.inc"
+	.include "data/maps/PacifidlogTown_House3/events.inc"
+	.include "data/maps/PacifidlogTown_House4/events.inc"
+	.include "data/maps/PacifidlogTown_House5/events.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/events.inc"
+	.include "data/maps/PetalburgCity_Gym/events.inc"
+	.include "data/maps/PetalburgCity_House1/events.inc"
+	.include "data/maps/PetalburgCity_House2/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/PetalburgCity_Mart/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/events.inc"
+	.include "data/maps/SlateportCity_ContestLobby/events.inc"
+	.include "data/maps/SlateportCity_ContestHall/events.inc"
+	.include "data/maps/SlateportCity_House1/events.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc"
+	.include "data/maps/SlateportCity_Harbor/events.inc"
+	.include "data/maps/SlateportCity_House2/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SlateportCity_Mart/events.inc"
+	.include "data/maps/MauvilleCity_Gym/events.inc"
+	.include "data/maps/MauvilleCity_BikeShop/events.inc"
+	.include "data/maps/MauvilleCity_House1/events.inc"
+	.include "data/maps/MauvilleCity_GameCorner/events.inc"
+	.include "data/maps/MauvilleCity_House2/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MauvilleCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/events.inc"
+	.include "data/maps/RustboroCity_Gym/events.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/RustboroCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/events.inc"
+	.include "data/maps/RustboroCity_House1/events.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/events.inc"
+	.include "data/maps/RustboroCity_House2/events.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/events.inc"
+	.include "data/maps/RustboroCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House1/events.inc"
+	.include "data/maps/FortreeCity_Gym/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/FortreeCity_Mart/events.inc"
+	.include "data/maps/FortreeCity_House2/events.inc"
+	.include "data/maps/FortreeCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House4/events.inc"
+	.include "data/maps/FortreeCity_House5/events.inc"
+	.include "data/maps/FortreeCity_DecorationShop/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/events.inc"
+	.include "data/maps/LilycoveCity_ContestHall/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/events.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc"
+	.include "data/maps/LilycoveCity_Harbor/events.inc"
+	.include "data/maps/LilycoveCity_EmptyMap/events.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc"
+	.include "data/maps/LilycoveCity_House1/events.inc"
+	.include "data/maps/LilycoveCity_House2/events.inc"
+	.include "data/maps/LilycoveCity_House3/events.inc"
+	.include "data/maps/LilycoveCity_House4/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc"
+	.include "data/maps/MossdeepCity_Gym/events.inc"
+	.include "data/maps/MossdeepCity_House1/events.inc"
+	.include "data/maps/MossdeepCity_House2/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_Mart/events.inc"
+	.include "data/maps/MossdeepCity_House3/events.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/events.inc"
+	.include "data/maps/MossdeepCity_House4/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SootopolisCity_Mart/events.inc"
+	.include "data/maps/SootopolisCity_House1/events.inc"
+	.include "data/maps/SootopolisCity_House2/events.inc"
+	.include "data/maps/SootopolisCity_House3/events.inc"
+	.include "data/maps/SootopolisCity_House4/events.inc"
+	.include "data/maps/SootopolisCity_House5/events.inc"
+	.include "data/maps/SootopolisCity_House6/events.inc"
+	.include "data/maps/SootopolisCity_House7/events.inc"
+	.include "data/maps/SootopolisCity_House8/events.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/events.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/events.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor1/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor2/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor3/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor4/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor5/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/events.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/Route104_MrBrineysHouse/events.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/events.inc"
+	.include "data/maps/Route111_OldLadysRestStop/events.inc"
+	.include "data/maps/Route112_CableCarStation/events.inc"
+	.include "data/maps/MtChimney_CableCarStation/events.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/events.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/events.inc"
+	.include "data/maps/Route114_LanettesHouse/events.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/events.inc"
+	.include "data/maps/Route117_PokemonDayCare/events.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/events.inc"
+	.include "data/maps/MeteorFalls_1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_1F_2R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/events.inc"
+	.include "data/maps/RusturfTunnel/events.inc"
+	.include "data/maps/Underwater_SootopolisCity/events.inc"
+	.include "data/maps/DesertRuins/events.inc"
+	.include "data/maps/GraniteCave_1F/events.inc"
+	.include "data/maps/GraniteCave_B1F/events.inc"
+	.include "data/maps/GraniteCave_B2F/events.inc"
+	.include "data/maps/GraniteCave_StevensRoom/events.inc"
+	.include "data/maps/PetalburgWoods/events.inc"
+	.include "data/maps/MtChimney/events.inc"
+	.include "data/maps/JaggedPass/events.inc"
+	.include "data/maps/FieryPath/events.inc"
+	.include "data/maps/MtPyre_1F/events.inc"
+	.include "data/maps/MtPyre_2F/events.inc"
+	.include "data/maps/MtPyre_3F/events.inc"
+	.include "data/maps/MtPyre_4F/events.inc"
+	.include "data/maps/MtPyre_5F/events.inc"
+	.include "data/maps/MtPyre_6F/events.inc"
+	.include "data/maps/MtPyre_Exterior/events.inc"
+	.include "data/maps/MtPyre_Summit/events.inc"
+	.include "data/maps/AquaHideout_1F/events.inc"
+	.include "data/maps/AquaHideout_B1F/events.inc"
+	.include "data/maps/AquaHideout_B2F/events.inc"
+	.include "data/maps/Underwater_SeafloorCavern/events.inc"
+	.include "data/maps/SeafloorCavern_Entrance/events.inc"
+	.include "data/maps/SeafloorCavern_Room1/events.inc"
+	.include "data/maps/SeafloorCavern_Room2/events.inc"
+	.include "data/maps/SeafloorCavern_Room3/events.inc"
+	.include "data/maps/SeafloorCavern_Room4/events.inc"
+	.include "data/maps/SeafloorCavern_Room5/events.inc"
+	.include "data/maps/SeafloorCavern_Room6/events.inc"
+	.include "data/maps/SeafloorCavern_Room7/events.inc"
+	.include "data/maps/SeafloorCavern_Room8/events.inc"
+	.include "data/maps/SeafloorCavern_Room9/events.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/events.inc"
+	.include "data/maps/CaveOfOrigin_1F/events.inc"
+	.include "data/maps/CaveOfOrigin_B1F/events.inc"
+	.include "data/maps/CaveOfOrigin_B2F/events.inc"
+	.include "data/maps/CaveOfOrigin_B3F/events.inc"
+	.include "data/maps/CaveOfOrigin_B4F/events.inc"
+	.include "data/maps/VictoryRoad_1F/events.inc"
+	.include "data/maps/VictoryRoad_B1F/events.inc"
+	.include "data/maps/VictoryRoad_B2F/events.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/events.inc"
+	.include "data/maps/NewMauville_Entrance/events.inc"
+	.include "data/maps/NewMauville_Inside/events.inc"
+	.include "data/maps/AbandonedShip_Deck/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Underwater1/events.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/events.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/events.inc"
+	.include "data/maps/AbandonedShip_Underwater2/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc"
+	.include "data/maps/IslandCave/events.inc"
+	.include "data/maps/AncientTomb/events.inc"
+	.include "data/maps/Underwater_Route134/events.inc"
+	.include "data/maps/Underwater_SealedChamber/events.inc"
+	.include "data/maps/SealedChamber_OuterRoom/events.inc"
+	.include "data/maps/SealedChamber_InnerRoom/events.inc"
+	.include "data/maps/ScorchedSlab/events.inc"
+	.include "data/maps/MagmaHideout_1F/events.inc"
+	.include "data/maps/MagmaHideout_B1F/events.inc"
+	.include "data/maps/MagmaHideout_B2F/events.inc"
+	.include "data/maps/SkyPillar_Entrance/events.inc"
+	.include "data/maps/SkyPillar_Outside/events.inc"
+	.include "data/maps/SkyPillar_1F/events.inc"
+	.include "data/maps/SkyPillar_2F/events.inc"
+	.include "data/maps/SkyPillar_3F/events.inc"
+	.include "data/maps/SkyPillar_4F/events.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/events.inc"
+	.include "data/maps/SkyPillar_5F/events.inc"
+	.include "data/maps/SkyPillar_Top/events.inc"
+	.include "data/maps/SecretBase_RedCave1/events.inc"
+	.include "data/maps/SecretBase_BrownCave1/events.inc"
+	.include "data/maps/SecretBase_BlueCave1/events.inc"
+	.include "data/maps/SecretBase_YellowCave1/events.inc"
+	.include "data/maps/SecretBase_Tree1/events.inc"
+	.include "data/maps/SecretBase_Shrub1/events.inc"
+	.include "data/maps/SecretBase_RedCave2/events.inc"
+	.include "data/maps/SecretBase_BrownCave2/events.inc"
+	.include "data/maps/SecretBase_BlueCave2/events.inc"
+	.include "data/maps/SecretBase_YellowCave2/events.inc"
+	.include "data/maps/SecretBase_Tree2/events.inc"
+	.include "data/maps/SecretBase_Shrub2/events.inc"
+	.include "data/maps/SecretBase_RedCave3/events.inc"
+	.include "data/maps/SecretBase_BrownCave3/events.inc"
+	.include "data/maps/SecretBase_BlueCave3/events.inc"
+	.include "data/maps/SecretBase_YellowCave3/events.inc"
+	.include "data/maps/SecretBase_Tree3/events.inc"
+	.include "data/maps/SecretBase_Shrub3/events.inc"
+	.include "data/maps/SecretBase_RedCave4/events.inc"
+	.include "data/maps/SecretBase_BrownCave4/events.inc"
+	.include "data/maps/SecretBase_BlueCave4/events.inc"
+	.include "data/maps/SecretBase_YellowCave4/events.inc"
+	.include "data/maps/SecretBase_Tree4/events.inc"
+	.include "data/maps/SecretBase_Shrub4/events.inc"
+	.include "data/maps/SingleBattleColosseum/events.inc"
+	.include "data/maps/TradeCenter/events.inc"
+	.include "data/maps/RecordCorner/events.inc"
+	.include "data/maps/DoubleBattleColosseum/events.inc"
+	.include "data/maps/LinkContestRoom1/events.inc"
+	.include "data/maps/LinkContestRoom2/events.inc"
+	.include "data/maps/LinkContestRoom3/events.inc"
+	.include "data/maps/LinkContestRoom4/events.inc"
+	.include "data/maps/LinkContestRoom5/events.inc"
+	.include "data/maps/LinkContestRoom6/events.inc"
+	.include "data/maps/UnknownMap_25_29/events.inc"
+	.include "data/maps/UnknownMap_25_30/events.inc"
+	.include "data/maps/UnknownMap_25_31/events.inc"
+	.include "data/maps/UnknownMap_25_32/events.inc"
+	.include "data/maps/UnknownMap_25_33/events.inc"
+	.include "data/maps/UnknownMap_25_34/events.inc"
+	.include "data/maps/InsideOfTruck/events.inc"
+	.include "data/maps/SSTidalCorridor/events.inc"
+	.include "data/maps/SSTidalLowerDeck/events.inc"
+	.include "data/maps/SSTidalRooms/events.inc"
+	.include "data/maps/SafariZone_Northwest/events.inc"
+	.include "data/maps/SafariZone_Northeast/events.inc"
+	.include "data/maps/SafariZone_Southwest/events.inc"
+	.include "data/maps/SafariZone_Southeast/events.inc"
+	.include "data/maps/BattleTower_Outside/events.inc"
+	.include "data/maps/BattleTower_Lobby/events.inc"
+	.include "data/maps/BattleTower_Elevator/events.inc"
+	.include "data/maps/BattleTower_Corridor/events.inc"
+	.include "data/maps/BattleTower_BattleRoom/events.inc"
+	.include "data/maps/SouthernIsland_Exterior/events.inc"
+	.include "data/maps/SouthernIsland_Interior/events.inc"
+	.include "data/maps/SafariZone_RestHouse/events.inc"
+	.include "data/maps/Route104_Prototype/events.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route109_SeashoreHouse/events.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/events.inc"
+	.include "data/maps/Route110_TrickHouseEnd/events.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc"
+	.include "data/maps/Route113_GlassWorkshop/events.inc"
+	.include "data/maps/Route123_BerryMastersHouse/events.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/events.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/events.inc"
+	.include "data/maps/Route119_House/events.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc"
diff --git a/data/maps.s b/data/maps.s
index 727a48d0f..f8be7f31f 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -5,8 +5,8 @@
 
 	.section .rodata
 
-	.include "data/maps/_assets.inc"
-	.include "data/maps/attributes_table.inc"
+	.include "data/layouts.inc"
+	.include "data/layouts_table.inc"
 	.include "data/maps/headers.inc"
-	.include "data/maps/_groups.inc"
+	.include "data/maps/groups.inc"
 	.include "data/maps/connections.inc"
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc
index 791ab9754..791ab9754 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index e5e3adc3a..67112ba78 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_CaptainsOffice:: @ 8307454
-	.4byte AbandonedShip_CaptainsOffice_MapAttributes
+	.4byte AbandonedShip_CaptainsOffice_Layout
 	.4byte AbandonedShip_CaptainsOffice_MapEvents
 	.4byte AbandonedShip_CaptainsOffice_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 196
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index 22c76847a..22c76847a 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
diff --git a/data/text/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/text.inc
index bdd2057c4..bdd2057c4 100644
--- a/data/text/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/text.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc
index 82af88bce..82af88bce 100644
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/events.inc
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
index e2bd23252..c228ebc29 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Corridors_1F:: @ 8307374
-	.4byte AbandonedShip_Corridors_1F_MapAttributes
+	.4byte AbandonedShip_Corridors_1F_Layout
 	.4byte AbandonedShip_Corridors_1F_MapEvents
 	.4byte AbandonedShip_Corridors_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 188
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
index 0c7278f3b..0c7278f3b 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/text.inc
index 2df1c32b2..2df1c32b2 100644
--- a/data/text/maps/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc
index 35dc34437..35dc34437 100644
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 064e24e92..bbca3eaba 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Corridors_B1F:: @ 83073AC
-	.4byte AbandonedShip_Corridors_B1F_MapAttributes
+	.4byte AbandonedShip_Corridors_B1F_Layout
 	.4byte AbandonedShip_Corridors_B1F_MapEvents
 	.4byte AbandonedShip_Corridors_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 190
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index c34f2c28b..c34f2c28b 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/text.inc
index 887a6c11a..887a6c11a 100644
--- a/data/text/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc
index 15f54114b..15f54114b 100644
--- a/data/maps/events/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/events.inc
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
index 1db367db8..84b45db3a 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Deck:: @ 8307358
-	.4byte AbandonedShip_Deck_MapAttributes
+	.4byte AbandonedShip_Deck_Layout
 	.4byte AbandonedShip_Deck_MapEvents
 	.4byte AbandonedShip_Deck_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 187
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index 68d872f01..68d872f01 100644
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
index 97bdf37c5..97bdf37c5 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index a841ee87c..99b22902b 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_HiddenFloorCorridors:: @ 830748C
-	.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
+	.4byte AbandonedShip_HiddenFloorCorridors_Layout
 	.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
 	.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 290
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index e8e48a6f6..e8e48a6f6 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
diff --git a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc
index 4e7c2014f..4e7c2014f 100644
--- a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
index 7c8135e89..7c8135e89 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index 647b22977..8f5d464a2 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_HiddenFloorRooms:: @ 83074A8
-	.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
+	.4byte AbandonedShip_HiddenFloorRooms_Layout
 	.4byte AbandonedShip_HiddenFloorRooms_MapEvents
 	.4byte AbandonedShip_HiddenFloorRooms_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 311
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index 5a5ab3005..5a5ab3005 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
diff --git a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc
index 1be9f8f02..1be9f8f02 100644
--- a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc
index e828890a5..e828890a5 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ b/data/maps/AbandonedShip_Room_B1F/events.inc
diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
index 7b88baf94..335c10f7a 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Room_B1F:: @ 830741C
-	.4byte AbandonedShip_Room_B1F_MapAttributes
+	.4byte AbandonedShip_Room_B1F_Layout
 	.4byte AbandonedShip_Room_B1F_MapEvents
 	.4byte AbandonedShip_Room_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 194
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc
index 4cdc8bbd1..4cdc8bbd1 100644
--- a/data/scripts/maps/AbandonedShip_Room_B1F.inc
+++ b/data/maps/AbandonedShip_Room_B1F/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
index e29bd3b42..e29bd3b42 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index 44bcd4733..bb6b7be08 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms2_1F:: @ 8307438
-	.4byte AbandonedShip_Rooms2_1F_MapAttributes
+	.4byte AbandonedShip_Rooms2_1F_Layout
 	.4byte AbandonedShip_Rooms2_1F_MapEvents
 	.4byte AbandonedShip_Rooms2_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 195
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index e1e903cc0..e1e903cc0 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/text.inc
index 3acf542fc..3acf542fc 100644
--- a/data/text/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
index aa6eb759a..aa6eb759a 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index 017b1382b..538209d37 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms2_B1F:: @ 83073E4
-	.4byte AbandonedShip_Rooms2_B1F_MapAttributes
+	.4byte AbandonedShip_Rooms2_B1F_Layout
 	.4byte AbandonedShip_Rooms2_B1F_MapEvents
 	.4byte AbandonedShip_Rooms2_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 192
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
index 0c8f3ffc9..0c8f3ffc9 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/text.inc
index 11e505abd..11e505abd 100644
--- a/data/text/maps/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc
index 6ffe06615..6ffe06615 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/events.inc
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 7e8dbd5b8..39866961f 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms_1F:: @ 8307390
-	.4byte AbandonedShip_Rooms_1F_MapAttributes
+	.4byte AbandonedShip_Rooms_1F_Layout
 	.4byte AbandonedShip_Rooms_1F_MapEvents
 	.4byte AbandonedShip_Rooms_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 189
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
index c5f9ad3f5..c5f9ad3f5 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/text.inc
index 67b67ca4c..67b67ca4c 100644
--- a/data/text/maps/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc
index 405506b44..405506b44 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index 6ac6e3794..ac27a4798 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms_B1F:: @ 83073C8
-	.4byte AbandonedShip_Rooms_B1F_MapAttributes
+	.4byte AbandonedShip_Rooms_B1F_Layout
 	.4byte AbandonedShip_Rooms_B1F_MapEvents
 	.4byte AbandonedShip_Rooms_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 191
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
index 4299c7da4..4299c7da4 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/text.inc
index 45df47d60..45df47d60 100644
--- a/data/text/maps/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc
index 17a89c2aa..17a89c2aa 100644
--- a/data/maps/events/AbandonedShip_Underwater1.inc
+++ b/data/maps/AbandonedShip_Underwater1/events.inc
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
index 6313cf6f1..bf4004eb2 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Underwater1:: @ 8307400
-	.4byte AbandonedShip_Underwater1_MapAttributes
+	.4byte AbandonedShip_Underwater1_Layout
 	.4byte AbandonedShip_Underwater1_MapEvents
 	.4byte AbandonedShip_Underwater1_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 193
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
index 52ba61136..52ba61136 100644
--- a/data/scripts/maps/AbandonedShip_Underwater1.inc
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc
index 6eb94059c..6eb94059c 100644
--- a/data/maps/events/AbandonedShip_Underwater2.inc
+++ b/data/maps/AbandonedShip_Underwater2/events.inc
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
index c81b78357..ad7380354 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Underwater2:: @ 8307470
-	.4byte AbandonedShip_Underwater2_MapAttributes
+	.4byte AbandonedShip_Underwater2_Layout
 	.4byte AbandonedShip_Underwater2_MapEvents
 	.4byte AbandonedShip_Underwater2_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 197
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
index 22113661a..22113661a 100644
--- a/data/scripts/maps/AbandonedShip_Underwater2.inc
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc
index 2699b9036..2699b9036 100644
--- a/data/maps/events/AncientTomb.inc
+++ b/data/maps/AncientTomb/events.inc
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
index 82ac0555d..f559acdd4 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -1,9 +1,9 @@
 AncientTomb:: @ 83074E0
-	.4byte AncientTomb_MapAttributes
+	.4byte AncientTomb_Layout
 	.4byte AncientTomb_MapEvents
 	.4byte AncientTomb_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 282
 	.byte 83
 	.byte 0
diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc
index 8ff39c0a4..8ff39c0a4 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/maps/AncientTomb/scripts.inc
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc
index 3c87be0d7..3c87be0d7 100644
--- a/data/maps/events/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/events.inc
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index 94650821d..7fc84658d 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,9 +1,9 @@
 AquaHideout_1F:: @ 8306FF4
-	.4byte AquaHideout_1F_MapAttributes
+	.4byte AquaHideout_1F_Layout
 	.4byte AquaHideout_1F_MapEvents
 	.4byte AquaHideout_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 144
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc
index ee49ba695..ee49ba695 100644
--- a/data/scripts/maps/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
diff --git a/data/text/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/text.inc
index 6c003d308..6c003d308 100644
--- a/data/text/maps/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/text.inc
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc
index 0a53d4cf9..0a53d4cf9 100644
--- a/data/maps/events/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/events.inc
diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc
index ef7f4cfdf..94abd0406 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -1,9 +1,9 @@
 AquaHideout_B1F:: @ 8307010
-	.4byte AquaHideout_B1F_MapAttributes
+	.4byte AquaHideout_B1F_Layout
 	.4byte AquaHideout_B1F_MapEvents
 	.4byte AquaHideout_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 145
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 3be8d487d..3be8d487d 100644
--- a/data/scripts/maps/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
diff --git a/data/text/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/text.inc
index 605a98b8b..605a98b8b 100644
--- a/data/text/maps/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/text.inc
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc
index 6eee30658..6eee30658 100644
--- a/data/maps/events/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/events.inc
diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc
index 38b3f546f..c700ac8dd 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -1,9 +1,9 @@
 AquaHideout_B2F:: @ 830702C
-	.4byte AquaHideout_B2F_MapAttributes
+	.4byte AquaHideout_B2F_Layout
 	.4byte AquaHideout_B2F_MapEvents
 	.4byte AquaHideout_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 146
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/scripts.inc
index 37830a00e..37830a00e 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
diff --git a/data/text/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/text.inc
index f4b7dd035..f4b7dd035 100644
--- a/data/text/maps/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/text.inc
diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/events.inc
index a4bbe9849..a4bbe9849 100644
--- a/data/maps/events/BattleTower_BattleRoom.inc
+++ b/data/maps/BattleTower_BattleRoom/events.inc
diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc
index 3104824ed..9712d2535 100644
--- a/data/maps/BattleTower_BattleRoom/header.inc
+++ b/data/maps/BattleTower_BattleRoom/header.inc
@@ -1,9 +1,9 @@
 BattleTower_BattleRoom:: @ 8307C88
-	.4byte BattleTower_BattleRoom_MapAttributes
+	.4byte BattleTower_BattleRoom_Layout
 	.4byte BattleTower_BattleRoom_MapEvents
 	.4byte BattleTower_BattleRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 269
 	.byte 58
 	.byte 0
diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc
new file mode 100644
index 000000000..22529962a
--- /dev/null
+++ b/data/maps/BattleTower_BattleRoom/scripts.inc
@@ -0,0 +1,165 @@
+BattleTower_BattleRoom_MapScripts:: @ 81608DB
+	map_script 2, BattleTower_BattleRoom_MapScript2_1608E1
+	.byte 0
+
+BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1
+	map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB
+	.2byte 0
+
+BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB
+	setvar VAR_TEMP_0, 1
+	applymovement 255, BattleTower_BattleRoom_Movement_160AB7
+	waitmovement 0
+
+BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
+	special sub_81347F8
+	addobject 1
+	applymovement 1, BattleTower_BattleRoom_Movement_160AC0
+	waitmovement 0
+	special PrintBattleTowerTrainerGreeting
+	msgbox gStringVar4, 4
+	waitmessage
+	closemessage
+	special ScrSpecial_HealPlayerParty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 0
+	special StartSpecialBattle
+	waitstate
+	switch RESULT
+	case 1, BattleTower_BattleRoom_EventScript_160961
+	special LoadPlayerParty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 5
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 14
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 3
+	special sub_810FF60
+	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
+	waitstate
+
+BattleTower_BattleRoom_EventScript_160961:: @ 8160961
+	setvar VAR_SPECIAL_4, 6
+	special SetBattleTowerProperty
+	switch RESULT
+	case 8, BattleTower_BattleRoom_EventScript_160A56
+	applymovement 1, BattleTower_BattleRoom_Movement_160AC6
+	waitmovement 0
+	removeobject 1
+	applymovement 2, BattleTower_BattleRoom_Movement_160ACB
+	waitmovement 0
+	applymovement 255, BattleTower_BattleRoom_Movement_160ABC
+	waitmovement 0
+	msgbox BattleTower_BattleRoom_Text_19ACDC, 4
+	special LoadPlayerParty
+	special SavePlayerParty
+	special SetBattleTowerParty
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special ScrSpecial_HealPlayerParty
+
+BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
+	msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_BattleRoom_EventScript_1609E0
+	case YES, BattleTower_BattleRoom_EventScript_160A3C
+	case 127, BattleTower_BattleRoom_EventScript_1609E0
+
+BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0
+	msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_BattleRoom_EventScript_160A0E
+	case YES, BattleTower_BattleRoom_EventScript_160A94
+	case 127, BattleTower_BattleRoom_EventScript_160A0E
+
+BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E
+	msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_BattleRoom_EventScript_1609B2
+	case YES, BattleTower_BattleRoom_EventScript_160AB1
+	case 127, BattleTower_BattleRoom_EventScript_1609B2
+
+BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C
+	closemessage
+	applymovement 255, BattleTower_BattleRoom_Movement_160ABE
+	waitmovement 0
+	applymovement 2, BattleTower_BattleRoom_Movement_160AD0
+	waitmovement 0
+	goto BattleTower_BattleRoom_EventScript_1608FA
+
+BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56
+	special LoadPlayerParty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 4
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 1
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 7
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 14
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 3
+	special sub_810FF60
+	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
+	waitstate
+
+BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
+	setvar VAR_SPECIAL_4, 2
+	special SaveBattleTowerProgress
+	message BattleTower_BattleRoom_Text_1C6CE1
+	delay 60
+	waitmessage
+	playse SE_SAVE
+	waitse
+	msgbox BattleTower_BattleRoom_Text_1C6D05, 4
+
+BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
+	fadescreen 1
+	special BattleTower_SoftReset
+	end
+
+BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	end_movement
+
+BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC
+	face_down
+	end_movement
+
+BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE
+	face_right
+	end_movement
+
+BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	end_movement
+
+BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
+
+BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	face_right
+	end_movement
diff --git a/data/text/maps/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/text.inc
index 9f72d8971..9f72d8971 100644
--- a/data/text/maps/BattleTower_BattleRoom.inc
+++ b/data/maps/BattleTower_BattleRoom/text.inc
diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/BattleTower_Corridor/events.inc
index 1233ff32c..1233ff32c 100644
--- a/data/maps/events/BattleTower_Corridor.inc
+++ b/data/maps/BattleTower_Corridor/events.inc
diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc
index 016e178ac..33ab24b7c 100644
--- a/data/maps/BattleTower_Corridor/header.inc
+++ b/data/maps/BattleTower_Corridor/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Corridor:: @ 8307C6C
-	.4byte BattleTower_Corridor_MapAttributes
+	.4byte BattleTower_Corridor_Layout
 	.4byte BattleTower_Corridor_MapEvents
 	.4byte BattleTower_Corridor_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 268
 	.byte 58
 	.byte 0
diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/maps/BattleTower_Corridor/scripts.inc
index d9d73b832..d9d73b832 100644
--- a/data/scripts/maps/BattleTower_Corridor.inc
+++ b/data/maps/BattleTower_Corridor/scripts.inc
diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/BattleTower_Elevator/events.inc
index 57434d3ac..57434d3ac 100644
--- a/data/maps/events/BattleTower_Elevator.inc
+++ b/data/maps/BattleTower_Elevator/events.inc
diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc
index 0a7285261..0718e7924 100644
--- a/data/maps/BattleTower_Elevator/header.inc
+++ b/data/maps/BattleTower_Elevator/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Elevator:: @ 8307C50
-	.4byte BattleTower_Elevator_MapAttributes
+	.4byte BattleTower_Elevator_Layout
 	.4byte BattleTower_Elevator_MapEvents
 	.4byte BattleTower_Elevator_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 267
 	.byte 58
 	.byte 0
diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/maps/BattleTower_Elevator/scripts.inc
index f3373ee6e..f3373ee6e 100644
--- a/data/scripts/maps/BattleTower_Elevator.inc
+++ b/data/maps/BattleTower_Elevator/scripts.inc
diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/events.inc
index ca33bdf95..ca33bdf95 100644
--- a/data/maps/events/BattleTower_Lobby.inc
+++ b/data/maps/BattleTower_Lobby/events.inc
diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc
index c8c0b0473..ae2eaaa14 100644
--- a/data/maps/BattleTower_Lobby/header.inc
+++ b/data/maps/BattleTower_Lobby/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Lobby:: @ 8307C34
-	.4byte BattleTower_Lobby_MapAttributes
+	.4byte BattleTower_Lobby_Layout
 	.4byte BattleTower_Lobby_MapEvents
 	.4byte BattleTower_Lobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 265
 	.byte 58
 	.byte 0
diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc
new file mode 100644
index 000000000..28f828bc6
--- /dev/null
+++ b/data/maps/BattleTower_Lobby/scripts.inc
@@ -0,0 +1,424 @@
+BattleTower_Lobby_MapScripts:: @ 816027E
+	map_script 5, BattleTower_Lobby_MapScript1_160293
+	map_script 3, BattleTower_Lobby_MapScript1_1602E8
+	map_script 2, BattleTower_Lobby_MapScript2_160302
+	map_script 4, BattleTower_Lobby_MapScript2_1602EE
+	.byte 0
+
+BattleTower_Lobby_MapScript1_160293:: @ 8160293
+	special TryEnableBravoTrainerBattleTower
+	call BattleTower_Lobby_EventScript_16029C
+	end
+
+BattleTower_Lobby_EventScript_16029C:: @ 816029C
+	setvar VAR_SPECIAL_4, 10
+	special SetBattleTowerProperty
+	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4
+	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD
+	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
+	compare VAR_SPECIAL_7, 50
+	goto_if_lt BattleTower_Lobby_EventScript_1602E4
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	special TryInitBattleTowerAwardManEventObject
+	return
+
+BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
+	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
+	compare VAR_SPECIAL_7, 100
+	goto_if_lt BattleTower_Lobby_EventScript_1602E4
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	special TryInitBattleTowerAwardManEventObject
+	return
+
+BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	return
+
+BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8
+	call BattleTower_Lobby_EventScript_1AE2ED
+	end
+
+BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE
+	map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8
+	.2byte 0
+
+BattleTower_Lobby_EventScript_1602F8:: @ 81602F8
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleTower_Lobby_MapScript2_160302:: @ 8160302
+	map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C
+	map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330
+	map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342
+	map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419
+	map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B
+	.2byte 0
+
+BattleTower_Lobby_EventScript_16032C:: @ 816032C
+	special sub_8134548
+	end
+
+BattleTower_Lobby_EventScript_160330:: @ 8160330
+	lock
+	faceplayer
+	msgbox BattleTower_Lobby_Text_19A3FD, 4
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_160342:: @ 8160342
+	lock
+	faceplayer
+	message BattleTower_Lobby_Text_19A487
+	waitmessage
+	setvar VAR_SPECIAL_4, 0
+	special BattleTowerUtil
+	compare RESULT, 6
+	goto_if_eq BattleTower_Lobby_EventScript_16037D
+	special AwardBattleTowerRibbons
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_16037D
+	message BattleTower_Lobby_Text_19A6BE
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox BattleTower_Lobby_Text_19A719, 4
+
+BattleTower_Lobby_EventScript_16037D:: @ 816037D
+	setvar VAR_SPECIAL_4, 8
+	special BattleTowerUtil
+	compare RESULT, 1
+	goto_if_eq BattleTower_Lobby_EventScript_1603AD
+	message BattleTower_Lobby_Text_19A589
+	waitmessage
+	setvar VAR_SPECIAL_4, 13
+	special SetBattleTowerProperty
+	special DetermineBattleTowerPrize
+	setvar VAR_SPECIAL_4, 3
+	special SaveBattleTowerProgress
+	playse SE_SAVE
+	waitse
+
+BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 3
+	special SetBattleTowerProperty
+	message BattleTower_Lobby_Text_19A4BB
+	waitmessage
+	special GiveBattleTowerPrize
+	switch RESULT
+	case 0, BattleTower_Lobby_EventScript_160408
+	message BattleTower_Lobby_Text_19A506
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	setvar VAR_SPECIAL_4, 9
+	special BattleTowerUtil
+	compare RESULT, 49
+	goto_if_ne BattleTower_Lobby_EventScript_1603F8
+	msgbox BattleTower_Lobby_Text_19A617, 4
+
+BattleTower_Lobby_EventScript_1603F8:: @ 81603F8
+	msgbox BattleTower_Lobby_Text_199FA9, 4
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_160408:: @ 8160408
+	msgbox BattleTower_Lobby_Text_19A520, 4
+	waitmessage
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_160419:: @ 8160419
+	lock
+	faceplayer
+	message BattleTower_Lobby_Text_19A571
+	waitmessage
+	message BattleTower_Lobby_Text_19A589
+	waitmessage
+	setvar VAR_SPECIAL_4, 13
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 0
+	special SaveBattleTowerProgress
+	playse SE_SAVE
+	waitse
+	msgbox BattleTower_Lobby_Text_199FA9, 4
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_16044B:: @ 816044B
+	lock
+	faceplayer
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
+	message BattleTower_Lobby_Text_19A5B1
+	waitmessage
+	message BattleTower_Lobby_Text_19A5CE
+	waitmessage
+	setvar VAR_SPECIAL_4, 1
+	special SaveBattleTowerProgress
+	playse SE_SAVE
+	waitse
+	setvar VAR_SPECIAL_4, 8
+	setvar VAR_SPECIAL_5, 0
+	special SetBattleTowerProperty
+	setvar VAR_TEMP_0, 5
+	special SavePlayerParty
+	special SetBattleTowerParty
+	msgbox BattleTower_Lobby_Text_19A0A8, 4
+	closemessage
+	call BattleTower_Lobby_EventScript_160664
+	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	setvar VAR_TEMP_0, 0
+	waitstate
+
+BattleTower_Lobby_EventScript_16049E:: @ 816049E
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 0
+	special BattleTowerUtil
+	compare RESULT, 6
+	goto_if_eq BattleTower_Lobby_EventScript_160342
+	special SavePlayerParty
+	msgbox BattleTower_Lobby_Text_199F2C, 4
+
+BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
+	message BattleTower_Lobby_Text_199F79
+	waitmessage
+	multichoice 15, 6, 23, 0
+	switch RESULT
+	case 0, BattleTower_Lobby_EventScript_1604FA
+	case 1, BattleTower_Lobby_EventScript_160600
+	case 2, BattleTower_Lobby_EventScript_160652
+	case 127, BattleTower_Lobby_EventScript_160652
+
+BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
+	message BattleTower_Lobby_Text_19A024
+	waitmessage
+	multichoice 18, 6, 24, 0
+	switch RESULT
+	case 2, BattleTower_Lobby_EventScript_160652
+	case 127, BattleTower_Lobby_EventScript_160652
+	special CheckPartyBattleTowerBanlist
+	compare VAR_SPECIAL_4, 1
+	goto_if_eq BattleTower_Lobby_EventScript_16060D
+	setvar VAR_SPECIAL_4, 1
+	copyvar VAR_SPECIAL_5, RESULT
+	copyvar VAR_SPECIAL_6, RESULT
+	special SetBattleTowerProperty
+	msgbox BattleTower_Lobby_Text_19A07B, 4
+	fadescreen 1
+	special ChooseBattleTowerPlayerParty
+	waitstate
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_16064F
+	msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_Lobby_EventScript_16064F
+	case YES, BattleTower_Lobby_EventScript_160587
+	case 127, BattleTower_Lobby_EventScript_16064F
+
+BattleTower_Lobby_EventScript_160587:: @ 8160587
+	setvar VAR_SPECIAL_4, 5
+	special SetBattleTowerProperty
+	setvar VAR_TEMP_0, 0
+	setvar VAR_SPECIAL_4, 11
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 1
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 8
+	setvar VAR_SPECIAL_5, 0
+	special SetBattleTowerProperty
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call S_DoSaveDialog
+	setvar VAR_TEMP_0, 5
+	erasebox 0, 0, 15, 10
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_160642
+	incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
+	special SavePlayerParty
+	special SetBattleTowerParty
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
+	msgbox BattleTower_Lobby_Text_19A0A8, 4
+	closemessage
+	call BattleTower_Lobby_EventScript_160664
+	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	setvar VAR_TEMP_0, 0
+	waitstate
+
+BattleTower_Lobby_EventScript_160600:: @ 8160600
+	msgbox BattleTower_Lobby_Text_19A0D1, 4
+	goto BattleTower_Lobby_EventScript_1604BE
+
+BattleTower_Lobby_EventScript_16060D:: @ 816060D
+	switch RESULT
+	case 0, BattleTower_Lobby_EventScript_160628
+	case 1, BattleTower_Lobby_EventScript_160635
+
+BattleTower_Lobby_EventScript_160628:: @ 8160628
+	msgbox BattleTower_Lobby_Text_19A249, 4
+	goto BattleTower_Lobby_EventScript_160662
+
+BattleTower_Lobby_EventScript_160635:: @ 8160635
+	msgbox BattleTower_Lobby_Text_19A32D, 4
+	goto BattleTower_Lobby_EventScript_160662
+
+BattleTower_Lobby_EventScript_160642:: @ 8160642
+	setvar VAR_SPECIAL_4, 12
+	special SetBattleTowerProperty
+	goto BattleTower_Lobby_EventScript_160652
+
+BattleTower_Lobby_EventScript_16064F:: @ 816064F
+	special LoadPlayerParty
+
+BattleTower_Lobby_EventScript_160652:: @ 8160652
+	msgbox BattleTower_Lobby_Text_199FA9, 4
+	setvar VAR_SPECIAL_4, 11
+	special SetBattleTowerProperty
+
+BattleTower_Lobby_EventScript_160662:: @ 8160662
+	release
+	end
+
+BattleTower_Lobby_EventScript_160664:: @ 8160664
+	applymovement 1, BattleTower_Lobby_Movement_160693
+	applymovement 255, BattleTower_Lobby_Movement_160693
+	waitmovement 0
+	opendoor 6, 1
+	waitdooranim
+	applymovement 1, BattleTower_Lobby_Movement_160697
+	applymovement 255, BattleTower_Lobby_Movement_16069A
+	waitmovement 0
+	closedoor 6, 1
+	waitdooranim
+	return
+
+BattleTower_Lobby_Movement_160693:: @ 8160693
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+BattleTower_Lobby_Movement_160697:: @ 8160697
+	walk_up
+	set_invisible
+	end_movement
+
+BattleTower_Lobby_Movement_16069A:: @ 816069A
+	walk_up
+	walk_up
+	set_invisible
+	end_movement
+
+@ 816069E
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	set_invisible
+	end_movement
+
+BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
+	lock
+	faceplayer
+	msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO
+	switch RESULT
+	case YES, BattleTower_Lobby_EventScript_1606CC
+	case NO, BattleTower_Lobby_EventScript_1606F7
+	release
+	end
+
+BattleTower_Lobby_EventScript_1606CC:: @ 81606CC
+	msgbox BattleTower_Lobby_Text_19A7C3, 4
+	setvar VAR_SPECIAL_4, 1
+	call BattleTower_Lobby_EventScript_1A00F3
+	lock
+	faceplayer
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_160701
+	compare RESULT, 1
+	goto_if_eq BattleTower_Lobby_EventScript_16070B
+	end
+
+BattleTower_Lobby_EventScript_1606F7:: @ 81606F7
+	msgbox BattleTower_Lobby_Text_19A7FD, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_160701:: @ 8160701
+	msgbox BattleTower_Lobby_Text_19A83D, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_16070B:: @ 816070B
+	msgbox BattleTower_Lobby_Text_19A871, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_160715:: @ 8160715
+	msgbox BattleTower_Lobby_Text_19A8AE, 2
+	end
+
+BattleTower_Lobby_EventScript_16071E:: @ 816071E
+	msgbox BattleTower_Lobby_Text_19A946, 2
+	end
+
+BattleTower_Lobby_EventScript_160727:: @ 8160727
+	lockall
+	special ShowBattleTowerRecords
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
+	releaseall
+	end
+
+BattleTower_Lobby_EventScript_160733:: @ 8160733
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5
+	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773
+	msgbox BattleTower_Lobby_Text_19A9EE, 4
+	setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD
+	givedecoration_std DECOR_SILVER_SHIELD
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_1607AF
+	setflag FLAG_RECEIVED_SILVER_SHIELD
+	msgbox BattleTower_Lobby_Text_19ABAA, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_160773:: @ 8160773
+	specialvar RESULT, GetBestBattleTowerStreak
+	compare RESULT, 100
+	goto_if_lt BattleTower_Lobby_EventScript_1607C5
+	msgbox BattleTower_Lobby_Text_19AAC4, 4
+	setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD
+	givedecoration_std DECOR_GOLD_SHIELD
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_1607AF
+	setflag FLAG_RECEIVED_GOLD_SHIELD
+	msgbox BattleTower_Lobby_Text_19ABAA, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_1607AF:: @ 81607AF
+	bufferdecorationname 1, VAR_SPECIAL_8
+	msgbox BattleTower_Lobby_Text_1A0CEF, 4
+	msgbox BattleTower_Lobby_Text_19ABED, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_1607C5:: @ 81607C5
+	msgbox BattleTower_Lobby_Text_19AC55, 4
+	release
+	end
diff --git a/data/text/maps/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/text.inc
index db94f1bce..db94f1bce 100644
--- a/data/text/maps/BattleTower_Lobby.inc
+++ b/data/maps/BattleTower_Lobby/text.inc
diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/events.inc
index 2e02fcc1c..2e02fcc1c 100644
--- a/data/maps/events/BattleTower_Outside.inc
+++ b/data/maps/BattleTower_Outside/events.inc
diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc
index 01bbc2fd9..28035f749 100644
--- a/data/maps/BattleTower_Outside/header.inc
+++ b/data/maps/BattleTower_Outside/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Outside:: @ 8307C18
-	.4byte BattleTower_Outside_MapAttributes
+	.4byte BattleTower_Outside_Layout
 	.4byte BattleTower_Outside_MapEvents
 	.4byte BattleTower_Outside_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 266
 	.byte 58
 	.byte 0
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/scripts.inc
index 8f6cb4305..8f6cb4305 100644
--- a/data/scripts/maps/BattleTower_Outside.inc
+++ b/data/maps/BattleTower_Outside/scripts.inc
diff --git a/data/text/maps/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/text.inc
index 934ebca36..934ebca36 100644
--- a/data/text/maps/BattleTower_Outside.inc
+++ b/data/maps/BattleTower_Outside/text.inc
diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc
index b0d77795c..b0d77795c 100644
--- a/data/maps/events/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/events.inc
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
index b49287535..1797ed327 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_1F:: @ 8307198
-	.4byte CaveOfOrigin_1F_MapAttributes
+	.4byte CaveOfOrigin_1F_Layout
 	.4byte CaveOfOrigin_1F_MapEvents
 	.4byte CaveOfOrigin_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 159
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 58c6563f6..58c6563f6 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc
index a91ee50e4..a91ee50e4 100644
--- a/data/maps/events/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/events.inc
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
index 97e5e68c8..d9b38b628 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_B1F:: @ 83071B4
-	.4byte CaveOfOrigin_B1F_MapAttributes
+	.4byte CaveOfOrigin_B1F_Layout
 	.4byte CaveOfOrigin_B1F_MapEvents
 	.4byte CaveOfOrigin_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 160
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index c79eb088e..c79eb088e 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/events.inc
index 5d03aaaa2..5d03aaaa2 100644
--- a/data/maps/events/CaveOfOrigin_B2F.inc
+++ b/data/maps/CaveOfOrigin_B2F/events.inc
diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc
index 79e76f693..1b3bf2902 100644
--- a/data/maps/CaveOfOrigin_B2F/header.inc
+++ b/data/maps/CaveOfOrigin_B2F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_B2F:: @ 83071D0
-	.4byte CaveOfOrigin_B2F_MapAttributes
+	.4byte CaveOfOrigin_B2F_Layout
 	.4byte CaveOfOrigin_B2F_MapEvents
 	.4byte CaveOfOrigin_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 161
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/scripts.inc
index 66b02ee9f..66b02ee9f 100644
--- a/data/scripts/maps/CaveOfOrigin_B2F.inc
+++ b/data/maps/CaveOfOrigin_B2F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/CaveOfOrigin_B3F/events.inc
index dcf831a76..dcf831a76 100644
--- a/data/maps/events/CaveOfOrigin_B3F.inc
+++ b/data/maps/CaveOfOrigin_B3F/events.inc
diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc
index 746d187f3..cc196d0c8 100644
--- a/data/maps/CaveOfOrigin_B3F/header.inc
+++ b/data/maps/CaveOfOrigin_B3F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_B3F:: @ 83071EC
-	.4byte CaveOfOrigin_B3F_MapAttributes
+	.4byte CaveOfOrigin_B3F_Layout
 	.4byte CaveOfOrigin_B3F_MapEvents
 	.4byte CaveOfOrigin_B3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 162
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/maps/CaveOfOrigin_B3F/scripts.inc
index 8084ceb43..8084ceb43 100644
--- a/data/scripts/maps/CaveOfOrigin_B3F.inc
+++ b/data/maps/CaveOfOrigin_B3F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/CaveOfOrigin_B4F/events.inc
index faa146570..faa146570 100644
--- a/data/maps/events/CaveOfOrigin_B4F.inc
+++ b/data/maps/CaveOfOrigin_B4F/events.inc
diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc
index 0cb1ad83b..97a58ddd6 100644
--- a/data/maps/CaveOfOrigin_B4F/header.inc
+++ b/data/maps/CaveOfOrigin_B4F/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_B4F:: @ 8307208
-	.4byte CaveOfOrigin_B4F_MapAttributes
+	.4byte CaveOfOrigin_B4F_Layout
 	.4byte CaveOfOrigin_B4F_MapEvents
 	.4byte CaveOfOrigin_B4F_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc
index aeec7023f..aeec7023f 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/maps/CaveOfOrigin_B4F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc
index cab14e4d7..cab14e4d7 100644
--- a/data/maps/events/CaveOfOrigin_Entrance.inc
+++ b/data/maps/CaveOfOrigin_Entrance/events.inc
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
index 606997174..70ad445c4 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_Entrance:: @ 830717C
-	.4byte CaveOfOrigin_Entrance_MapAttributes
+	.4byte CaveOfOrigin_Entrance_Layout
 	.4byte CaveOfOrigin_Entrance_MapEvents
 	.4byte CaveOfOrigin_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 158
 	.byte 72
 	.byte 0
diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc
index 68f91e0bd..68f91e0bd 100644
--- a/data/scripts/maps/CaveOfOrigin_Entrance.inc
+++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc
index b1d8690c1..b1d8690c1 100644
--- a/data/maps/events/DesertRuins.inc
+++ b/data/maps/DesertRuins/events.inc
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
index 79e681666..4a9ceab39 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -1,9 +1,9 @@
 DesertRuins:: @ 8306E18
-	.4byte DesertRuins_MapAttributes
+	.4byte DesertRuins_Layout
 	.4byte DesertRuins_MapEvents
 	.4byte DesertRuins_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 132
 	.byte 82
 	.byte 0
diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc
index 2627a8261..2627a8261 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/maps/DesertRuins/scripts.inc
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc
index 5cfb552ee..5cfb552ee 100644
--- a/data/maps/events/DewfordTown.inc
+++ b/data/maps/DewfordTown/events.inc
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
index 7aed01d94..0bd56d96d 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -1,9 +1,9 @@
 DewfordTown:: @ 830557C
-	.4byte DewfordTown_MapAttributes
+	.4byte DewfordTown_Layout
 	.4byte DewfordTown_MapEvents
 	.4byte DewfordTown_MapScripts
 	.4byte DewfordTown_MapConnections
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 12
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown.inc b/data/maps/DewfordTown/scripts.inc
index 63f8c45b9..63f8c45b9 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/maps/DewfordTown/scripts.inc
diff --git a/data/text/maps/DewfordTown.inc b/data/maps/DewfordTown/text.inc
index efdbfbff6..efdbfbff6 100644
--- a/data/text/maps/DewfordTown.inc
+++ b/data/maps/DewfordTown/text.inc
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc
index 237748602..237748602 100644
--- a/data/maps/events/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/events.inc
diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
index 79227e545..c5c9540e5 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_Gym:: @ 8305B9C
-	.4byte DewfordTown_Gym_MapAttributes
+	.4byte DewfordTown_Gym_Layout
 	.4byte DewfordTown_Gym_MapEvents
 	.4byte DewfordTown_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 65
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 596f2c77f..596f2c77f 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
diff --git a/data/text/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/text.inc
index 24d90ec6c..24d90ec6c 100644
--- a/data/text/maps/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/text.inc
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc
index 3eb9818fe..3eb9818fe 100644
--- a/data/maps/events/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/events.inc
diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc
index 975a257d8..38b662f4d 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_Hall:: @ 8305BB8
-	.4byte DewfordTown_Hall_MapAttributes
+	.4byte DewfordTown_Hall_Layout
 	.4byte DewfordTown_Hall_MapEvents
 	.4byte DewfordTown_Hall_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 66
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 602c4776e..602c4776e 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
diff --git a/data/text/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/text.inc
index 6b9f4337e..6b9f4337e 100644
--- a/data/text/maps/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/text.inc
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc
index 69fd54d9c..69fd54d9c 100644
--- a/data/maps/events/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/events.inc
diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc
index 95a8a8339..9f56cdf5d 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_House1:: @ 8305B48
-	.4byte DewfordTown_House1_MapAttributes
+	.4byte House3_Layout
 	.4byte DewfordTown_House1_MapEvents
 	.4byte DewfordTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 64
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc
index 4a112eea2..4a112eea2 100644
--- a/data/scripts/maps/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
diff --git a/data/text/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/text.inc
index d004acf7f..d004acf7f 100644
--- a/data/text/maps/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/text.inc
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc
index f6858b846..f6858b846 100644
--- a/data/maps/events/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/events.inc
diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc
index 37aac2ead..35fd959eb 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_House2:: @ 8305BD4
-	.4byte DewfordTown_House2_MapAttributes
+	.4byte House4_Layout
 	.4byte DewfordTown_House2_MapEvents
 	.4byte DewfordTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 67
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc
index a2341bc76..a2341bc76 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
diff --git a/data/text/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/text.inc
index b37456112..b37456112 100644
--- a/data/text/maps/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/text.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
index 97b0e761a..97b0e761a 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index 9cf0a8f46..b7630e6c3 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_PokemonCenter_1F:: @ 8305B64
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte DewfordTown_PokemonCenter_1F_MapEvents
 	.4byte DewfordTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 33d14e770..33d14e770 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/text.inc
index 9c4a6f41c..9c4a6f41c 100644
--- a/data/text/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
index 333823536..333823536 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
index a54a51c94..5d0babd91 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_PokemonCenter_2F:: @ 8305B80
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte DewfordTown_PokemonCenter_2F_MapEvents
 	.4byte DewfordTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index 554c9ef6b..554c9ef6b 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc
index a04c7a3a9..a04c7a3a9 100644
--- a/data/maps/events/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/events.inc
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
index baf1b8076..bf41ae872 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -1,9 +1,9 @@
 DoubleBattleColosseum:: @ 83079CC
-	.4byte DoubleBattleColosseum_MapAttributes
+	.4byte DoubleBattleColosseum_Layout
 	.4byte DoubleBattleColosseum_MapEvents
 	.4byte DoubleBattleColosseum_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 225
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc
index 9bc33e6bd..9bc33e6bd 100644
--- a/data/scripts/maps/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/scripts.inc
diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc
index 0a619b93d..0a619b93d 100644
--- a/data/maps/events/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/events.inc
diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
index 0c1f6eab0..89386b78c 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity:: @ 8305528
-	.4byte EverGrandeCity_MapAttributes
+	.4byte EverGrandeCity_Layout
 	.4byte EverGrandeCity_MapEvents
 	.4byte EverGrandeCity_MapScripts
 	.4byte EverGrandeCity_MapConnections
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 9
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc
index 293780716..293780716 100644
--- a/data/scripts/maps/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
diff --git a/data/text/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/text.inc
index f468bf3b7..f468bf3b7 100644
--- a/data/text/maps/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/text.inc
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
index 832ddf206..832ddf206 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 154d5ba29..85afeb078 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_ChampionsRoom:: @ 8306B08
-	.4byte EverGrandeCity_ChampionsRoom_MapAttributes
+	.4byte EverGrandeCity_ChampionsRoom_Layout
 	.4byte EverGrandeCity_ChampionsRoom_MapEvents
 	.4byte EverGrandeCity_ChampionsRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 116
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
new file mode 100644
index 000000000..7e1f6e6cb
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -0,0 +1,226 @@
+EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF
+	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF
+	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5
+	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4
+	.byte 0
+
+EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF
+	call EverGrandeCity_ChampionsRoom_EventScript_1A014E
+	end
+
+EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF
+	.2byte 0
+
+EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF
+	turnobject 255, 2
+	end
+
+EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE
+	.2byte 0
+
+EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
+	lockall
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E
+	waitmovement 0
+	delay 40
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802
+	waitmovement 0
+	setvar VAR_TEMP_1, 1
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B805
+	releaseall
+	end
+
+EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
+	walk_up
+	walk_up
+	end_movement
+
+EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
+	playbgm MUS_DAIGO, FALSE
+	msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4
+	trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B821
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
+	playse SE_DOOR
+	setmetatile 6, 1, 838, 0
+	setmetatile 6, 2, 839, 0
+	special DrawWholeMapView
+	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
+	closemessage
+	playse SE_DOOR
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C
+	compare RESULT, 1
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881
+	addobject 2
+	call EverGrandeCity_ChampionsRoom_EventScript_15B9BD
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886
+	compare RESULT, 1
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C
+	playbgm MUS_GIRL_SUP, FALSE
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881
+	playbgm MUS_BOY_SUP, FALSE
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886
+	msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4
+	delay 40
+	playse SE_PIN
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
+	waitmovement 0
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
+	waitmovement 0
+	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
+	msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB
+	msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4
+	delay 40
+	playse SE_PIN
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
+	waitmovement 0
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
+	waitmovement 0
+	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
+	msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
+	closemessage
+	addobject 3
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03
+	waitmovement 0
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4
+	call EverGrandeCity_ChampionsRoom_EventScript_1A03B0
+	msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841
+	waitmovement 0
+	delay 20
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4
+	closemessage
+	delay 30
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8
+	waitmovement 0
+	delay 20
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB
+	compare RESULT, 1
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4
+	closemessage
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
+	waitmovement 0
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
+	waitstate
+	releaseall
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9AB:: @ 815B9AB
+	msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, 4
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191675, 4
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6
+	waitmovement 0
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F
+	waitmovement 0
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF
+	waitmovement 0
+	return
+
+EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD
+	walk_up
+	walk_up
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0
+	walk_up
+	delay_16
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8
+	walk_right
+	walk_up
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
diff --git a/data/text/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/text.inc
index c7c63e208..c7c63e208 100644
--- a/data/text/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/text.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/events.inc
index f3ec6727e..f3ec6727e 100644
--- a/data/maps/events/EverGrandeCity_Corridor1.inc
+++ b/data/maps/EverGrandeCity_Corridor1/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc
index 68d16484e..c15955ae1 100644
--- a/data/maps/EverGrandeCity_Corridor1/header.inc
+++ b/data/maps/EverGrandeCity_Corridor1/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor1:: @ 8306B24
-	.4byte EverGrandeCity_Corridor1_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor1_MapEvents
 	.4byte EverGrandeCity_Corridor1_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc
index 60d1f7253..60d1f7253 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor1.inc
+++ b/data/maps/EverGrandeCity_Corridor1/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/events.inc
index e9a9cdc4c..e9a9cdc4c 100644
--- a/data/maps/events/EverGrandeCity_Corridor2.inc
+++ b/data/maps/EverGrandeCity_Corridor2/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc
index 0dab21f9a..774dd8bf9 100644
--- a/data/maps/EverGrandeCity_Corridor2/header.inc
+++ b/data/maps/EverGrandeCity_Corridor2/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor2:: @ 8306B40
-	.4byte EverGrandeCity_Corridor2_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor2_MapEvents
 	.4byte EverGrandeCity_Corridor2_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc
index d74be91c4..d74be91c4 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor2.inc
+++ b/data/maps/EverGrandeCity_Corridor2/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/events.inc
index 98d5f7b81..98d5f7b81 100644
--- a/data/maps/events/EverGrandeCity_Corridor3.inc
+++ b/data/maps/EverGrandeCity_Corridor3/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc
index 3d20a6a41..2799a2256 100644
--- a/data/maps/EverGrandeCity_Corridor3/header.inc
+++ b/data/maps/EverGrandeCity_Corridor3/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor3:: @ 8306B5C
-	.4byte EverGrandeCity_Corridor3_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor3_MapEvents
 	.4byte EverGrandeCity_Corridor3_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc
index 006e570ef..006e570ef 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor3.inc
+++ b/data/maps/EverGrandeCity_Corridor3/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/events.inc
index cbcf9f77e..cbcf9f77e 100644
--- a/data/maps/events/EverGrandeCity_Corridor4.inc
+++ b/data/maps/EverGrandeCity_Corridor4/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc
index 56a5297d7..254553ab4 100644
--- a/data/maps/EverGrandeCity_Corridor4/header.inc
+++ b/data/maps/EverGrandeCity_Corridor4/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor4:: @ 8306B78
-	.4byte EverGrandeCity_Corridor4_MapAttributes
+	.4byte EverGrandeCity_Corridor4_Layout
 	.4byte EverGrandeCity_Corridor4_MapEvents
 	.4byte EverGrandeCity_Corridor4_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 316
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc
index 2ae857aa8..2ae857aa8 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor4.inc
+++ b/data/maps/EverGrandeCity_Corridor4/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/events.inc
index 5b77148ca..5b77148ca 100644
--- a/data/maps/events/EverGrandeCity_Corridor5.inc
+++ b/data/maps/EverGrandeCity_Corridor5/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc
index 2ca1fef86..176d27e1e 100644
--- a/data/maps/EverGrandeCity_Corridor5/header.inc
+++ b/data/maps/EverGrandeCity_Corridor5/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor5:: @ 8306B94
-	.4byte EverGrandeCity_Corridor5_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor5_MapEvents
 	.4byte EverGrandeCity_Corridor5_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc
index 09ce304f6..09ce304f6 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor5.inc
+++ b/data/maps/EverGrandeCity_Corridor5/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc
index 6b69d45da..6b69d45da 100644
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc
index 04c1d9f32..4f5cb96b6 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_DrakesRoom:: @ 8306AEC
-	.4byte EverGrandeCity_DrakesRoom_MapAttributes
+	.4byte EverGrandeCity_DrakesRoom_Layout
 	.4byte EverGrandeCity_DrakesRoom_MapEvents
 	.4byte EverGrandeCity_DrakesRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 115
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
new file mode 100644
index 000000000..4dad28923
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -0,0 +1,62 @@
+EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D
+	map_script 2, EverGrandeCity_DrakesRoom_MapScript2_15B72C
+	map_script 1, EverGrandeCity_DrakesRoom_MapScript1_15B743
+	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570
+	.byte 0
+
+@ 815B71D
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727
+	.2byte 0
+
+EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727
+	turnobject 255, 2
+	end
+
+EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
+	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736
+	.2byte 0
+
+EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
+	lockall
+	call EverGrandeCity_DrakesRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 4
+	releaseall
+	end
+
+EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
+	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758
+	compare VAR_ELITE_4_STATE, 4
+	call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E
+	end
+
+EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
+	call EverGrandeCity_DrakesRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
+	call EverGrandeCity_DrakesRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
+	trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42
+	goto EverGrandeCity_DrakesRoom_EventScript_15B795
+	end
+
+EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
+	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
+	release
+	end
+
+EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
+	setvar VAR_SPECIAL_4, 0
+	special sub_810FF60
+	setflag FLAG_DEFEATED_ELITE_4_DRAKE
+	call EverGrandeCity_DrakesRoom_EventScript_1A0693
+	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/text.inc
index ed89c22bf..ed89c22bf 100644
--- a/data/text/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/text.inc
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
index 8dba287fe..8dba287fe 100644
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index e0a48f9a6..f0ba099ac 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_GlaciasRoom:: @ 8306AD0
-	.4byte EverGrandeCity_GlaciasRoom_MapAttributes
+	.4byte EverGrandeCity_GlaciasRoom_Layout
 	.4byte EverGrandeCity_GlaciasRoom_MapEvents
 	.4byte EverGrandeCity_GlaciasRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 114
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
new file mode 100644
index 000000000..17555f2f6
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -0,0 +1,60 @@
+EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673
+	map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_15B692
+	map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9
+	map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_15B683
+	.byte 0
+
+EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D
+	.2byte 0
+
+EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D
+	turnobject 255, 2
+	end
+
+EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
+	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C
+	.2byte 0
+
+EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
+	lockall
+	call EverGrandeCity_GlaciasRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 3
+	releaseall
+	end
+
+EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
+	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
+	compare VAR_ELITE_4_STATE, 3
+	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4
+	end
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
+	call EverGrandeCity_GlaciasRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
+	call EverGrandeCity_GlaciasRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
+	trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01
+	goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB
+	end
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
+	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
+	release
+	end
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
+	setflag FLAG_DEFEATED_ELITE_4_GLACIA
+	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
+	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/text.inc
index 88fa1e664..88fa1e664 100644
--- a/data/text/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/text.inc
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc
index f5a3f9137..f5a3f9137 100644
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/events.inc
diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
index b7816ea86..3a8c1a263 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_HallOfFame:: @ 8306BCC
-	.4byte EverGrandeCity_HallOfFame_MapAttributes
+	.4byte EverGrandeCity_HallOfFame_Layout
 	.4byte EverGrandeCity_HallOfFame_MapEvents
 	.4byte EverGrandeCity_HallOfFame_MapScripts
 	.4byte 0x0
-	.2byte BGM_EIKOU_R
+	.2byte MUS_EIKOU_R
 	.2byte 299
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 6cfc5ae27..6cfc5ae27 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
diff --git a/data/text/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/text.inc
index c684dcb72..c684dcb72 100644
--- a/data/text/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/text.inc
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
index aa67e5912..aa67e5912 100644
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
index f9ef5a516..8d34dd0ba 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PhoebesRoom:: @ 8306AB4
-	.4byte EverGrandeCity_PhoebesRoom_MapAttributes
+	.4byte EverGrandeCity_PhoebesRoom_Layout
 	.4byte EverGrandeCity_PhoebesRoom_MapEvents
 	.4byte EverGrandeCity_PhoebesRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 113
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
new file mode 100644
index 000000000..5575b99b3
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -0,0 +1,60 @@
+EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9
+	map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_15B60F
+	map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9
+	map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8
+	.byte 0
+
+EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3
+	.2byte 0
+
+EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3
+	turnobject 255, 2
+	end
+
+EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
+	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602
+	.2byte 0
+
+EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
+	lockall
+	call EverGrandeCity_PhoebesRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 2
+	releaseall
+	end
+
+EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
+	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624
+	compare VAR_ELITE_4_STATE, 2
+	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A
+	end
+
+EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
+	call EverGrandeCity_PhoebesRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
+	call EverGrandeCity_PhoebesRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
+	trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C
+	goto EverGrandeCity_PhoebesRoom_EventScript_15B661
+	end
+
+EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
+	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
+	release
+	end
+
+EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
+	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
+	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
+	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/text.inc
index e77a7d31a..e77a7d31a 100644
--- a/data/text/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/text.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
index ea1045d22..ea1045d22 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index 2b72fc661..489b5bd52 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PokemonCenter_1F:: @ 8306BE8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 374ef9472..374ef9472 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc
index 18594308a..18594308a 100644
--- a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
index 36dfa01f7..36dfa01f7 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
index b60e3c3df..35167d6c1 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PokemonCenter_2F:: @ 8306C04
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte EverGrandeCity_PokemonCenter_2F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index 9941e17e4..9941e17e4 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc
index 89c6973a5..89c6973a5 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/events.inc
diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc
index cf24b61dc..56bb00438 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PokemonLeague:: @ 8306BB0
-	.4byte EverGrandeCity_PokemonLeague_MapAttributes
+	.4byte EverGrandeCity_PokemonLeague_Layout
 	.4byte EverGrandeCity_PokemonLeague_MapEvents
 	.4byte EverGrandeCity_PokemonLeague_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 271
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
new file mode 100644
index 000000000..a48cf278e
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
@@ -0,0 +1,121 @@
+EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
+	map_script 3, EverGrandeCity_PokemonLeague_MapScript1_15BA7B
+	.byte 0
+
+EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
+	setrespawn 20
+	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
+	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B
+	setobjectxyperm 3, 9, 2
+	setobjectxyperm 4, 10, 2
+	return
+
+EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
+	setvar VAR_SPECIAL_B, 1
+	call EverGrandeCity_PokemonLeague_EventScript_19FD5B
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8
+	lock
+	faceplayer
+	message EverGrandeCity_PokemonLeague_Text_1A0BE4
+	waitmessage
+	pokemart EverGrandeCity_PokemonLeague_Items
+	msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_REVIVE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
+	lockall
+	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_0, 11
+	call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34
+	compare VAR_TEMP_0, 8
+	call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F
+	message EverGrandeCity_PokemonLeague_Text_1916FD
+	waitmessage
+	delay 75
+	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A
+	closemessage
+	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
+	applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81
+	waitmovement 0
+	delay 10
+	playfanfare MUS_ME_BACHI
+	message EverGrandeCity_PokemonLeague_Text_191804
+	waitmessage
+	waitfanfare
+	closemessage
+	moveobjectoffscreen 3
+	moveobjectoffscreen 4
+	setflag FLAG_ENTERED_ELITE_FOUR
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34
+	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F
+	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A
+	playse SE_HAZURE
+	msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57
+	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839
+	waitmovement 0
+	msgbox EverGrandeCity_PokemonLeague_Text_191804, 4
+	closemessage
+	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D
+	waitmovement 0
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76
+	walk_down
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A
+	walk_down
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
diff --git a/data/text/maps/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/text.inc
index 89971022c..89971022c 100644
--- a/data/text/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/text.inc
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc
index 552981282..552981282 100644
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc
diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc
index 7c2ee11f8..41ea61fd8 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_SidneysRoom:: @ 8306A98
-	.4byte EverGrandeCity_SidneysRoom_MapAttributes
+	.4byte EverGrandeCity_SidneysRoom_Layout
 	.4byte EverGrandeCity_SidneysRoom_MapEvents
 	.4byte EverGrandeCity_SidneysRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 112
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
new file mode 100644
index 000000000..2b6cc0571
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -0,0 +1,61 @@
+EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
+	map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F
+	map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570
+	map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F
+	.byte 0
+
+EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
+	call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564
+	compare VAR_ELITE_4_STATE, 1
+	call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
+	call EverGrandeCity_SidneysRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A
+	call EverGrandeCity_SidneysRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570
+EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A
+	.2byte 0
+
+EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A
+	turnobject 255, 2
+	end
+
+EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
+	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589
+	.2byte 0
+
+EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
+	lockall
+	call EverGrandeCity_SidneysRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 1
+	releaseall
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
+	trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823
+	goto EverGrandeCity_SidneysRoom_EventScript_15B5C7
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
+	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
+	release
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
+	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
+	call EverGrandeCity_SidneysRoom_EventScript_1A0693
+	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/text.inc
index 84d1dddf5..84d1dddf5 100644
--- a/data/text/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/text.inc
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc
index 37308b07c..37308b07c 100644
--- a/data/maps/events/FallarborTown.inc
+++ b/data/maps/FallarborTown/events.inc
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index bd719a36b..e6e0041b6 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,9 +1,9 @@
 FallarborTown:: @ 83055B4
-	.4byte FallarborTown_MapAttributes
+	.4byte FallarborTown_Layout
 	.4byte FallarborTown_MapEvents
 	.4byte FallarborTown_MapScripts
 	.4byte FallarborTown_MapConnections
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 14
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc
index a168a0ef5..a168a0ef5 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/maps/FallarborTown/scripts.inc
diff --git a/data/text/maps/FallarborTown.inc b/data/maps/FallarborTown/text.inc
index 1483272de..1483272de 100644
--- a/data/text/maps/FallarborTown.inc
+++ b/data/maps/FallarborTown/text.inc
diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/events.inc
index 9479c8db1..9479c8db1 100644
--- a/data/maps/events/FallarborTown_ContestHall.inc
+++ b/data/maps/FallarborTown_ContestHall/events.inc
diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc
index aa540e338..38f414c10 100644
--- a/data/maps/FallarborTown_ContestHall/header.inc
+++ b/data/maps/FallarborTown_ContestHall/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_ContestHall:: @ 8305CEC
-	.4byte FallarborTown_ContestHall_MapAttributes
+	.4byte ContestHall_Layout
 	.4byte FallarborTown_ContestHall_MapEvents
 	.4byte FallarborTown_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 73
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/scripts.inc
index e3fcfd9bc..e3fcfd9bc 100644
--- a/data/scripts/maps/FallarborTown_ContestHall.inc
+++ b/data/maps/FallarborTown_ContestHall/scripts.inc
diff --git a/data/text/maps/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/text.inc
index 5db8766c5..5db8766c5 100644
--- a/data/text/maps/FallarborTown_ContestHall.inc
+++ b/data/maps/FallarborTown_ContestHall/text.inc
diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/events.inc
index 47144a554..47144a554 100644
--- a/data/maps/events/FallarborTown_ContestLobby.inc
+++ b/data/maps/FallarborTown_ContestLobby/events.inc
diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc
index 2f25d3675..2b8d9a18b 100644
--- a/data/maps/FallarborTown_ContestLobby/header.inc
+++ b/data/maps/FallarborTown_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_ContestLobby:: @ 8305CD0
-	.4byte FallarborTown_ContestLobby_MapAttributes
+	.4byte ContestLobby_Layout
 	.4byte FallarborTown_ContestLobby_MapEvents
 	.4byte FallarborTown_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 72
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc
index 5386fec4f..5386fec4f 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/maps/FallarborTown_ContestLobby/scripts.inc
diff --git a/data/text/maps/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/text.inc
index 5d4305f8c..5d4305f8c 100644
--- a/data/text/maps/FallarborTown_ContestLobby.inc
+++ b/data/maps/FallarborTown_ContestLobby/text.inc
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc
index fefaadc51..fefaadc51 100644
--- a/data/maps/events/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/events.inc
diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index 2761536b6..e6eacc77c 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_House1:: @ 8305D40
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte FallarborTown_House1_MapEvents
 	.4byte FallarborTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 59
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc
index f16b6e828..f16b6e828 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
diff --git a/data/text/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/text.inc
index c882bc9b7..c882bc9b7 100644
--- a/data/text/maps/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/text.inc
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc
index b873f95c8..b873f95c8 100644
--- a/data/maps/events/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/events.inc
diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc
index 0366c201a..246bc12db 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_House2:: @ 8305D5C
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte FallarborTown_House2_MapEvents
 	.4byte FallarborTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 60
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/scripts.inc
index 41ebd039c..41ebd039c 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/scripts.inc
diff --git a/data/text/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/text.inc
index de6d63fad..de6d63fad 100644
--- a/data/text/maps/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/text.inc
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc
index bf3195eea..bf3195eea 100644
--- a/data/maps/events/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/events.inc
diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc
index b60fa85c8..de16583f4 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_Mart:: @ 8305CB4
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte FallarborTown_Mart_MapEvents
 	.4byte FallarborTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc
index cfd239e8a..cfd239e8a 100644
--- a/data/scripts/maps/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
diff --git a/data/text/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/text.inc
index bc8b3fb32..bc8b3fb32 100644
--- a/data/text/maps/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/text.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
index 06f8068c6..06f8068c6 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index 8ffb95e0c..e51dea9cc 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_PokemonCenter_1F:: @ 8305D08
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FallarborTown_PokemonCenter_1F_MapEvents
 	.4byte FallarborTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index 6ae897ec8..6ae897ec8 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/text.inc
index a626ff1e9..a626ff1e9 100644
--- a/data/text/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
index 381051d01..381051d01 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
index 45120890d..91613d680 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_PokemonCenter_2F:: @ 8305D24
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte FallarborTown_PokemonCenter_2F_MapEvents
 	.4byte FallarborTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 148b22531..148b22531 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc
index faf6d5011..faf6d5011 100644
--- a/data/maps/events/FieryPath.inc
+++ b/data/maps/FieryPath/events.inc
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index ccca2e656..dcc4d55ea 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,9 +1,9 @@
 FieryPath:: @ 8306EF8
-	.4byte FieryPath_MapAttributes
+	.4byte FieryPath_Layout
 	.4byte FieryPath_MapEvents
 	.4byte FieryPath_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 294
 	.byte 74
 	.byte 0
diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc
index f0bd22071..f0bd22071 100644
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/maps/FieryPath/scripts.inc
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc
index 485fd836f..485fd836f 100644
--- a/data/maps/events/FortreeCity.inc
+++ b/data/maps/FortreeCity/events.inc
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
index 4c96de2b2..eb04f8bcb 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -1,9 +1,9 @@
 FortreeCity:: @ 83054B8
-	.4byte FortreeCity_MapAttributes
+	.4byte FortreeCity_Layout
 	.4byte FortreeCity_MapEvents
 	.4byte FortreeCity_MapScripts
 	.4byte FortreeCity_MapConnections
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 5
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity.inc b/data/maps/FortreeCity/scripts.inc
index 342e2fdc3..342e2fdc3 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/maps/FortreeCity/scripts.inc
diff --git a/data/text/maps/FortreeCity.inc b/data/maps/FortreeCity/text.inc
index 8640fada7..8640fada7 100644
--- a/data/text/maps/FortreeCity.inc
+++ b/data/maps/FortreeCity/text.inc
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc
index 47e635fa8..47e635fa8 100644
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/events.inc
diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
index 5334ca92c..78b54e060 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_DecorationShop:: @ 8306504
-	.4byte FortreeCity_DecorationShop_MapAttributes
+	.4byte FortreeCity_DecorationShop_Layout
 	.4byte FortreeCity_DecorationShop_MapEvents
 	.4byte FortreeCity_DecorationShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 256
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 56a360708..56a360708 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
diff --git a/data/text/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/text.inc
index 7809f10ff..7809f10ff 100644
--- a/data/text/maps/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/text.inc
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc
index 9ff31951b..9ff31951b 100644
--- a/data/maps/events/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/events.inc
diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc
index 378a73b52..9ecaef8b4 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_Gym:: @ 8306424
-	.4byte FortreeCity_Gym_MapAttributes
+	.4byte FortreeCity_Gym_Layout
 	.4byte FortreeCity_Gym_MapEvents
 	.4byte FortreeCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 100
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc
index c0de6bfee..c0de6bfee 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
diff --git a/data/text/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/text.inc
index 036cacd50..036cacd50 100644
--- a/data/text/maps/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/text.inc
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc
index 5e91f873e..5e91f873e 100644
--- a/data/maps/events/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/events.inc
diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc
index ad8198c43..79d0466d7 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House1:: @ 8306408
-	.4byte FortreeCity_House1_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House1_MapEvents
 	.4byte FortreeCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 99
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc
index 443cc3a5c..443cc3a5c 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
diff --git a/data/text/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/text.inc
index 0d94fcd27..0d94fcd27 100644
--- a/data/text/maps/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/text.inc
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc
index 41d8962fe..41d8962fe 100644
--- a/data/maps/events/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/events.inc
diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc
index 3c803636b..44447c390 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House2:: @ 8306494
-	.4byte FortreeCity_House2_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House2_MapEvents
 	.4byte FortreeCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 101
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc
index 365646d81..365646d81 100644
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
diff --git a/data/text/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/text.inc
index 8b78e1ae8..8b78e1ae8 100644
--- a/data/text/maps/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/text.inc
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc
index e02749d0e..e02749d0e 100644
--- a/data/maps/events/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/events.inc
diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc
index 40bf85478..aa77bbf4e 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House3:: @ 83064B0
-	.4byte FortreeCity_House3_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House3_MapEvents
 	.4byte FortreeCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 99
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc
index f5d11ffa7..f5d11ffa7 100644
--- a/data/scripts/maps/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
diff --git a/data/text/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/text.inc
index 6b0b254f6..6b0b254f6 100644
--- a/data/text/maps/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/text.inc
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc
index 58285c7f4..58285c7f4 100644
--- a/data/maps/events/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/events.inc
diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc
index bed750ecb..dcd41d274 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House4:: @ 83064CC
-	.4byte FortreeCity_House4_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House4_MapEvents
 	.4byte FortreeCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 101
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/scripts.inc
index 77e43be34..77e43be34 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
diff --git a/data/text/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/text.inc
index 9389ec4aa..9389ec4aa 100644
--- a/data/text/maps/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/text.inc
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc
index 93447f739..93447f739 100644
--- a/data/maps/events/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/events.inc
diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc
index a8bb67d65..98faa0aee 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House5:: @ 83064E8
-	.4byte FortreeCity_House5_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House5_MapEvents
 	.4byte FortreeCity_House5_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 99
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc
index 888ebe0e2..888ebe0e2 100644
--- a/data/scripts/maps/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
diff --git a/data/text/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/text.inc
index 711b9579e..711b9579e 100644
--- a/data/text/maps/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/text.inc
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc
index a9c48da93..a9c48da93 100644
--- a/data/maps/events/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/events.inc
diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc
index 4b8793d36..a43cd9466 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_Mart:: @ 8306478
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte FortreeCity_Mart_MapEvents
 	.4byte FortreeCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 076f702af..076f702af 100644
--- a/data/scripts/maps/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
diff --git a/data/text/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/text.inc
index c8c2c4f0f..c8c2c4f0f 100644
--- a/data/text/maps/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/text.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
index dcf0e088a..dcf0e088a 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
index fcafbe2af..97c8403b2 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_PokemonCenter_1F:: @ 8306440
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FortreeCity_PokemonCenter_1F_MapEvents
 	.4byte FortreeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index 6d847d7cc..6d847d7cc 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/text.inc
index d5ffb8a61..d5ffb8a61 100644
--- a/data/text/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
index 2e410c319..2e410c319 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
index 0421b7880..57e8510b8 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_PokemonCenter_2F:: @ 830645C
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte FortreeCity_PokemonCenter_2F_MapEvents
 	.4byte FortreeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index 3019dbbc0..3019dbbc0 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc
index 20ea8d4d5..20ea8d4d5 100644
--- a/data/maps/events/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/events.inc
diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc
index cf22ded8a..b3682961a 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_1F:: @ 8306E34
-	.4byte GraniteCave_1F_MapAttributes
+	.4byte GraniteCave_1F_Layout
 	.4byte GraniteCave_1F_MapEvents
 	.4byte GraniteCave_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 133
 	.byte 55
 	.byte 0
diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc
index b9d89f93c..b9d89f93c 100644
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
diff --git a/data/text/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/text.inc
index 3344f76d9..3344f76d9 100644
--- a/data/text/maps/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/text.inc
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc
index 3d148a922..3d148a922 100644
--- a/data/maps/events/GraniteCave_B1F.inc
+++ b/data/maps/GraniteCave_B1F/events.inc
diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc
index 654803312..80af713ad 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_B1F:: @ 8306E50
-	.4byte GraniteCave_B1F_MapAttributes
+	.4byte GraniteCave_B1F_Layout
 	.4byte GraniteCave_B1F_MapEvents
 	.4byte GraniteCave_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 134
 	.byte 55
 	.byte 1
diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/scripts.inc
index c6be3feca..c6be3feca 100644
--- a/data/scripts/maps/GraniteCave_B1F.inc
+++ b/data/maps/GraniteCave_B1F/scripts.inc
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc
index e5c7b1768..e5c7b1768 100644
--- a/data/maps/events/GraniteCave_B2F.inc
+++ b/data/maps/GraniteCave_B2F/events.inc
diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc
index 4d243f3da..9b3dc1610 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_B2F:: @ 8306E6C
-	.4byte GraniteCave_B2F_MapAttributes
+	.4byte GraniteCave_B2F_Layout
 	.4byte GraniteCave_B2F_MapEvents
 	.4byte GraniteCave_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 135
 	.byte 55
 	.byte 1
diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc
index 54e1150f1..54e1150f1 100644
--- a/data/scripts/maps/GraniteCave_B2F.inc
+++ b/data/maps/GraniteCave_B2F/scripts.inc
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc
index 9d8f4b2ba..9d8f4b2ba 100644
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/events.inc
diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
index fb9b18436..da9664943 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_StevensRoom:: @ 8306E88
-	.4byte GraniteCave_StevensRoom_MapAttributes
+	.4byte GraniteCave_StevensRoom_Layout
 	.4byte GraniteCave_StevensRoom_MapEvents
 	.4byte GraniteCave_StevensRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 289
 	.byte 55
 	.byte 0
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index 013703e92..013703e92 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
diff --git a/data/text/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/text.inc
index 873acea22..873acea22 100644
--- a/data/text/maps/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/text.inc
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc
index 3aa3036de..3aa3036de 100644
--- a/data/maps/events/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/events.inc
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
index ee88d280d..b406937ca 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -1,5 +1,5 @@
 InsideOfTruck:: @ 8307B38
-	.4byte InsideOfTruck_MapAttributes
+	.4byte InsideOfTruck_Layout
 	.4byte InsideOfTruck_MapEvents
 	.4byte InsideOfTruck_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/scripts.inc
index 37fa85041..37fa85041 100644
--- a/data/scripts/maps/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
diff --git a/data/text/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/text.inc
index 19166c481..19166c481 100644
--- a/data/text/maps/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/text.inc
diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc
index 8c279596d..8c279596d 100644
--- a/data/maps/events/IslandCave.inc
+++ b/data/maps/IslandCave/events.inc
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
index f811fe3da..70b8a62c6 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -1,9 +1,9 @@
 IslandCave:: @ 83074C4
-	.4byte IslandCave_MapAttributes
+	.4byte IslandCave_Layout
 	.4byte IslandCave_MapEvents
 	.4byte IslandCave_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 281
 	.byte 81
 	.byte 0
diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc
index d8576e883..d8576e883 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/maps/IslandCave/scripts.inc
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc
index 4b656e76e..4b656e76e 100644
--- a/data/maps/events/JaggedPass.inc
+++ b/data/maps/JaggedPass/events.inc
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
index 6770756e8..cb9b61bb3 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -1,9 +1,9 @@
 JaggedPass:: @ 8306EDC
-	.4byte JaggedPass_MapAttributes
+	.4byte JaggedPass_Layout
 	.4byte JaggedPass_MapEvents
 	.4byte JaggedPass_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 293
 	.byte 76
 	.byte 0
diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc
index d75420e88..d75420e88 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/maps/JaggedPass/scripts.inc
diff --git a/data/text/maps/JaggedPass.inc b/data/maps/JaggedPass/text.inc
index 23216b12b..23216b12b 100644
--- a/data/text/maps/JaggedPass.inc
+++ b/data/maps/JaggedPass/text.inc
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc
index 895c792f4..895c792f4 100644
--- a/data/maps/events/LavaridgeTown.inc
+++ b/data/maps/LavaridgeTown/events.inc
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
index e34eec863..8e8eaaee6 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown:: @ 8305598
-	.4byte LavaridgeTown_MapAttributes
+	.4byte LavaridgeTown_Layout
 	.4byte LavaridgeTown_MapEvents
 	.4byte LavaridgeTown_MapScripts
 	.4byte LavaridgeTown_MapConnections
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 13
 	.byte 3
 	.byte 0
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
new file mode 100644
index 000000000..c2bf9bb68
--- /dev/null
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -0,0 +1,320 @@
+LavaridgeTown_MapScripts:: @ 814E4A3
+	map_script 3, LavaridgeTown_MapScript1_14E4AE
+	map_script 2, LavaridgeTown_MapScript2_14E4E3
+	.byte 0
+
+LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
+	setflag FLAG_VISITED_LAVARIDGE_TOWN
+	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF
+	call LavaridgeTown_EventScript_1A014E
+	call LavaridgeTown_EventScript_1A0172
+	compare VAR_LAVARIDGE_RIVAL_STATE, 2
+	call_if_eq LavaridgeTown_EventScript_14E4D0
+	end
+
+LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
+	setobjectxyperm 8, 11, 9
+	setobjectxyperm 7, 11, 9
+	return
+
+LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
+	clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	return
+
+LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
+	map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED
+	.2byte 0
+
+LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	opendoor 12, 15
+	waitdooranim
+	addobject 8
+	applymovement 8, LavaridgeTown_Movement_14E70E
+	waitmovement 0
+	closedoor 12, 15
+	waitdooranim
+	applymovement 8, LavaridgeTown_Movement_1A083F
+	waitmovement 0
+	applymovement 255, LavaridgeTown_Movement_1A0843
+	applymovement 8, LavaridgeTown_Movement_1A0833
+	waitmovement 0
+	applymovement 8, LavaridgeTown_Movement_1A0835
+	waitmovement 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LavaridgeTown_EventScript_14E56B
+	compare RESULT, 1
+	call_if_eq LavaridgeTown_EventScript_14E570
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LavaridgeTown_EventScript_14E68F
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LavaridgeTown_EventScript_14E5AB
+	compare RESULT, 1
+	goto_if_eq LavaridgeTown_EventScript_14E5D0
+	end
+
+LavaridgeTown_EventScript_14E56B:: @ 814E56B
+	playbgm MUS_GIRL_SUP, TRUE
+	return
+
+LavaridgeTown_EventScript_14E570:: @ 814E570
+	playbgm MUS_BOY_SUP, TRUE
+	return
+
+LavaridgeTown_EventScript_14E575:: @ 814E575
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_8, 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LavaridgeTown_EventScript_14E56B
+	compare RESULT, 1
+	call_if_eq LavaridgeTown_EventScript_14E570
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LavaridgeTown_EventScript_14E5AB
+	compare RESULT, 1
+	goto_if_eq LavaridgeTown_EventScript_14E5D0
+	end
+
+LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
+	msgbox LavaridgeTown_Text_16BDA4, 4
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_RECEIVED_GO_GOGGLES
+	msgbox LavaridgeTown_Text_16BE7D, 4
+	goto LavaridgeTown_EventScript_14E5F5
+	end
+
+LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
+	msgbox LavaridgeTown_Text_16BF92, 4
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_RECEIVED_GO_GOGGLES
+	msgbox LavaridgeTown_Text_16C020, 4
+	goto LavaridgeTown_EventScript_14E5F5
+	end
+
+LavaridgeTown_EventScript_14E5F5:: @ 814E5F5
+	closemessage
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LavaridgeTown_EventScript_14E646
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LavaridgeTown_EventScript_14E64E
+	removeobject 8
+	addobject 7
+	delay 30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LavaridgeTown_EventScript_14E69A
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LavaridgeTown_EventScript_14E6A5
+	removeobject 7
+	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
+	savebgm 0
+	fadedefaultbgm
+	compare VAR_SPECIAL_8, 0
+	goto_if_eq LavaridgeTown_EventScript_14E644
+	releaseall
+	end
+
+LavaridgeTown_EventScript_14E644:: @ 814E644
+	release
+	end
+
+LavaridgeTown_EventScript_14E646:: @ 814E646
+	setobjectxyperm 7, 6, 16
+	return
+
+LavaridgeTown_EventScript_14E64E:: @ 814E64E
+	compare FACING, 2
+	call_if_eq LavaridgeTown_EventScript_14E67B
+	compare FACING, 1
+	call_if_eq LavaridgeTown_EventScript_14E680
+	compare FACING, 3
+	call_if_eq LavaridgeTown_EventScript_14E685
+	compare FACING, 4
+	call_if_eq LavaridgeTown_EventScript_14E68A
+	return
+
+LavaridgeTown_EventScript_14E67B:: @ 814E67B
+	setobjectmovementtype 7, 8
+	return
+
+LavaridgeTown_EventScript_14E680:: @ 814E680
+	setobjectmovementtype 7, 7
+	return
+
+LavaridgeTown_EventScript_14E685:: @ 814E685
+	setobjectmovementtype 7, 10
+	return
+
+LavaridgeTown_EventScript_14E68A:: @ 814E68A
+	setobjectmovementtype 7, 9
+	return
+
+LavaridgeTown_EventScript_14E68F:: @ 814E68F
+	applymovement 8, LavaridgeTown_Movement_14E6E8
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_14E69A:: @ 814E69A
+	applymovement 7, LavaridgeTown_Movement_14E6EF
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_14E6A5:: @ 814E6A5
+	compare FACING, 2
+	call_if_eq LavaridgeTown_EventScript_14E6D2
+	compare FACING, 1
+	call_if_eq LavaridgeTown_EventScript_14E6D2
+	compare FACING, 3
+	call_if_eq LavaridgeTown_EventScript_14E6DD
+	compare FACING, 4
+	call_if_eq LavaridgeTown_EventScript_14E6D2
+	return
+
+LavaridgeTown_EventScript_14E6D2:: @ 814E6D2
+	applymovement 7, LavaridgeTown_Movement_14E6FA
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_14E6DD:: @ 814E6DD
+	applymovement 7, LavaridgeTown_Movement_14E703
+	waitmovement 0
+	return
+
+LavaridgeTown_Movement_14E6E8:: @ 814E6E8
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LavaridgeTown_Movement_14E6EF:: @ 814E6EF
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+LavaridgeTown_Movement_14E6FA:: @ 814E6FA
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+LavaridgeTown_Movement_14E703:: @ 814E703
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+LavaridgeTown_Movement_14E70E:: @ 814E70E
+	walk_down
+	end_movement
+
+LavaridgeTown_EventScript_14E710:: @ 814E710
+	specialvar RESULT, GetPlayerFacingDirection
+	compare RESULT, 1
+	goto_if_eq LavaridgeTown_EventScript_14E721
+	end
+
+LavaridgeTown_EventScript_14E721:: @ 814E721
+	incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
+	end
+
+LavaridgeTown_EventScript_14E724:: @ 814E724
+	msgbox LavaridgeTown_Text_16C3FD, 2
+	end
+
+LavaridgeTown_EventScript_14E72D:: @ 814E72D
+	msgbox LavaridgeTown_Text_16C4DB, 3
+	end
+
+LavaridgeTown_EventScript_14E736:: @ 814E736
+	msgbox LavaridgeTown_Text_16C59B, 2
+	end
+
+LavaridgeTown_EventScript_14E73F:: @ 814E73F
+	msgbox LavaridgeTown_Text_16C603, 2
+	end
+
+LavaridgeTown_EventScript_14E748:: @ 814E748
+	msgbox LavaridgeTown_Text_16C694, 2
+	end
+
+LavaridgeTown_EventScript_14E751:: @ 814E751
+	msgbox LavaridgeTown_Text_16C54E, 2
+	end
+
+LavaridgeTown_EventScript_14E75A:: @ 814E75A
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E
+	msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq LavaridgeTown_EventScript_14E7B2
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq LavaridgeTown_EventScript_14E7A8
+	msgbox LavaridgeTown_Text_16C2B6, 4
+	setflag FLAG_RECEIVED_LAVARIDGE_EGG
+	playfanfare MUS_FANFA4
+	message LavaridgeTown_Text_16C2EA
+	waitfanfare
+	waitmessage
+	giveegg SPECIES_WYNAUT
+	release
+	end
+
+LavaridgeTown_EventScript_14E79E:: @ 814E79E
+	msgbox LavaridgeTown_Text_16C398, 4
+	release
+	end
+
+LavaridgeTown_EventScript_14E7A8:: @ 814E7A8
+	msgbox LavaridgeTown_Text_16C2FF, 4
+	release
+	end
+
+LavaridgeTown_EventScript_14E7B2:: @ 814E7B2
+	msgbox LavaridgeTown_Text_16C33C, 4
+	release
+	end
+
+LavaridgeTown_EventScript_14E7BC:: @ 814E7BC
+	msgbox LavaridgeTown_Text_16C72F, 3
+	end
+
+LavaridgeTown_EventScript_14E7C5:: @ 814E7C5
+	msgbox LavaridgeTown_Text_16C77C, 3
+	end
+
+@ 814E7CE
+	msgbox LavaridgeTown_Text_16C7CF, 3
+	end
+
+LavaridgeTown_EventScript_14E7D7:: @ 814E7D7
+	msgbox LavaridgeTown_Text_16C7CF, 3
+	end
diff --git a/data/text/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/text.inc
index 308548510..308548510 100644
--- a/data/text/maps/LavaridgeTown.inc
+++ b/data/maps/LavaridgeTown/text.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
index ed3cc738f..ed3cc738f 100644
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/events.inc
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
index 929b07ae7..05c0b2dbc 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_Gym_1F:: @ 8305C0C
-	.4byte LavaridgeTown_Gym_1F_MapAttributes
+	.4byte LavaridgeTown_Gym_1F_Layout
 	.4byte LavaridgeTown_Gym_1F_MapEvents
 	.4byte LavaridgeTown_Gym_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 69
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 27655127a..27655127a 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/text.inc
index 87ec05632..87ec05632 100644
--- a/data/text/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/text.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc
index 9492194a8..9492194a8 100644
--- a/data/maps/events/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
index d8a747789..0ae5a8634 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_Gym_B1F:: @ 8305C28
-	.4byte LavaridgeTown_Gym_B1F_MapAttributes
+	.4byte LavaridgeTown_Gym_B1F_Layout
 	.4byte LavaridgeTown_Gym_B1F_MapEvents
 	.4byte LavaridgeTown_Gym_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 70
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
index 58178722c..58178722c 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc
index 0e2c546b6..0e2c546b6 100644
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/events.inc
diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc
index f44118c5c..8ab9e4807 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_HerbShop:: @ 8305BF0
-	.4byte LavaridgeTown_HerbShop_MapAttributes
+	.4byte LavaridgeTown_HerbShop_Layout
 	.4byte LavaridgeTown_HerbShop_MapEvents
 	.4byte LavaridgeTown_HerbShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 68
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index 71fc2cbfe..71fc2cbfe 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/text.inc
index 893d3399f..893d3399f 100644
--- a/data/text/maps/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/text.inc
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc
index 90e33480c..90e33480c 100644
--- a/data/maps/events/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/events.inc
diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc
index f43ea0bc4..5b85bcbac 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_House:: @ 8305C44
-	.4byte LavaridgeTown_House_MapAttributes
+	.4byte House3_Layout
 	.4byte LavaridgeTown_House_MapEvents
 	.4byte LavaridgeTown_House_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 64
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 6fc14e0b6..6fc14e0b6 100644
--- a/data/scripts/maps/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/text.inc
index 9710d9398..9710d9398 100644
--- a/data/text/maps/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/text.inc
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc
index 2d365da54..2d365da54 100644
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/events.inc
diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc
index 0882a6bf0..97c192d21 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_Mart:: @ 8305C60
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte LavaridgeTown_Mart_MapEvents
 	.4byte LavaridgeTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index 99b567e06..99b567e06 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/text.inc
index db79bd321..db79bd321 100644
--- a/data/text/maps/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/text.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
index 98f670755..98f670755 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
index 78576d740..27bdfe3f2 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_PokemonCenter_1F:: @ 8305C7C
-	.4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
+	.4byte LavaridgeTown_PokemonCenter_1F_Layout
 	.4byte LavaridgeTown_PokemonCenter_1F_MapEvents
 	.4byte LavaridgeTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 71
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 4e9c51380..4e9c51380 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc
index c66d6df8a..c66d6df8a 100644
--- a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
index 370feb889..370feb889 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
index 3d86fa588..096759809 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_PokemonCenter_2F:: @ 8305C98
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte LavaridgeTown_PokemonCenter_2F_MapEvents
 	.4byte LavaridgeTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index daaeb0b93..daaeb0b93 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc
index e2aa43d2d..e2aa43d2d 100644
--- a/data/maps/events/LilycoveCity.inc
+++ b/data/maps/LilycoveCity/events.inc
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
index 204e2098d..2c067668e 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity:: @ 83054D4
-	.4byte LilycoveCity_MapAttributes
+	.4byte LilycoveCity_Layout
 	.4byte LilycoveCity_MapEvents
 	.4byte LilycoveCity_MapScripts
 	.4byte LilycoveCity_MapConnections
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 6
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
new file mode 100644
index 000000000..081914bda
--- /dev/null
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -0,0 +1,408 @@
+LilycoveCity_MapScripts:: @ 814CA15
+	map_script 3, LilycoveCity_MapScript1_14CA20
+	map_script 1, LilycoveCity_MapScript1_14CA3F
+	.byte 0
+
+LilycoveCity_MapScript1_14CA20:: @ 814CA20
+	setflag FLAG_VISITED_LILYCOVE_CITY
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1
+	call LilycoveCity_EventScript_1A0196
+	call LilycoveCity_EventScript_1A014E
+	end
+
+LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
+	.ifndef SAPPHIRE
+	setmetatile 69, 4, 169, 1
+	setmetatile 70, 4, 680, 1
+	setmetatile 71, 4, 681, 1
+	setmetatile 72, 4, 682, 1
+	setmetatile 69, 5, 145, 1
+	setmetatile 70, 5, 688, 1
+	setmetatile 71, 5, 689, 0
+	setmetatile 72, 5, 690, 1
+	setmetatile 69, 6, 446, 0
+	setmetatile 70, 6, 447, 0
+	setmetatile 71, 6, 368, 0
+	setmetatile 72, 6, 445, 0
+	.endif
+	call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE
+	call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B
+	end
+
+LilycoveCity_EventScript_14CABE:: @ 814CABE
+	setmetatile 76, 12, 656, 1
+	setmetatile 77, 12, 657, 1
+	setmetatile 76, 13, 672, 1
+	setmetatile 77, 13, 673, 1
+	setmetatile 76, 14, 664, 1
+	setmetatile 77, 14, 665, 1
+	setmetatile 76, 15, 672, 1
+	setmetatile 77, 15, 673, 1
+	setmetatile 77, 16, 664, 1
+	setmetatile 78, 16, 665, 1
+	setmetatile 77, 17, 672, 1
+	setmetatile 78, 17, 673, 1
+	return
+
+LilycoveCity_EventScript_14CB2B:: @ 814CB2B
+	setmetatile 69, 4, 169, 1
+	setmetatile 70, 4, 169, 1
+	setmetatile 71, 4, 169, 1
+	setmetatile 72, 4, 169, 1
+	setmetatile 69, 5, 145, 1
+	setmetatile 70, 5, 145, 1
+	setmetatile 71, 5, 145, 1
+	setmetatile 72, 5, 145, 1
+	return
+
+LilycoveCity_EventScript_14CB74:: @ 814CB74
+	lock
+	faceplayer
+	dodailyevents
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4
+	msgbox LilycoveCity_Text_1C5A7A, 4
+	random 10
+	addvar RESULT, ITEM_CHERI_BERRY
+	giveitem_std RESULT
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_EventScript_1A029B
+	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
+	msgbox LilycoveCity_Text_1C5B1D, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBB4:: @ 814CBB4
+	msgbox LilycoveCity_Text_1C5B5D, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBBE:: @ 814CBBE
+	msgbox LilycoveCity_Text_1686C9, 2
+	end
+
+LilycoveCity_EventScript_14CBC7:: @ 814CBC7
+	lock
+	faceplayer
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC
+	msgbox LilycoveCity_Text_168750, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBDC:: @ 814CBDC
+	msgbox LilycoveCity_Text_168791, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBE6:: @ 814CBE6
+	msgbox LilycoveCity_Text_168819, 2
+	end
+
+LilycoveCity_EventScript_14CBEF:: @ 814CBEF
+	lock
+	faceplayer
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04
+	msgbox LilycoveCity_Text_1688C1, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC04:: @ 814CC04
+	msgbox LilycoveCity_Text_168934, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC0E:: @ 814CC0E
+	lock
+	faceplayer
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23
+	msgbox LilycoveCity_Text_1689BF, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC23:: @ 814CC23
+	msgbox LilycoveCity_Text_168A55, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC2D:: @ 814CC2D
+	msgbox LilycoveCity_Text_168A8D, 2
+	end
+
+LilycoveCity_EventScript_14CC36:: @ 814CC36
+	msgbox LilycoveCity_Text_168B1F, 3
+	end
+
+LilycoveCity_EventScript_14CC3F:: @ 814CC3F
+	msgbox LilycoveCity_Text_168B9B, 3
+	end
+
+LilycoveCity_EventScript_14CC48:: @ 814CC48
+	lock
+	faceplayer
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D
+	msgbox LilycoveCity_Text_168C16, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC5D:: @ 814CC5D
+	msgbox LilycoveCity_Text_168D15, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC67:: @ 814CC67
+	msgbox LilycoveCity_Text_168DA9, 3
+	end
+
+LilycoveCity_EventScript_14CC70:: @ 814CC70
+	msgbox LilycoveCity_Text_168DE1, 3
+	end
+
+LilycoveCity_EventScript_14CC79:: @ 814CC79
+	msgbox LilycoveCity_Text_168E2F, 3
+	end
+
+LilycoveCity_EventScript_14CC82:: @ 814CC82
+	lockall
+	specialvar VAR_SPECIAL_4, sub_80C4D50
+	switch VAR_SPECIAL_4
+	case 0, LilycoveCity_EventScript_14CCA2
+	msgbox LilycoveCity_Text_168EA4, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCA2:: @ 814CCA2
+	msgbox LilycoveCity_Text_168E67, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCAC:: @ 814CCAC
+	lockall
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0
+	msgbox LilycoveCity_Text_168EDA, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCC0:: @ 814CCC0
+	msgbox LilycoveCity_Text_168F57, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCCA:: @ 814CCCA
+	msgbox LilycoveCity_Text_168FA1, 3
+	end
+
+LilycoveCity_EventScript_14CCD3:: @ 814CCD3
+	msgbox LilycoveCity_Text_168FF3, 3
+	end
+
+LilycoveCity_EventScript_14CCDC:: @ 814CCDC
+	msgbox LilycoveCity_Text_169072, 3
+	end
+
+LilycoveCity_EventScript_14CCE5:: @ 814CCE5
+	lockall
+	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18
+	msgbox LilycoveCity_Text_16864A, 4
+	applymovement LAST_TALKED, LilycoveCity_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_Text_168675, 4
+	applymovement LAST_TALKED, LilycoveCity_Movement_1A083D
+	waitmovement 0
+	setflag FLAG_MET_WAILMER_TRAINER
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CD18:: @ 814CD18
+	msgbox LilycoveCity_Text_16864A, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CD22:: @ 814CD22
+	msgbox LilycoveCity_Text_168455, 2
+	end
+
+LilycoveCity_EventScript_14CD2B:: @ 814CD2B
+	msgbox LilycoveCity_Text_1684C2, 2
+	end
+
+LilycoveCity_EventScript_14CD34:: @ 814CD34
+	msgbox LilycoveCity_Text_168573, 2
+	end
+
+LilycoveCity_EventScript_14CD3D:: @ 814CD3D
+	msgbox LilycoveCity_Text_1685EB, 2
+	end
+
+LilycoveCity_EventScript_14CD46:: @ 814CD46
+	lock
+	faceplayer
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_EventScript_14CD60
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_EventScript_14CDD3
+	end
+
+LilycoveCity_EventScript_14CD60:: @ 814CD60
+	playbgm MUS_GIRL_SUP, TRUE
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_EventScript_14CDC2
+	msgbox LilycoveCity_Text_167B94, 4
+	switch VAR_STARTER_MON
+	case 0, LilycoveCity_EventScript_14CE46
+	case 1, LilycoveCity_EventScript_14CE56
+	case 2, LilycoveCity_EventScript_14CE66
+	end
+
+LilycoveCity_EventScript_14CDB0:: @ 814CDB0
+	msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CDB9:: @ 814CDB9
+	msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CDC2:: @ 814CDC2
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
+	msgbox LilycoveCity_Text_167AEB, 4
+	savebgm 0
+	fadedefaultbgm
+	release
+	end
+
+LilycoveCity_EventScript_14CDD3:: @ 814CDD3
+	playbgm MUS_BOY_SUP, TRUE
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_EventScript_14CE35
+	msgbox LilycoveCity_Text_1680A9, 4
+	switch VAR_STARTER_MON
+	case 0, LilycoveCity_EventScript_14CE76
+	case 1, LilycoveCity_EventScript_14CE86
+	case 2, LilycoveCity_EventScript_14CE96
+	end
+
+LilycoveCity_EventScript_14CE23:: @ 814CE23
+	msgbox LilycoveCity_Text_168067, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CE2C:: @ 814CE2C
+	msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CE35:: @ 814CE35
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
+	msgbox LilycoveCity_Text_16802C, 4
+	savebgm 0
+	fadedefaultbgm
+	release
+	end
+
+LilycoveCity_EventScript_14CE46:: @ 814CE46
+	trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5
+	goto LilycoveCity_EventScript_14CEA6
+	end
+
+LilycoveCity_EventScript_14CE56:: @ 814CE56
+	trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5
+	goto LilycoveCity_EventScript_14CEA6
+	end
+
+LilycoveCity_EventScript_14CE66:: @ 814CE66
+	trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5
+	goto LilycoveCity_EventScript_14CEA6
+	end
+
+LilycoveCity_EventScript_14CE76:: @ 814CE76
+	trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4
+	goto LilycoveCity_EventScript_14CF12
+	end
+
+LilycoveCity_EventScript_14CE86:: @ 814CE86
+	trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4
+	goto LilycoveCity_EventScript_14CF12
+	end
+
+LilycoveCity_EventScript_14CE96:: @ 814CE96
+	trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4
+	goto LilycoveCity_EventScript_14CF12
+	end
+
+LilycoveCity_EventScript_14CEA6:: @ 814CEA6
+	msgbox LilycoveCity_Text_167C6B, 4
+	setvar RESULT, 0
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
+	compare RESULT, 0
+	call_if_eq LilycoveCity_EventScript_14CEEE
+	compare RESULT, 1
+	call_if_eq LilycoveCity_EventScript_14CEF7
+	clearflag FLAG_HIDE_MAY_UPSTAIRS
+	clearflag FLAG_HIDE_MAY_PICHU_DOLL
+	goto LilycoveCity_EventScript_14CF6B
+	end
+
+LilycoveCity_EventScript_14CEDE:: @ 814CEDE
+	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8
+	return
+
+LilycoveCity_EventScript_14CEE8:: @ 814CEE8
+	setvar RESULT, 1
+	return
+
+LilycoveCity_EventScript_14CEEE:: @ 814CEEE
+	msgbox LilycoveCity_Text_167D08, 4
+	return
+
+LilycoveCity_EventScript_14CEF7:: @ 814CEF7
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09
+	msgbox LilycoveCity_Text_167DDD, 4
+	return
+
+LilycoveCity_EventScript_14CF09:: @ 814CF09
+	msgbox LilycoveCity_Text_167EAA, 4
+	return
+
+LilycoveCity_EventScript_14CF12:: @ 814CF12
+	msgbox LilycoveCity_Text_168149, 4
+	setvar RESULT, 0
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
+	compare RESULT, 0
+	call_if_eq LilycoveCity_EventScript_14CF47
+	compare RESULT, 1
+	call_if_eq LilycoveCity_EventScript_14CF50
+	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS
+	goto LilycoveCity_EventScript_14CF6B
+	end
+
+LilycoveCity_EventScript_14CF47:: @ 814CF47
+	msgbox LilycoveCity_Text_1681EA, 4
+	return
+
+LilycoveCity_EventScript_14CF50:: @ 814CF50
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62
+	msgbox LilycoveCity_Text_168282, 4
+	return
+
+LilycoveCity_EventScript_14CF62:: @ 814CF62
+	msgbox LilycoveCity_Text_16835A, 4
+	return
+
+LilycoveCity_EventScript_14CF6B:: @ 814CF6B
+	closemessage
+	applymovement LAST_TALKED, LilycoveCity_Movement_1A0845
+	waitmovement 0
+	delay 50
+	setfieldeffectargument 0, 1
+	dofieldeffect FLDEFF_NPCFLY_OUT
+	delay 15
+	removeobject LAST_TALKED
+	waitfieldeffect FLDEFF_NPCFLY_OUT
+	savebgm 0
+	fadedefaultbgm
+	setflag FLAG_MET_RIVAL_LILYCOVE
+	release
+	end
diff --git a/data/text/maps/LilycoveCity.inc b/data/maps/LilycoveCity/text.inc
index 0f9b45c1d..0f9b45c1d 100644
--- a/data/text/maps/LilycoveCity.inc
+++ b/data/maps/LilycoveCity/text.inc
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc
index bc4331484..bc4331484 100644
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/events.inc
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
index 47329e0f7..9e690f9a7 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_ContestHall:: @ 83065AC
-	.4byte LilycoveCity_ContestHall_MapAttributes
+	.4byte LilycoveCity_ContestHall_Layout
 	.4byte LilycoveCity_ContestHall_MapEvents
 	.4byte LilycoveCity_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 106
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 944857a21..944857a21 100644
--- a/data/scripts/maps/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
diff --git a/data/text/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/text.inc
index 96507b770..96507b770 100644
--- a/data/text/maps/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/text.inc
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
index b44590d65..b44590d65 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ b/data/maps/LilycoveCity_ContestLobby/events.inc
diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc
index 5bf98a32b..37415383b 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_ContestLobby:: @ 8306590
-	.4byte LilycoveCity_ContestLobby_MapAttributes
+	.4byte LilycoveCity_ContestLobby_Layout
 	.4byte LilycoveCity_ContestLobby_MapEvents
 	.4byte LilycoveCity_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 105
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
new file mode 100644
index 000000000..b9297628a
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -0,0 +1,766 @@
+LilycoveCity_ContestLobby_MapScripts:: @ 8158866
+	map_script 3, LilycoveCity_ContestLobby_MapScript1_158871
+	map_script 2, LilycoveCity_ContestLobby_MapScript2_158877
+	.byte 0
+
+LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871
+	call LilycoveCity_ContestLobby_EventScript_1AE188
+	end
+
+LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B
+	.2byte 0
+
+LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
+	lockall
+	addobject 4
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B
+	waitmovement 4
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
+	lockall
+	fadescreen 1
+	drawcontestwinner 0
+	lockall
+	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158918
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
+	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
+	closemessage
+	special sub_80C4CEC
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	specialvar RESULT, GiveMonArtistRibbon
+	compare RESULT, 1
+	call_if_eq LilycoveCity_ContestLobby_EventScript_158948
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
+	waitmovement 0
+	removeobject 4
+	call LilycoveCity_ContestLobby_EventScript_158994
+	call LilycoveCity_ContestLobby_EventScript_1589EA
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
+	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
+	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
+	closemessage
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
+	waitmovement 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	removeobject 4
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
+	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
+	special sub_80C4858
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E
+	waitmovement 0
+	playse SE_PIN
+	applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833
+	waitmovement 0
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A52
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
+	playfanfare MUS_FANFA4
+	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
+	waitfanfare
+	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
+	closemessage
+	return
+
+LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
+	specialvar VAR_SPECIAL_4, sub_80C4D50
+	switch VAR_SPECIAL_4
+	case 1, LilycoveCity_ContestLobby_EventScript_1589D6
+	case 2, LilycoveCity_ContestLobby_EventScript_1589DA
+	case 3, LilycoveCity_ContestLobby_EventScript_1589DE
+	case 4, LilycoveCity_ContestLobby_EventScript_1589E2
+	case 5, LilycoveCity_ContestLobby_EventScript_1589E6
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
+	switch CONTEST_CATEGORY
+	case 0, LilycoveCity_ContestLobby_EventScript_158A27
+	case 1, LilycoveCity_ContestLobby_EventScript_158A2B
+	case 2, LilycoveCity_ContestLobby_EventScript_158A2F
+	case 3, LilycoveCity_ContestLobby_EventScript_158A33
+	case 4, LilycoveCity_ContestLobby_EventScript_158A37
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27
+	setflag FLAG_COOL_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B
+	setflag FLAG_BEAUTY_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F
+	setflag FLAG_CUTE_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33
+	setflag FLAG_SMART_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37
+	setflag FLAG_TOUGH_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C
+	walk_in_place_fastest_left
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_right
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
+	lockall
+	addobject 11
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B64
+	waitmovement 11
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158B76
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
+	lockall
+	fadescreen 1
+	drawcontestwinner 0
+	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8
+	end
+
+LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
+	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
+	closemessage
+	special sub_80C4CEC
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	specialvar RESULT, GiveMonArtistRibbon
+	compare RESULT, 1
+	call_if_eq LilycoveCity_ContestLobby_EventScript_158B18
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
+	waitmovement 0
+	removeobject 11
+	call LilycoveCity_ContestLobby_EventScript_158994
+	call LilycoveCity_ContestLobby_EventScript_1589EA
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
+	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
+	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
+	closemessage
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
+	waitmovement 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	removeobject 11
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
+	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
+	special sub_80C4858
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B78
+	waitmovement 0
+	playse SE_PIN
+	applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833
+	waitmovement 0
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
+	playfanfare MUS_FANFA4
+	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
+	waitfanfare
+	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
+	closemessage
+	return
+
+LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76
+	walk_in_place_fastest_right
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
+	lockall
+	checkitem ITEM_CONTEST_PASS, 1
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
+	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE
+	message LilycoveCity_ContestLobby_Text_18848C
+	waitmessage
+	setflag FLAG_TEMP_2
+	goto LilycoveCity_ContestLobby_EventScript_158BF0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE
+	message LilycoveCity_ContestLobby_Text_188584
+	waitmessage
+	goto LilycoveCity_ContestLobby_EventScript_158BF0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA
+	msgbox LilycoveCity_ContestLobby_Text_1A63F4, 4
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
+	msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
+	call S_DoSaveDialog
+	erasebox 0, 0, 15, 9
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
+	setflag FLAG_TEMP_3
+	return
+
+LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
+	multichoice 0, 0, 2, 0
+	switch RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_158CEA
+	case 1, LilycoveCity_ContestLobby_EventScript_158C27
+	case 2, LilycoveCity_ContestLobby_EventScript_158C35
+	case 127, LilycoveCity_ContestLobby_EventScript_158C35
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
+	msgbox LilycoveCity_ContestLobby_Text_1885A7, 4
+	goto LilycoveCity_ContestLobby_EventScript_158B85
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
+	msgbox LilycoveCity_ContestLobby_Text_188559, 4
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
+	msgbox LilycoveCity_ContestLobby_Text_188703, 4
+	setvar CONTEST_RANK, 0
+	choosecontestmon
+	compare VAR_SPECIAL_4, 255
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA
+	special sub_80C43F4
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
+	compare RESULT, 2
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
+	compare RESULT, 3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4
+	compare RESULT, 4
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96
+	msgbox LilycoveCity_ContestLobby_Text_1A664A, 4
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4
+	msgbox LilycoveCity_ContestLobby_Text_1A669F, 4
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2
+	msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
+	copyvar VAR_SPECIAL_8, VAR_SPECIAL_4
+	message LilycoveCity_ContestLobby_Text_1A67A3
+	waitmessage
+	yesnobox 20, 8
+	switch RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_158C42
+	case 1, LilycoveCity_ContestLobby_EventScript_158D24
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
+	call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4
+	message LilycoveCity_ContestLobby_Text_1886DC
+	waitmessage
+	multichoice 0, 0, 4, 0
+	switch RESULT
+	case 5, LilycoveCity_ContestLobby_EventScript_158C35
+	case 127, LilycoveCity_ContestLobby_EventScript_158C35
+	copyvar CONTEST_CATEGORY, RESULT
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
+	message LilycoveCity_ContestLobby_Text_1887C7
+	waitmessage
+	copyvar VAR_SPECIAL_4, RESULT
+	special sub_808363C
+	waitstate
+	compare RESULT, 3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90
+	compare RESULT, 5
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1
+	compare RESULT, 6
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2
+	messageautoscroll LilycoveCity_ContestLobby_Text_18872A
+	waitmessage
+	contestlinktransfer
+	switch VAR_SPECIAL_4
+	case 0, LilycoveCity_ContestLobby_EventScript_158DD1
+	case 1, LilycoveCity_ContestLobby_EventScript_158D82
+	case 2, LilycoveCity_ContestLobby_EventScript_158DC3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82
+	msgbox LilycoveCity_ContestLobby_Text_188750, 4
+	goto LilycoveCity_ContestLobby_EventScript_158CEA
+	end
+
+LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
+	closemessage
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
+	closemessage
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
+	closemessage
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
+	msgbox LilycoveCity_ContestLobby_Text_18873A, 4
+	goto LilycoveCity_ContestLobby_EventScript_158CEA
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
+	special sub_80C496C
+	addvar VAR_SPECIAL_4, 1
+	buffernumberstring 1, 32772
+	messageautoscroll LilycoveCity_ContestLobby_Text_188845
+	waitmessage
+	addvar VAR_SPECIAL_4, -1
+	goto LilycoveCity_ContestLobby_EventScript_158DEE
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
+	call LilycoveCity_ContestLobby_EventScript_158E0B
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
+	special sub_80C4F70
+	setvar VAR_CONTEST_LOCATION, 5
+	setvar CONTEST_RANK, 3
+	call LilycoveCity_ContestLobby_EventScript_158F08
+	end
+
+LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
+	lockall
+	messageautoscroll LilycoveCity_ContestLobby_Text_1888C6
+	waitmessage
+	delay 20
+	closemessage
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 9, 2, 545, 1
+	setmetatile 9, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 9, 2, 721, 1
+	setmetatile 9, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE
+	waitmovement 0
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158E99
+	waitmovement 0
+	messageautoscroll LilycoveCity_ContestLobby_Text_1A6832
+	waitmessage
+	delay 20
+	closemessage
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E
+	waitmovement 0
+	releaseall
+	return
+
+LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99
+	walk_in_place_fastest_right
+	walk_right
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE
+	walk_in_place_fastest_left
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
+	specialvar RESULT, sub_80C5044
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8
+	setvar VAR_SPECIAL_B, 8
+	setvar CONTEST_RANK, 3
+	call LilycoveCity_ContestLobby_EventScript_1A4E92
+	call LilycoveCity_ContestLobby_EventScript_158F86
+	special SetContestTrainerGfxIds
+	call LilycoveCity_ContestLobby_EventScript_15FBDB
+	setvar VAR_CONTEST_LOCATION, 4
+	call LilycoveCity_ContestLobby_EventScript_158F08
+	waitstate
+	end
+
+LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
+	giveitem ITEM_CONTEST_PASS, 1
+	setvar VAR_SPECIAL_B, 8
+	setvar CONTEST_RANK, 3
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
+	setflag FLAG_SYS_RIBBON_GET
+	end
+
+LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
+	switch CONTEST_CATEGORY
+	case 0, LilycoveCity_ContestLobby_EventScript_158F45
+	case 1, LilycoveCity_ContestLobby_EventScript_158F52
+	case 2, LilycoveCity_ContestLobby_EventScript_158F5F
+	case 3, LilycoveCity_ContestLobby_EventScript_158F6C
+	case 4, LilycoveCity_ContestLobby_EventScript_158F79
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45
+	setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52
+	setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F
+	setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C
+	setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79
+	setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
+	lockall
+	applymovement 1, LilycoveCity_ContestLobby_Movement_15900B
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 1, LilycoveCity_ContestLobby_Movement_15900F
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 1, LilycoveCity_ContestLobby_Movement_15901C
+	waitmovement 0
+	applymovement 255, LilycoveCity_ContestLobby_Movement_159008
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_1A6832, 4
+	closemessage
+	applymovement 1, LilycoveCity_ContestLobby_Movement_159013
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE
+	waitmovement 0
+	releaseall
+	return
+
+LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_159008:: @ 8159008
+	walk_in_place_fastest_left
+	walk_left
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_159013:: @ 8159013
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C
+	walk_in_place_fastest_right
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
+	msgbox LilycoveCity_ContestLobby_Text_188D3C, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
+	goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039
+	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159039:: @ 8159039
+	msgbox LilycoveCity_ContestLobby_Text_188E47, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159042:: @ 8159042
+	msgbox LilycoveCity_ContestLobby_Text_188F07, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_15904B:: @ 815904B
+	msgbox LilycoveCity_ContestLobby_Text_188F81, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159054:: @ 8159054
+	msgbox LilycoveCity_ContestLobby_Text_188FE3, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D
+	msgbox LilycoveCity_ContestLobby_Text_18904D, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066
+	lockall
+	fadescreen 1
+	drawcontestwinner 6
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D
+	lockall
+	fadescreen 1
+	drawcontestwinner 7
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074
+	lockall
+	fadescreen 1
+	drawcontestwinner 8
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_15907B:: @ 815907B
+	msgbox LilycoveCity_ContestLobby_Text_1B7225, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084
+	msgbox LilycoveCity_ContestLobby_Text_1B7241, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D
+SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D
+	lockall
+	special ShowBerryBlenderRecordWindow
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
+	releaseall
+	end
diff --git a/data/text/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/text.inc
index d173519e8..d173519e8 100644
--- a/data/text/maps/LilycoveCity_ContestLobby.inc
+++ b/data/maps/LilycoveCity_ContestLobby/text.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
index eee09c890..eee09c890 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
index 141fda863..15a8aa7d0 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_CoveLilyMotel_1F:: @ 8306520
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
+	.4byte LilycoveCity_CoveLilyMotel_1F_Layout
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapEvents
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 300
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index c3eca04f4..c3eca04f4 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc
index 7d6e4942f..7d6e4942f 100644
--- a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
index 4469cddb0..4469cddb0 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index 2d6f9de4b..a39f3acf0 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_CoveLilyMotel_2F:: @ 830653C
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
+	.4byte LilycoveCity_CoveLilyMotel_2F_Layout
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapEvents
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 301
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
new file mode 100644
index 000000000..5bfc6a5e7
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -0,0 +1,53 @@
+LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
+	.byte 0
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
+	lock
+	faceplayer
+	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
+	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
+	specialvar RESULT, CompletedHoennPokedex
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0
+	release
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, 4
+	return
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
+	setflag FLAG_TEMP_2
+	playfanfare MUS_FANFA4
+	waitfanfare
+	goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
+	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
+	waitmessage
+	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
+	special ScrSpecial_ShowDiploma
+	waitstate
+	release
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE:: @ 81583EE
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7:: @ 81583F7
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_158400:: @ 8158400
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, 2
+	end
diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc
index 0306db9e9..0306db9e9 100644
--- a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
index eca98b599..eca98b599 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
index 3f1a8ada9..65b573d92 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStoreElevator:: @ 83067A4
-	.4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreElevator_Layout
 	.4byte LilycoveCity_DepartmentStoreElevator_MapEvents
 	.4byte LilycoveCity_DepartmentStoreElevator_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 274
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index f895ea99d..f895ea99d 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
index 71d34fa68..71d34fa68 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
index 292c621d3..0131ea7f1 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStoreRooftop:: @ 8306788
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapEvents
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 263
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index e2274110c..e2274110c 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc
index 62eb03bc1..62eb03bc1 100644
--- a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
index d5170d4c1..d5170d4c1 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
index ecfb77604..6f5da636f 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_1F:: @ 83066FC
-	.4byte LilycoveCity_DepartmentStore_1F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_1F_Layout
 	.4byte LilycoveCity_DepartmentStore_1F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 258
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index f6b23bc05..f6b23bc05 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc
index 45cf3686d..45cf3686d 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
index 65c22a60f..65c22a60f 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index f10428935..7bc576b3f 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_2F:: @ 8306718
-	.4byte LilycoveCity_DepartmentStore_2F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_2F_Layout
 	.4byte LilycoveCity_DepartmentStore_2F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 259
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 25e981628..25e981628 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc
index e9a52bbee..e9a52bbee 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
index 212d44971..212d44971 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 16f453da0..402d1a137 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_3F:: @ 8306734
-	.4byte LilycoveCity_DepartmentStore_3F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_3F_Layout
 	.4byte LilycoveCity_DepartmentStore_3F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 260
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index 1f55f5018..1f55f5018 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc
index 8777fd1f3..8777fd1f3 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
index 40b8eab37..40b8eab37 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index 169f21d92..57bea5077 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_4F:: @ 8306750
-	.4byte LilycoveCity_DepartmentStore_4F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_4F_Layout
 	.4byte LilycoveCity_DepartmentStore_4F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_4F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 261
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index 907b79847..907b79847 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc
index b26962a8f..b26962a8f 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
index 2883d167b..2883d167b 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index 19b45696c..1159ddeaf 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_5F:: @ 830676C
-	.4byte LilycoveCity_DepartmentStore_5F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_5F_Layout
 	.4byte LilycoveCity_DepartmentStore_5F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_5F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 262
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index 184d3b816..184d3b816 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc
index 8b1d81c2e..8b1d81c2e 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc
diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/events.inc
index 4ac5c42b8..4ac5c42b8 100644
--- a/data/maps/events/LilycoveCity_EmptyMap.inc
+++ b/data/maps/LilycoveCity_EmptyMap/events.inc
diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc
index a83e7139d..469b52893 100644
--- a/data/maps/LilycoveCity_EmptyMap/header.inc
+++ b/data/maps/LilycoveCity_EmptyMap/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_EmptyMap:: @ 8306654
-	.4byte LilycoveCity_EmptyMap_MapAttributes
+	.4byte LilycoveCity_EmptyMap_Layout
 	.4byte LilycoveCity_EmptyMap_MapEvents
 	.4byte LilycoveCity_EmptyMap_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 108
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/scripts.inc
index 16d025174..16d025174 100644
--- a/data/scripts/maps/LilycoveCity_EmptyMap.inc
+++ b/data/maps/LilycoveCity_EmptyMap/scripts.inc
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc
index 35a34928f..35a34928f 100644
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ b/data/maps/LilycoveCity_Harbor/events.inc
diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
index 022eb0356..75b924e8f 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_Harbor:: @ 8306638
-	.4byte LilycoveCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte LilycoveCity_Harbor_MapEvents
 	.4byte LilycoveCity_Harbor_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 88
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 57ad4b85b..57ad4b85b 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
diff --git a/data/text/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/text.inc
index 0f31f697b..0f31f697b 100644
--- a/data/text/maps/LilycoveCity_Harbor.inc
+++ b/data/maps/LilycoveCity_Harbor/text.inc
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc
index 482ebf0b6..482ebf0b6 100644
--- a/data/maps/events/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/events.inc
diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc
index 5cfc8540b..20675582b 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House1:: @ 830668C
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House1_MapEvents
 	.4byte LilycoveCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 59
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc
index 15535a122..15535a122 100644
--- a/data/scripts/maps/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/text.inc
index a937ff64d..a937ff64d 100644
--- a/data/text/maps/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/text.inc
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc
index d557cd75a..d557cd75a 100644
--- a/data/maps/events/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/events.inc
diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc
index 8aac9185c..1948d4470 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House2:: @ 83066A8
-	.4byte LilycoveCity_House2_MapAttributes
+	.4byte LilycoveCity_House2_Layout
 	.4byte LilycoveCity_House2_MapEvents
 	.4byte LilycoveCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 74
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 797c8f203..797c8f203 100644
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/text.inc
index 0e037a65f..0e037a65f 100644
--- a/data/text/maps/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/text.inc
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc
index 2186eb0d2..2186eb0d2 100644
--- a/data/maps/events/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/events.inc
diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
index 599e904d5..df0d576b4 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House3:: @ 83066C4
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_House3_MapEvents
 	.4byte LilycoveCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 60
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 1a569bf5b..1a569bf5b 100644
--- a/data/scripts/maps/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/text.inc
index 03db4920f..03db4920f 100644
--- a/data/text/maps/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/text.inc
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc
index d5ebda9f2..d5ebda9f2 100644
--- a/data/maps/events/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/events.inc
diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc
index d9cd2c7f0..a8d4d1bcc 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House4:: @ 83066E0
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House4_MapEvents
 	.4byte LilycoveCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 59
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 13bc95dfa..13bc95dfa 100644
--- a/data/scripts/maps/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/text.inc
index ebfd5ae71..ebfd5ae71 100644
--- a/data/text/maps/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/text.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
index a081a6523..a081a6523 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
index d48ffc94f..3af5b4c90 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_LilycoveMuseum_1F:: @ 8306558
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
+	.4byte LilycoveCity_LilycoveMuseum_1F_Layout
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapEvents
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_BIJYUTU
+	.2byte MUS_BIJYUTU
 	.2byte 103
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
index b45261aca..b45261aca 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc
index b60e0e50d..b60e0e50d 100644
--- a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
index 4e2ffe49f..4e2ffe49f 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
index 460ed87f9..3ceabddcb 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_LilycoveMuseum_2F:: @ 8306574
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
+	.4byte LilycoveCity_LilycoveMuseum_2F_Layout
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapEvents
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_BIJYUTU
+	.2byte MUS_BIJYUTU
 	.2byte 104
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 1643c3a8b..1643c3a8b 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc
index 067cc335f..067cc335f 100644
--- a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
index d28c4631c..d28c4631c 100644
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index bcfc3435f..a2216160d 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_MoveDeletersHouse:: @ 8306670
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_MoveDeletersHouse_MapEvents
 	.4byte LilycoveCity_MoveDeletersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 60
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
new file mode 100644
index 000000000..4e67762bb
--- /dev/null
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -0,0 +1,63 @@
+LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD
+	.byte 0
+
+LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
+	lockall
+	applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO
+	switch RESULT
+	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE
+	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4
+	special SelectMonForNPCTrade
+	waitstate
+	compare VAR_SPECIAL_4, 255
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
+	special IsSelectedMonEgg
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71
+	special ScrSpecial_CountPokemonMoves
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
+	fadescreen 1
+	special SelectMove
+	fadescreen 0
+	compare VAR_SPECIAL_5, 4
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
+	special ScrSpecial_GetPokemonNicknameAndMoveName
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO
+	switch RESULT
+	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53
+	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
+	special DeleteMonMove
+	playfanfare MUS_ME_WASURE
+	waitfanfare
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
+	special ScrSpecial_GetPokemonNicknameAndMoveName
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B71:: @ 8159B71
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, 4
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, 4
+	releaseall
+	end
diff --git a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc
index 1e2181aca..1e2181aca 100644
--- a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
index 2505adbc3..2505adbc3 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
index a1eb040ae..c94501f23 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_PokemonCenter_1F:: @ 83065C8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte LilycoveCity_PokemonCenter_1F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index cff88caf0..cff88caf0 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc
index c0cbb7436..c0cbb7436 100644
--- a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
index b8fd09d02..b8fd09d02 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
index 341ce8590..78816dbe9 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_PokemonCenter_2F:: @ 83065E4
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte LilycoveCity_PokemonCenter_2F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index e4554e49c..e4554e49c 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
index 4f1d4ff4d..4f1d4ff4d 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
index 4e75b2193..4445ed0df 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_PokemonTrainerFanClub:: @ 830661C
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
+	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapEvents
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 107
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index bab091a0e..bab091a0e 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
diff --git a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc
index fbfbf4353..fbfbf4353 100644
--- a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc
diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc
index 4a0127506..4a0127506 100644
--- a/data/maps/events/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/events.inc
diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
index 43137d33b..fb20ddc79 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_UnusedMart:: @ 8306600
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte LilycoveCity_UnusedMart_MapEvents
 	.4byte LilycoveCity_UnusedMart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc
index 2e7ff450f..2e7ff450f 100644
--- a/data/scripts/maps/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/scripts.inc
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc
index 9bcf27a90..9bcf27a90 100644
--- a/data/maps/events/LinkContestRoom1.inc
+++ b/data/maps/LinkContestRoom1/events.inc
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
index 9e265d9c9..7aea3de5f 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom1:: @ 83079E8
-	.4byte LinkContestRoom1_MapAttributes
+	.4byte LinkContestRoom1_Layout
 	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom1_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 226
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc
index 2709f558c..2709f558c 100644
--- a/data/scripts/maps/LinkContestRoom1.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc
index 562a96523..562a96523 100644
--- a/data/maps/events/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/events.inc
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
index f492eab03..a3d60c4f8 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom2:: @ 8307AAC
-	.4byte LinkContestRoom2_MapAttributes
+	.4byte LinkContestRoom2_Layout
 	.4byte LinkContestRoom2_MapEvents
 	.4byte LinkContestRoom2_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 233
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc
index f61e3fae6..f61e3fae6 100644
--- a/data/scripts/maps/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/scripts.inc
diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc
index 8c93f28c9..8c93f28c9 100644
--- a/data/maps/events/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/events.inc
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
index 90de4491d..4ee1f0e7d 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom3:: @ 8307AC8
-	.4byte LinkContestRoom3_MapAttributes
+	.4byte LinkContestRoom3_Layout
 	.4byte LinkContestRoom3_MapEvents
 	.4byte LinkContestRoom3_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 234
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc
index 5a34f848a..5a34f848a 100644
--- a/data/scripts/maps/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/scripts.inc
diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc
index a5e455811..a5e455811 100644
--- a/data/maps/events/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/events.inc
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
index 774e55abc..56ee5906c 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom4:: @ 8307AE4
-	.4byte LinkContestRoom4_MapAttributes
+	.4byte LinkContestRoom4_Layout
 	.4byte LinkContestRoom4_MapEvents
 	.4byte LinkContestRoom4_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 235
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc
index bf6539bdd..bf6539bdd 100644
--- a/data/scripts/maps/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/scripts.inc
diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc
index f0f8fa508..f0f8fa508 100644
--- a/data/maps/events/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/events.inc
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
index 22b90f6c9..fb2a66640 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom5:: @ 8307B00
-	.4byte LinkContestRoom5_MapAttributes
+	.4byte LinkContestRoom5_Layout
 	.4byte LinkContestRoom5_MapEvents
 	.4byte LinkContestRoom5_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 236
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc
index d3cd5d64b..d3cd5d64b 100644
--- a/data/scripts/maps/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/scripts.inc
diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc
index a8fd4962f..a8fd4962f 100644
--- a/data/maps/events/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/events.inc
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
index 773912080..db9343180 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom6:: @ 8307B1C
-	.4byte LinkContestRoom6_MapAttributes
+	.4byte LinkContestRoom6_Layout
 	.4byte LinkContestRoom6_MapEvents
 	.4byte LinkContestRoom6_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 237
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc
index 26296ece6..26296ece6 100644
--- a/data/scripts/maps/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/scripts.inc
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc
index b50dbc7e1..b50dbc7e1 100644
--- a/data/maps/events/LittlerootTown.inc
+++ b/data/maps/LittlerootTown/events.inc
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
index 5493f6005..88f6763e3 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown:: @ 8305544
-	.4byte LittlerootTown_MapAttributes
+	.4byte LittlerootTown_Layout
 	.4byte LittlerootTown_MapEvents
 	.4byte LittlerootTown_MapScripts
 	.4byte LittlerootTown_MapConnections
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 10
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
new file mode 100644
index 000000000..e98f73393
--- /dev/null
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -0,0 +1,877 @@
+LittlerootTown_MapScripts:: @ 814D509
+	map_script 3, LittlerootTown_MapScript1_14D514
+	map_script 2, LittlerootTown_MapScript2_14D5D5
+	.byte 0
+
+LittlerootTown_MapScript1_14D514:: @ 814D514
+	setflag FLAG_VISITED_LITTLEROOT_TOWN
+	compare VAR_LITTLEROOT_INTRO_STATE, 2
+	call_if_eq LittlerootTown_EventScript_14D57B
+	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583
+	compare VAR_LITTLEROOT_STATE, 3
+	call_if_eq LittlerootTown_EventScript_14D5A6
+	compare VAR_LITTLEROOT_HOUSES_STATE, 4
+	call_if_eq LittlerootTown_EventScript_14D570
+	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
+	call_if_eq LittlerootTown_EventScript_14D570
+	compare VAR_OLDALE_STATE, 1
+	call_if_eq LittlerootTown_EventScript_14D567
+	compare VAR_LITTLEROOT_RIVAL_STATE, 3
+	call_if_eq LittlerootTown_EventScript_14D563
+	end
+
+LittlerootTown_EventScript_14D563:: @ 814D563
+	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
+	return
+
+LittlerootTown_EventScript_14D567:: @ 814D567
+	setvar VAR_OLDALE_STATE, 2
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	return
+
+LittlerootTown_EventScript_14D570:: @ 814D570
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 5
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5
+	return
+
+LittlerootTown_EventScript_14D57B:: @ 814D57B
+	setobjectxyperm 4, 14, 8
+	return
+
+LittlerootTown_EventScript_14D583:: @ 814D583
+	compare VAR_LITTLEROOT_STATE, 0
+	goto_if_eq LittlerootTown_EventScript_14D59A
+	setobjectxyperm 1, 10, 1
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_EventScript_14D59A:: @ 814D59A
+	setobjectxyperm 1, 7, 2
+	setobjectmovementtype 1, 8
+	return
+
+LittlerootTown_EventScript_14D5A6:: @ 814D5A6
+	clearflag FLAG_HIDE_MOM_LITTLEROOT
+	setobjectmovementtype 4, 8
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D5C5
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D5CD
+	return
+
+LittlerootTown_EventScript_14D5C5:: @ 814D5C5
+	setobjectxyperm 4, 5, 9
+	return
+
+LittlerootTown_EventScript_14D5CD:: @ 814D5CD
+	setobjectxyperm 4, 14, 9
+	return
+
+LittlerootTown_MapScript2_14D5D5:: @ 814D5D5
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5
+	.2byte 0
+
+LittlerootTown_EventScript_14D5EF:: @ 814D5EF
+	lockall
+	setvar VAR_SPECIAL_4, 5
+	setvar VAR_SPECIAL_5, 8
+	call LittlerootTown_EventScript_14D62B
+	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
+	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D60D:: @ 814D60D
+	lockall
+	setvar VAR_SPECIAL_4, 14
+	setvar VAR_SPECIAL_5, 8
+	call LittlerootTown_EventScript_14D62B
+	setflag FLAG_HIDE_MOVING_TRUCK_MAY
+	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D62B:: @ 814D62B
+	delay 15
+	playse SE_DANSA
+	applymovement 255, LittlerootTown_Movement_14D6C0
+	waitmovement 0
+	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	addobject 4
+	applymovement 4, LittlerootTown_Movement_14D6AC
+	waitmovement 0
+	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	delay 10
+	applymovement 4, LittlerootTown_Movement_14D6AE
+	waitmovement 0
+	msgbox LittlerootTown_Text_16A7C9, 4
+	closemessage
+	applymovement 4, LittlerootTown_Movement_14D6B1
+	applymovement 255, LittlerootTown_Movement_14D6B8
+	waitmovement 0
+	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14D6B5
+	applymovement 255, LittlerootTown_Movement_14D6BD
+	waitmovement 0
+	setflag FLAG_HIDE_MOM_LITTLEROOT
+	setvar VAR_LITTLEROOT_INTRO_STATE, 3
+	hideobjectat 255, MAP_PETALBURG_CITY
+	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
+	clearflag FLAG_SPECIAL_FLAG_0
+	return
+
+LittlerootTown_Movement_14D6AC:: @ 814D6AC
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14D6AE:: @ 814D6AE
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+LittlerootTown_Movement_14D6B1:: @ 814D6B1
+	delay_16
+	delay_8
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14D6B5:: @ 814D6B5
+	walk_up
+	set_invisible
+	end_movement
+
+LittlerootTown_Movement_14D6B8:: @ 814D6B8
+	delay_16
+	delay_8
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14D6BD:: @ 814D6BD
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14D6C0:: @ 814D6C0
+	jump_right
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+LittlerootTown_EventScript_14D6C5:: @ 814D6C5
+	lockall
+	setvar VAR_LITTLEROOT_INTRO_STATE, 8
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D6CD:: @ 814D6CD
+	msgbox LittlerootTown_Text_16AC00, 2
+	end
+
+LittlerootTown_EventScript_14D6D6:: @ 814D6D6
+	msgbox LittlerootTown_Text_16AC56, 2
+	end
+
+LittlerootTown_EventScript_14D6DF:: @ 814D6DF
+	lock
+	faceplayer
+	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F
+	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722
+	compare VAR_LITTLEROOT_STATE, 0
+	goto_if_ne LittlerootTown_EventScript_14D708
+	msgbox LittlerootTown_Text_16ACEB, 4
+	release
+	end
+
+LittlerootTown_EventScript_14D708:: @ 814D708
+	msgbox LittlerootTown_Text_16AD82, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_1A083D
+	waitmovement 0
+	setvar VAR_LITTLEROOT_STATE, 2
+	release
+	end
+
+LittlerootTown_EventScript_14D722:: @ 814D722
+	special GetPlayerBigGuyGirlString
+	msgbox LittlerootTown_Text_16ADF2, 4
+	release
+	end
+
+LittlerootTown_EventScript_14D72F:: @ 814D72F
+	msgbox LittlerootTown_Text_16AE25, 4
+	release
+	end
+
+LittlerootTown_EventScript_14D739:: @ 814D739
+	lockall
+	applymovement 1, LittlerootTown_Movement_14D779
+	waitmovement 0
+	call LittlerootTown_EventScript_14D755
+	applymovement 1, LittlerootTown_Movement_14D789
+	waitmovement 0
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D755:: @ 814D755
+	msgbox LittlerootTown_Text_16ACEB, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_14D787
+	applymovement 255, LittlerootTown_Movement_14D793
+	waitmovement 0
+	msgbox LittlerootTown_Text_16AD3C, 4
+	closemessage
+	return
+
+LittlerootTown_Movement_14D779:: @ 814D779
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	face_down
+	end_movement
+
+LittlerootTown_Movement_14D787:: @ 814D787
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14D789:: @ 814D789
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+LittlerootTown_Movement_14D793:: @ 814D793
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	end_movement
+
+LittlerootTown_EventScript_14D797:: @ 814D797
+	lockall
+	applymovement 1, LittlerootTown_Movement_14D7B3
+	waitmovement 0
+	call LittlerootTown_EventScript_14D755
+	applymovement 1, LittlerootTown_Movement_14D7C0
+	waitmovement 0
+	releaseall
+	end
+
+LittlerootTown_Movement_14D7B3:: @ 814D7B3
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	face_down
+	end_movement
+
+LittlerootTown_Movement_14D7C0:: @ 814D7C0
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+LittlerootTown_EventScript_14D7C7:: @ 814D7C7
+	lockall
+	applymovement 1, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	msgbox LittlerootTown_Text_16AD82, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_1A083D
+	waitmovement 0
+	setvar VAR_LITTLEROOT_STATE, 2
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D7F6:: @ 814D7F6
+	msgbox LittlerootTown_Text_16AE50, 3
+	end
+
+LittlerootTown_EventScript_14D7FF:: @ 814D7FF
+	msgbox LittlerootTown_Text_16AE87, 3
+	end
+
+LittlerootTown_EventScript_14D808:: @ 814D808
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D822
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D82B
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D822:: @ 814D822
+	msgbox LittlerootTown_Text_16AEA1, 4
+	return
+
+LittlerootTown_EventScript_14D82B:: @ 814D82B
+	msgbox LittlerootTown_Text_16AEAC, 4
+	return
+
+LittlerootTown_EventScript_14D834:: @ 814D834
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D84E
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D857
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D84E:: @ 814D84E
+	msgbox LittlerootTown_Text_16AEAC, 4
+	return
+
+LittlerootTown_EventScript_14D857:: @ 814D857
+	msgbox LittlerootTown_Text_16AEA1, 4
+	return
+
+LittlerootTown_EventScript_14D860:: @ 814D860
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	setobjectxy 4, 10, 9
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D873:: @ 814D873
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	setobjectxy 4, 11, 9
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D886:: @ 814D886
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D892:: @ 814D892
+	lockall
+	setvar VAR_SPECIAL_8, 3
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D89E:: @ 814D89E
+	lockall
+	setvar VAR_SPECIAL_8, 4
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D8AA:: @ 814D8AA
+	lockall
+	setvar VAR_SPECIAL_8, 5
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D8B6:: @ 814D8B6
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D93C
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D947
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D926
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D931
+	msgbox LittlerootTown_Text_16A8EE, 4
+	closemessage
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D952
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D995
+	call LittlerootTown_EventScript_14DD38
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14DAAA
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14DAED
+	goto LittlerootTown_EventScript_14DD2B
+	end
+
+LittlerootTown_EventScript_14D926:: @ 814D926
+	setvar VAR_SPECIAL_9, 5
+	setvar VAR_SPECIAL_A, 8
+	return
+
+LittlerootTown_EventScript_14D931:: @ 814D931
+	setvar VAR_SPECIAL_9, 14
+	setvar VAR_SPECIAL_A, 8
+	return
+
+LittlerootTown_EventScript_14D93C:: @ 814D93C
+	applymovement 4, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14D947:: @ 814D947
+	applymovement 4, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14D952:: @ 814D952
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14D9D8
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14D9ED
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DA02
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DA17
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DA2C
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DA41
+	return
+
+LittlerootTown_EventScript_14D995:: @ 814D995
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14D9D8
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14D9ED
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DA56
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DA6B
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DA80
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DA95
+	return
+
+LittlerootTown_EventScript_14D9D8:: @ 814D9D8
+	applymovement 255, LittlerootTown_Movement_1A0845
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC76
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14D9ED:: @ 814D9ED
+	applymovement 255, LittlerootTown_Movement_1A0845
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC7D
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA02:: @ 814DA02
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC84
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA17:: @ 814DA17
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC89
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA2C:: @ 814DA2C
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC8F
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA41:: @ 814DA41
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC92
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA56:: @ 814DA56
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC96
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA6B:: @ 814DA6B
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC9A
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA80:: @ 814DA80
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC9D
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA95:: @ 814DA95
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DCA3
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DAAA:: @ 814DAAA
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14DB30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14DB3B
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DB46
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DB6C
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DB92
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DBB8
+	return
+
+LittlerootTown_EventScript_14DAED:: @ 814DAED
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14DB30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14DB3B
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DBDE
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DC04
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DC2A
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DC50
+	return
+
+LittlerootTown_EventScript_14DB30:: @ 814DB30
+	applymovement 4, LittlerootTown_Movement_14DCA8
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DB3B:: @ 814DB3B
+	applymovement 4, LittlerootTown_Movement_14DCAE
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DB46:: @ 814DB46
+	applymovement 4, LittlerootTown_Movement_14DCB4
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DB6C:: @ 814DB6C
+	applymovement 4, LittlerootTown_Movement_14DCBA
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DB92:: @ 814DB92
+	applymovement 4, LittlerootTown_Movement_14DCC1
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DBB8:: @ 814DBB8
+	applymovement 4, LittlerootTown_Movement_14DCC5
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DBDE:: @ 814DBDE
+	applymovement 4, LittlerootTown_Movement_14DCCA
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DC04:: @ 814DC04
+	applymovement 4, LittlerootTown_Movement_14DCCF
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DC2A:: @ 814DC2A
+	applymovement 4, LittlerootTown_Movement_14DCD3
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DC50:: @ 814DC50
+	applymovement 4, LittlerootTown_Movement_14DCDA
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_Movement_14DC76:: @ 814DC76
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14DC7D:: @ 814DC7D
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14DC84:: @ 814DC84
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC89:: @ 814DC89
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC8F:: @ 814DC8F
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC92:: @ 814DC92
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC96:: @ 814DC96
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DC9A:: @ 814DC9A
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DC9D:: @ 814DC9D
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DCA3:: @ 814DCA3
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DCA8:: @ 814DCA8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14DCAE:: @ 814DCAE
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14DCB4:: @ 814DCB4
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCBA:: @ 814DCBA
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCC1:: @ 814DCC1
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCC5:: @ 814DCC5
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCCA:: @ 814DCCA
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCCF:: @ 814DCCF
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCD3:: @ 814DCD3
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCDA:: @ 814DCDA
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCE0:: @ 814DCE0
+	walk_up
+	end_movement
+
+LittlerootTown_EventScript_14DCE2:: @ 814DCE2
+	lock
+	faceplayer
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D926
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D931
+	call LittlerootTown_EventScript_14DD38
+	applymovement 4, LittlerootTown_Movement_1A0841
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	goto LittlerootTown_EventScript_14DD2B
+	end
+
+LittlerootTown_EventScript_14DD2B:: @ 814DD2B
+	removeobject 4
+	setflag FLAG_SYS_B_DASH
+	setvar VAR_LITTLEROOT_STATE, 4
+	release
+	end
+
+LittlerootTown_EventScript_14DD38:: @ 814DD38
+	msgbox LittlerootTown_Text_16A8FD, 4
+	playfanfare MUS_FANFA4
+	message LittlerootTown_Text_16AA32
+	waitfanfare
+	waitmessage
+	setflag FLAG_RECEIVED_RUNNING_SHOES
+	msgbox LittlerootTown_Text_16AA5C, 4
+	msgbox LittlerootTown_Text_16AB10, 4
+	closemessage
+	delay 30
+	return
diff --git a/data/text/maps/LittlerootTown.inc b/data/maps/LittlerootTown/text.inc
index 1e23d584f..1e23d584f 100644
--- a/data/text/maps/LittlerootTown.inc
+++ b/data/maps/LittlerootTown/text.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
index 4ac7d4b3c..4ac7d4b3c 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index 122fdc82a..eebc7b989 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_BrendansHouse_1F:: @ 8305A30
-	.4byte LittlerootTown_BrendansHouse_1F_MapAttributes
+	.4byte LittlerootTown_BrendansHouse_1F_Layout
 	.4byte LittlerootTown_BrendansHouse_1F_MapEvents
 	.4byte LittlerootTown_BrendansHouse_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 54
 	.byte 0
 	.byte 0
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 340f50894..340f50894 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
diff --git a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc
index 888fc8973..888fc8973 100644
--- a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
index 2e4c4b6ae..2e4c4b6ae 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
index 449a883cb..660c1e08e 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_BrendansHouse_2F:: @ 8305A4C
-	.4byte LittlerootTown_BrendansHouse_2F_MapAttributes
+	.4byte LittlerootTown_BrendansHouse_2F_Layout
 	.4byte LittlerootTown_BrendansHouse_2F_MapEvents
 	.4byte LittlerootTown_BrendansHouse_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 55
 	.byte 0
 	.byte 0
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index ed6818fa0..ed6818fa0 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
diff --git a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc
index 06206caaa..06206caaa 100644
--- a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
index 353dc00a8..353dc00a8 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
index 6d6220086..329380b39 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_MaysHouse_1F:: @ 8305A68
-	.4byte LittlerootTown_MaysHouse_1F_MapAttributes
+	.4byte LittlerootTown_MaysHouse_1F_Layout
 	.4byte LittlerootTown_MaysHouse_1F_MapEvents
 	.4byte LittlerootTown_MaysHouse_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 56
 	.byte 0
 	.byte 0
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index ad7257e0b..ad7257e0b 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
diff --git a/data/text/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/text.inc
index aef905854..aef905854 100644
--- a/data/text/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/text.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
index 98a144305..98a144305 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
index 44859dd4c..cfb150c46 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_MaysHouse_2F:: @ 8305A84
-	.4byte LittlerootTown_MaysHouse_2F_MapAttributes
+	.4byte LittlerootTown_MaysHouse_2F_Layout
 	.4byte LittlerootTown_MaysHouse_2F_MapEvents
 	.4byte LittlerootTown_MaysHouse_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 57
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
new file mode 100644
index 000000000..bcc4ba46b
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -0,0 +1,219 @@
+LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
+	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_152A5B
+	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_152A86
+	.byte 0
+
+LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
+	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A
+	compare VAR_LITTLEROOT_INTRO_STATE, 4
+	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950
+	call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D
+	setvar VAR_0x4089, 0
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A
+	setobjectxyperm 1, 7, 2
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86
+	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90
+	.2byte 0
+
+LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
+	checkplayergender
+	compare RESULT, 1
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
+LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
+	lockall
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4
+	compare RESULT, 1
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A
+	playse SE_KAIDAN
+	removeobject LAST_TALKED
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
+	setvar VAR_LITTLEROOT_STATE, 1
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4
+	playbgm MUS_GIRL_SUP, TRUE
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4
+	closemessage
+	compare FACING, 4
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29
+	compare FACING, 2
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34
+	compare FACING, 3
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4
+	playbgm MUS_BOY_SUP, TRUE
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4
+	closemessage
+	compare FACING, 4
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
+	compare FACING, 2
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
+	compare FACING, 3
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	waitmovement 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB
+	compare RESULT, 1
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED
+	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BFF:: @ 8152BFF
+	msgbox LittlerootTown_BrendansHouse_2F_Text_173883, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
+	end_movement
+
+LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	delay_8
+	end_movement
+
+LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	delay_8
+	end_movement
+
+LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	delay_8
+	end_movement
+
+gUnknown_08152C39:: @ 8152C39
+
+LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52
+	compare RESULT, 1
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
+	setvar VAR_SPECIAL_4, 2
+	special DoPCTurnOnEffect
+	playse SE_PC_ON
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
+	special BedroomPC
+	waitstate
+	releaseall
+	end
+
+gMayHouse_TurnPCOff:: @ 8152C75
+	setvar VAR_SPECIAL_4, 2
+	playse SE_PC_OFF
+	special DoPCTurnOffEffect
+	releaseall
+	end
diff --git a/data/text/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/text.inc
index 313095c8d..313095c8d 100644
--- a/data/text/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/text.inc
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
index bca8009b5..bca8009b5 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
index 31fb03c64..1961431b9 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_ProfessorBirchsLab:: @ 8305AA0
-	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
+	.4byte LittlerootTown_ProfessorBirchsLab_Layout
 	.4byte LittlerootTown_ProfessorBirchsLab_MapEvents
 	.4byte LittlerootTown_ProfessorBirchsLab_MapScripts
 	.4byte 0x0
-	.2byte BGM_ODAMAKI
+	.2byte MUS_ODAMAKI
 	.2byte 58
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
new file mode 100644
index 000000000..74d5f9193
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -0,0 +1,214 @@
+LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82
+	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92
+	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D
+	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC
+	.byte 0
+
+LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1A014E
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4
+	end
+
+LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7
+	.2byte 0
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7
+	turnobject 255, 2
+	end
+
+LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE
+	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A
+	.2byte 0
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
+	lockall
+	bufferleadmonspeciesname 0
+	message LittlerootTown_ProfessorBirchsLab_Text_173D94
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA
+	compare RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA
+	setvar VAR_SPECIAL_4, 0
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
+	compare RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
+	clearflag FLAG_HIDE_BOY_ROUTE101
+	setvar VAR_BIRCH_LAB_STATE, 3
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
+	compare RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A
+	lockall
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B
+	waitmovement 0
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA
+	end
+
+LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
+	lock
+	faceplayer
+	compare VAR_BIRCH_LAB_STATE, 3
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90
+	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
+	setflag FLAG_BIRCH_AIDE_MET
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D86:: @ 8152D86
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
+	lock
+	faceplayer
+	goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
+	compare VAR_BIRCH_LAB_STATE, 5
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4
+	call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4
+	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97
+	waitmovement 0
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843
+	waitmovement 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13
+	compare RESULT, 1
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40
+	setvar VAR_BIRCH_LAB_STATE, 5
+	setflag FLAG_ADVENTURE_STARTED
+	setvar VAR_ROUTE102_ACCESSIBLE, 1
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 4
+	setvar VAR_LITTLEROOT_STATE, 3
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4
+	giveitem_std ITEM_POKE_BALL, 5
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4
+	setvar RESULT, 0
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4
+	giveitem_std ITEM_POKE_BALL, 5
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4
+	setvar RESULT, 1
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
+	playfanfare MUS_FANFA4
+	message LittlerootTown_ProfessorBirchsLab_Text_17422F
+	waitfanfare
+	waitmessage
+	setflag FLAG_SYS_POKEDEX_GET
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E85:: @ 8152E85
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3
+	lock
+	faceplayer
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE
+	compare RESULT, 1
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EBE:: @ 8152EBE
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EC7:: @ 8152EC7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152ED0:: @ 8152ED0
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, 3
+	end
diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc
index dd470ef08..dd470ef08 100644
--- a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc
index 362d9b719..362d9b719 100644
--- a/data/maps/events/MagmaHideout_1F.inc
+++ b/data/maps/MagmaHideout_1F/events.inc
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index 3876e17ec..c236bdae1 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -1,9 +1,9 @@
 MagmaHideout_1F:: @ 8307588
-	.4byte MagmaHideout_1F_MapAttributes
+	.4byte MagmaHideout_1F_Layout
 	.4byte MagmaHideout_1F_MapEvents
 	.4byte MagmaHideout_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 317
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc
index f5b535f71..f5b535f71 100644
--- a/data/scripts/maps/MagmaHideout_1F.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/MagmaHideout_B1F/events.inc
index 5e4c3a078..5e4c3a078 100644
--- a/data/maps/events/MagmaHideout_B1F.inc
+++ b/data/maps/MagmaHideout_B1F/events.inc
diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc
index 16fe3f2ba..18a1bd49c 100644
--- a/data/maps/MagmaHideout_B1F/header.inc
+++ b/data/maps/MagmaHideout_B1F/header.inc
@@ -1,9 +1,9 @@
 MagmaHideout_B1F:: @ 83075A4
-	.4byte MagmaHideout_B1F_MapAttributes
+	.4byte MagmaHideout_B1F_Layout
 	.4byte MagmaHideout_B1F_MapEvents
 	.4byte MagmaHideout_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 318
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/maps/MagmaHideout_B1F/scripts.inc
index a55d260ab..a55d260ab 100644
--- a/data/scripts/maps/MagmaHideout_B1F.inc
+++ b/data/maps/MagmaHideout_B1F/scripts.inc
diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/MagmaHideout_B2F/events.inc
index 111b97e42..111b97e42 100644
--- a/data/maps/events/MagmaHideout_B2F.inc
+++ b/data/maps/MagmaHideout_B2F/events.inc
diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc
index 3aee695b4..6cb9a6a47 100644
--- a/data/maps/MagmaHideout_B2F/header.inc
+++ b/data/maps/MagmaHideout_B2F/header.inc
@@ -1,9 +1,9 @@
 MagmaHideout_B2F:: @ 83075C0
-	.4byte MagmaHideout_B2F_MapAttributes
+	.4byte MagmaHideout_B2F_Layout
 	.4byte MagmaHideout_B2F_MapEvents
 	.4byte MagmaHideout_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 319
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/MagmaHideout_B2F.inc b/data/maps/MagmaHideout_B2F/scripts.inc
index 222297ef7..222297ef7 100644
--- a/data/scripts/maps/MagmaHideout_B2F.inc
+++ b/data/maps/MagmaHideout_B2F/scripts.inc
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc
index 6b26c7973..6b26c7973 100644
--- a/data/maps/events/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/events.inc
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
index e0e2c4f22..9ea461f4c 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity:: @ 8305480
-	.4byte MauvilleCity_MapAttributes
+	.4byte MauvilleCity_Layout
 	.4byte MauvilleCity_MapEvents
 	.4byte MauvilleCity_MapScripts
 	.4byte MauvilleCity_MapConnections
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 3
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/maps/MauvilleCity/scripts.inc
index bd4f8ab3d..bd4f8ab3d 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/scripts.inc
diff --git a/data/text/maps/MauvilleCity.inc b/data/maps/MauvilleCity/text.inc
index 8080d10d9..8080d10d9 100644
--- a/data/text/maps/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/text.inc
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc
index 83b5f66d8..83b5f66d8 100644
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/events.inc
diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
index c99124794..a1e3e56bc 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_BikeShop:: @ 8306168
-	.4byte MauvilleCity_BikeShop_MapAttributes
+	.4byte MauvilleCity_BikeShop_Layout
 	.4byte MauvilleCity_BikeShop_MapEvents
 	.4byte MauvilleCity_BikeShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 90
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index 08f11d641..08f11d641 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
diff --git a/data/text/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/text.inc
index 3fbdffc09..3fbdffc09 100644
--- a/data/text/maps/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/text.inc
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc
index 7b789a34e..7b789a34e 100644
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/events.inc
diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc
index 653a41544..7e9bb00fa 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_GameCorner:: @ 83061A0
-	.4byte MauvilleCity_GameCorner_MapAttributes
+	.4byte MauvilleCity_GameCorner_Layout
 	.4byte MauvilleCity_GameCorner_MapEvents
 	.4byte MauvilleCity_GameCorner_MapScripts
 	.4byte 0x0
-	.2byte BGM_CASINO
+	.2byte MUS_CASINO
 	.2byte 91
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index b9f8e5ad1..b9f8e5ad1 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
diff --git a/data/text/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/text.inc
index f367c3cf2..f367c3cf2 100644
--- a/data/text/maps/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/text.inc
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc
index cfcbbc4c6..cfcbbc4c6 100644
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/events.inc
diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc
index efbd61fe0..a52423319 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_Gym:: @ 830614C
-	.4byte MauvilleCity_Gym_MapAttributes
+	.4byte MauvilleCity_Gym_Layout
 	.4byte MauvilleCity_Gym_MapEvents
 	.4byte MauvilleCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 89
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index d9b8aced7..d9b8aced7 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
diff --git a/data/text/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/text.inc
index 5ae43f880..5ae43f880 100644
--- a/data/text/maps/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/text.inc
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc
index 07044121d..07044121d 100644
--- a/data/maps/events/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/events.inc
diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index 30c59da1e..0d464b6c0 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_House1:: @ 8306184
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte MauvilleCity_House1_MapEvents
 	.4byte MauvilleCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc
index 4caaef545..4caaef545 100644
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
diff --git a/data/text/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/text.inc
index c5eec210e..c5eec210e 100644
--- a/data/text/maps/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/text.inc
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc
index 58d8d5a24..58d8d5a24 100644
--- a/data/maps/events/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/events.inc
diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc
index 9bd7d9c11..7a8c72f6e 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_House2:: @ 83061BC
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte MauvilleCity_House2_MapEvents
 	.4byte MauvilleCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 59
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc
index f18d278b5..f18d278b5 100644
--- a/data/scripts/maps/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
diff --git a/data/text/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/text.inc
index 50cdf1fa7..50cdf1fa7 100644
--- a/data/text/maps/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/text.inc
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc
index cb8397726..cb8397726 100644
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/events.inc
diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc
index 7712e16df..169089f69 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_Mart:: @ 8306210
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte MauvilleCity_Mart_MapEvents
 	.4byte MauvilleCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index 0dd66eddf..0dd66eddf 100644
--- a/data/scripts/maps/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
diff --git a/data/text/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/text.inc
index 6b8f6c002..6b8f6c002 100644
--- a/data/text/maps/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/text.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
index 30f702a6f..30f702a6f 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
index b6e0a1628..74cc8bfe2 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_PokemonCenter_1F:: @ 83061D8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte MauvilleCity_PokemonCenter_1F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index 85590f9c2..85590f9c2 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc
index c4287cda3..c4287cda3 100644
--- a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
index aef1d63ed..aef1d63ed 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
index 8787c975e..fd7bf6a2d 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_PokemonCenter_2F:: @ 83061F4
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte MauvilleCity_PokemonCenter_2F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index e85e80308..e85e80308 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
diff --git a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/text.inc
index 1e67948a5..1e67948a5 100644
--- a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/text.inc
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc
index 0b85c4e98..0b85c4e98 100644
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/events.inc
diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc
index dcb3fbbde..506463120 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_1F_1R:: @ 8306D70
-	.4byte MeteorFalls_1F_1R_MapAttributes
+	.4byte MeteorFalls_1F_1R_Layout
 	.4byte MeteorFalls_1F_1R_MapEvents
 	.4byte MeteorFalls_1F_1R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 126
 	.byte 63
 	.byte 0
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index ee2c5b1dc..ee2c5b1dc 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
diff --git a/data/text/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/text.inc
index ad19e3e0b..ad19e3e0b 100644
--- a/data/text/maps/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/text.inc
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc
index 5264fcb5e..5264fcb5e 100644
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/events.inc
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
index 0d9d797aa..f46645b7e 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_1F_2R:: @ 8306D8C
-	.4byte MeteorFalls_1F_2R_MapAttributes
+	.4byte MeteorFalls_1F_2R_Layout
 	.4byte MeteorFalls_1F_2R_MapEvents
 	.4byte MeteorFalls_1F_2R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 127
 	.byte 63
 	.byte 0
diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 49d629294..49d629294 100644
--- a/data/scripts/maps/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
diff --git a/data/text/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/text.inc
index 35b60d662..35b60d662 100644
--- a/data/text/maps/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/text.inc
diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc
index 053c932ce..053c932ce 100644
--- a/data/maps/events/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/events.inc
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
index f67ab9ea7..6e34052ce 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_B1F_1R:: @ 8306DA8
-	.4byte MeteorFalls_B1F_1R_MapAttributes
+	.4byte MeteorFalls_B1F_1R_Layout
 	.4byte MeteorFalls_B1F_1R_MapEvents
 	.4byte MeteorFalls_B1F_1R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 128
 	.byte 63
 	.byte 0
diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc
index 57d458b23..57d458b23 100644
--- a/data/scripts/maps/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/scripts.inc
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc
index 964a6c447..964a6c447 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ b/data/maps/MeteorFalls_B1F_2R/events.inc
diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
index 779e6d23a..487cf19e9 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_B1F_2R:: @ 8306DC4
-	.4byte MeteorFalls_B1F_2R_MapAttributes
+	.4byte MeteorFalls_B1F_2R_Layout
 	.4byte MeteorFalls_B1F_2R_MapEvents
 	.4byte MeteorFalls_B1F_2R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 129
 	.byte 63
 	.byte 0
diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc
index 514e60966..514e60966 100644
--- a/data/scripts/maps/MeteorFalls_B1F_2R.inc
+++ b/data/maps/MeteorFalls_B1F_2R/scripts.inc
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc
index 4803f9347..4803f9347 100644
--- a/data/maps/events/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/events.inc
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index 26b3e1db0..93aeb648a 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity:: @ 83054F0
-	.4byte MossdeepCity_MapAttributes
+	.4byte MossdeepCity_Layout
 	.4byte MossdeepCity_MapEvents
 	.4byte MossdeepCity_MapScripts
 	.4byte MossdeepCity_MapConnections
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 7
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc
index 7ec338927..7ec338927 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/scripts.inc
diff --git a/data/text/maps/MossdeepCity.inc b/data/maps/MossdeepCity/text.inc
index 9bdcf3b3c..9bdcf3b3c 100644
--- a/data/text/maps/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/text.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
index 2d10740b1..2d10740b1 100644
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index d96d383ea..dc11469e0 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_GameCorner_1F:: @ 83068F4
-	.4byte MossdeepCity_GameCorner_1F_MapAttributes
+	.4byte MossdeepCity_GameCorner_1F_Layout
 	.4byte MossdeepCity_GameCorner_1F_MapEvents
 	.4byte MossdeepCity_GameCorner_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 306
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index 4d9989d82..4d9989d82 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/text.inc
index 7324999c8..7324999c8 100644
--- a/data/text/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/text.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
index da6316421..da6316421 100644
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 7692281f0..fd8e210cc 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_GameCorner_B1F:: @ 8306910
-	.4byte MossdeepCity_GameCorner_B1F_MapAttributes
+	.4byte MossdeepCity_GameCorner_B1F_Layout
 	.4byte MossdeepCity_GameCorner_B1F_MapEvents
 	.4byte MossdeepCity_GameCorner_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 307
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
index 0af775590..0af775590 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/text.inc
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc
index 7c7a25777..7c7a25777 100644
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ b/data/maps/MossdeepCity_Gym/events.inc
diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc
index b72bdf62e..cabaf610a 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_Gym:: @ 83067C0
-	.4byte MossdeepCity_Gym_MapAttributes
+	.4byte MossdeepCity_Gym_Layout
 	.4byte MossdeepCity_Gym_MapEvents
 	.4byte MossdeepCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 109
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index a17d09e10..a17d09e10 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
diff --git a/data/text/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/text.inc
index 5ff5f6554..5ff5f6554 100644
--- a/data/text/maps/MossdeepCity_Gym.inc
+++ b/data/maps/MossdeepCity_Gym/text.inc
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc
index 2fe9e0373..2fe9e0373 100644
--- a/data/maps/events/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/events.inc
diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 70f681e7a..f6815842d 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House1:: @ 83067DC
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House1_MapEvents
 	.4byte MossdeepCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc
index 97a5fc452..97a5fc452 100644
--- a/data/scripts/maps/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
diff --git a/data/text/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/text.inc
index 0572ba260..0572ba260 100644
--- a/data/text/maps/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/text.inc
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc
index 743350683..743350683 100644
--- a/data/maps/events/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/events.inc
diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc
index 62bd6bdec..36964f8ee 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House2:: @ 83067F8
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte MossdeepCity_House2_MapEvents
 	.4byte MossdeepCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 59
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/scripts.inc
index c8bccdd52..c8bccdd52 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
diff --git a/data/text/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/text.inc
index ae4b11cb6..ae4b11cb6 100644
--- a/data/text/maps/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/text.inc
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc
index f601038e6..f601038e6 100644
--- a/data/maps/events/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/events.inc
diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc
index 54c6641b6..e395c29f6 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House3:: @ 8306868
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House3_MapEvents
 	.4byte MossdeepCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc
index 4c4d6cbdd..4c4d6cbdd 100644
--- a/data/scripts/maps/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
diff --git a/data/text/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/text.inc
index 270457172..270457172 100644
--- a/data/text/maps/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/text.inc
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc
index cfde3a35e..cfde3a35e 100644
--- a/data/maps/events/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/events.inc
diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc
index 1c0e433bb..fe346cb0a 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House4:: @ 83068A0
-	.4byte MossdeepCity_House4_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte MossdeepCity_House4_MapEvents
 	.4byte MossdeepCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 80
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/scripts.inc
index 15ed22c5e..15ed22c5e 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
diff --git a/data/text/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/text.inc
index e612a8018..e612a8018 100644
--- a/data/text/maps/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/text.inc
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc
index 92f4a8cbd..92f4a8cbd 100644
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/events.inc
diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc
index c18fca0e3..6c8b09d32 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_Mart:: @ 830684C
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte MossdeepCity_Mart_MapEvents
 	.4byte MossdeepCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index ce5845c81..ce5845c81 100644
--- a/data/scripts/maps/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
diff --git a/data/text/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/text.inc
index cdce8c48c..cdce8c48c 100644
--- a/data/text/maps/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/text.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
index da310c9f7..da310c9f7 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
index 036604eff..ef51b2588 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_PokemonCenter_1F:: @ 8306814
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte MossdeepCity_PokemonCenter_1F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index a722e666b..a722e666b 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc
index 5f345613e..5f345613e 100644
--- a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
index 4af09479f..4af09479f 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
index cb42c5c80..db24bf9e5 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_PokemonCenter_2F:: @ 8306830
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte MossdeepCity_PokemonCenter_2F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index a88147c08..a88147c08 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/text.inc
index 66bba2421..66bba2421 100644
--- a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/text.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
index 85e716a93..85e716a93 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
index 65ba897fb..bc2152a58 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_SpaceCenter_1F:: @ 83068BC
-	.4byte MossdeepCity_SpaceCenter_1F_MapAttributes
+	.4byte MossdeepCity_SpaceCenter_1F_Layout
 	.4byte MossdeepCity_SpaceCenter_1F_MapEvents
 	.4byte MossdeepCity_SpaceCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 276
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 83b859c26..83b859c26 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc
index a94d343bc..a94d343bc 100644
--- a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
index faf5d89fa..faf5d89fa 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index 2195ee8e2..46c44758d 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_SpaceCenter_2F:: @ 83068D8
-	.4byte MossdeepCity_SpaceCenter_2F_MapAttributes
+	.4byte MossdeepCity_SpaceCenter_2F_Layout
 	.4byte MossdeepCity_SpaceCenter_2F_MapEvents
 	.4byte MossdeepCity_SpaceCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 277
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 97467f4e5..97467f4e5 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc
index 0c8159423..0c8159423 100644
--- a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
index 7a8fee393..7a8fee393 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ b/data/maps/MossdeepCity_StevensHouse/events.inc
diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc
index 761ea9b73..abbe4b98b 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_StevensHouse:: @ 8306884
-	.4byte MossdeepCity_StevensHouse_MapAttributes
+	.4byte MossdeepCity_StevensHouse_Layout
 	.4byte MossdeepCity_StevensHouse_MapEvents
 	.4byte MossdeepCity_StevensHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 328
 	.byte 13
 	.byte 0
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
new file mode 100644
index 000000000..eb719a33a
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -0,0 +1,128 @@
+MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
+	map_script 1, MossdeepCity_StevensHouse_MapScript1_15A9D5
+	map_script 3, MossdeepCity_StevensHouse_MapScript1_15A9E9
+	map_script 2, MossdeepCity_StevensHouse_MapScript2_15AA01
+	.byte 0
+
+MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
+	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF
+	end
+
+MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF
+	setmetatile 6, 4, 753, 1
+	return
+
+MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9
+	compare VAR_STEVENS_HOUSE_STATE, 1
+	call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5
+	end
+
+MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5
+	setobjectxyperm 1, 6, 5
+	setobjectmovementtype 1, 7
+	return
+
+MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01
+	map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B
+	.2byte 0
+
+MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
+	lockall
+	applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833
+	waitmovement 0
+	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835
+	waitmovement 0
+	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E
+	waitmovement 0
+	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
+	giveitem_std ITEM_HM08_DIVE
+	setflag FLAG_RECEIVED_HM08
+	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
+	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
+	closemessage
+	delay 20
+	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76
+	waitmovement 0
+	setvar VAR_STEVENS_HOUSE_STATE, 1
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
+	lockall
+	msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC
+	copyvar VAR_SPECIAL_4, RESULT
+	removeobject 2
+	playfanfare MUS_FANFA4
+	message MossdeepCity_StevensHouse_Text_18DD61
+	waitfanfare
+	waitmessage
+	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	bufferspeciesname 1, SPECIES_BELDUM
+	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_RECEIVED_BELDUM
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AADC:: @ 815AADC
+	msgbox MossdeepCity_StevensHouse_Text_18DD77, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AAE6:: @ 815AAE6
+	msgbox MossdeepCity_StevensHouse_Text_18DD9E, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AAF0:: @ 815AAF0
+	msgbox MossdeepCity_StevensHouse_Text_18E0A3, 3
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
+	msgbox MossdeepCity_StevensHouse_Text_18DC25, 2
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
+	lockall
+	goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16
+	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
+	msgbox MossdeepCity_StevensHouse_Text_18DDC2, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
+	giveitem_std ITEM_HM08_DIVE, 1, 1
+	setflag FLAG_RECEIVED_HM08
+	end
diff --git a/data/text/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/text.inc
index 6f5b9b9b8..6f5b9b9b8 100644
--- a/data/text/maps/MossdeepCity_StevensHouse.inc
+++ b/data/maps/MossdeepCity_StevensHouse/text.inc
diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc
index f011502f2..f011502f2 100644
--- a/data/maps/events/MtChimney.inc
+++ b/data/maps/MtChimney/events.inc
diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc
index cdc29ce7f..690312635 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -1,9 +1,9 @@
 MtChimney:: @ 8306EC0
-	.4byte MtChimney_MapAttributes
+	.4byte MtChimney_Layout
 	.4byte MtChimney_MapEvents
 	.4byte MtChimney_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 137
 	.byte 56
 	.byte 0
diff --git a/data/scripts/maps/MtChimney.inc b/data/maps/MtChimney/scripts.inc
index f13850570..f13850570 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/maps/MtChimney/scripts.inc
diff --git a/data/text/maps/MtChimney.inc b/data/maps/MtChimney/text.inc
index 8641bde00..8641bde00 100644
--- a/data/text/maps/MtChimney.inc
+++ b/data/maps/MtChimney/text.inc
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc
index e5d69ee75..e5d69ee75 100644
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/events.inc
diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index f5207578b..9584ed7a2 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -1,9 +1,9 @@
 MtChimney_CableCarStation:: @ 8306CAC
-	.4byte MtChimney_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte MtChimney_CableCarStation_MapEvents
 	.4byte MtChimney_CableCarStation_MapScripts
 	.4byte 0x0
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 119
 	.byte 56
 	.byte 0
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index 7161e8800..7161e8800 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
diff --git a/data/text/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/text.inc
index 03e2f7a2a..03e2f7a2a 100644
--- a/data/text/maps/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/text.inc
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc
index f547a9a98..f547a9a98 100644
--- a/data/maps/events/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/events.inc
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
index cfdff9591..a75471d53 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_1F:: @ 8306F14
-	.4byte MtPyre_1F_MapAttributes
+	.4byte MtPyre_1F_Layout
 	.4byte MtPyre_1F_MapEvents
 	.4byte MtPyre_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 138
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc
index f34c31da0..f34c31da0 100644
--- a/data/scripts/maps/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
diff --git a/data/text/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/text.inc
index 84e1cef07..84e1cef07 100644
--- a/data/text/maps/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/text.inc
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc
index 9f8041366..9f8041366 100644
--- a/data/maps/events/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/events.inc
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 914fdabd4..081adb3e9 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_2F:: @ 8306F30
-	.4byte MtPyre_2F_MapAttributes
+	.4byte MtPyre_2F_Layout
 	.4byte MtPyre_2F_MapEvents
 	.4byte MtPyre_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 139
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/scripts.inc
index 1d2368597..1d2368597 100644
--- a/data/scripts/maps/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
diff --git a/data/text/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/text.inc
index 28c57d0ba..28c57d0ba 100644
--- a/data/text/maps/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/text.inc
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc
index fbaf6fa4b..fbaf6fa4b 100644
--- a/data/maps/events/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/events.inc
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index b4a59adbd..253facf61 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_3F:: @ 8306F4C
-	.4byte MtPyre_3F_MapAttributes
+	.4byte MtPyre_3F_Layout
 	.4byte MtPyre_3F_MapEvents
 	.4byte MtPyre_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 140
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc
index ea8bda7b5..ea8bda7b5 100644
--- a/data/scripts/maps/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
diff --git a/data/text/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/text.inc
index c714c97a0..c714c97a0 100644
--- a/data/text/maps/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/text.inc
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc
index 9de527f2d..9de527f2d 100644
--- a/data/maps/events/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/events.inc
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index 8dcbd4e64..720ff831e 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_4F:: @ 8306F68
-	.4byte MtPyre_4F_MapAttributes
+	.4byte MtPyre_4F_Layout
 	.4byte MtPyre_4F_MapEvents
 	.4byte MtPyre_4F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 141
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc
index e1ebac7c1..e1ebac7c1 100644
--- a/data/scripts/maps/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
diff --git a/data/text/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/text.inc
index 275b6f5ac..275b6f5ac 100644
--- a/data/text/maps/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/text.inc
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc
index cbf1b64b4..cbf1b64b4 100644
--- a/data/maps/events/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/events.inc
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index 0eb7f7bba..dc8d93e29 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_5F:: @ 8306F84
-	.4byte MtPyre_5F_MapAttributes
+	.4byte MtPyre_5F_Layout
 	.4byte MtPyre_5F_MapEvents
 	.4byte MtPyre_5F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 142
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc
index 9adb249f0..9adb249f0 100644
--- a/data/scripts/maps/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
diff --git a/data/text/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/text.inc
index c70211067..c70211067 100644
--- a/data/text/maps/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/text.inc
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc
index d65a3a8c6..d65a3a8c6 100644
--- a/data/maps/events/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/events.inc
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index 3cab722cd..986c3b538 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_6F:: @ 8306FA0
-	.4byte MtPyre_6F_MapAttributes
+	.4byte MtPyre_6F_Layout
 	.4byte MtPyre_6F_MapEvents
 	.4byte MtPyre_6F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 143
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc
index ae09300a3..ae09300a3 100644
--- a/data/scripts/maps/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
diff --git a/data/text/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/text.inc
index 711c87570..711c87570 100644
--- a/data/text/maps/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/text.inc
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc
index 48593481e..48593481e 100644
--- a/data/maps/events/MtPyre_Exterior.inc
+++ b/data/maps/MtPyre_Exterior/events.inc
diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
index 543e090f0..0c115cd95 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -1,9 +1,9 @@
 MtPyre_Exterior:: @ 8306FBC
-	.4byte MtPyre_Exterior_MapAttributes
+	.4byte MtPyre_Exterior_Layout
 	.4byte MtPyre_Exterior_MapEvents
 	.4byte MtPyre_Exterior_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHUPI
+	.2byte MUS_MACHUPI
 	.2byte 303
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc
index f8b4141d7..f8b4141d7 100644
--- a/data/scripts/maps/MtPyre_Exterior.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc
index 3ddc6f36b..3ddc6f36b 100644
--- a/data/maps/events/MtPyre_Summit.inc
+++ b/data/maps/MtPyre_Summit/events.inc
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
index e07d849a6..fc8a0a82e 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -1,9 +1,9 @@
 MtPyre_Summit:: @ 8306FD8
-	.4byte MtPyre_Summit_MapAttributes
+	.4byte MtPyre_Summit_Layout
 	.4byte MtPyre_Summit_MapEvents
 	.4byte MtPyre_Summit_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHUPI
+	.2byte MUS_MACHUPI
 	.2byte 304
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/scripts.inc
index 36b72ad12..36b72ad12 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc
index 8967a1df0..8967a1df0 100644
--- a/data/maps/events/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/events.inc
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
index 28ac26ccf..7ca1c1b96 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -1,9 +1,9 @@
 NewMauville_Entrance:: @ 8307320
-	.4byte NewMauville_Entrance_MapAttributes
+	.4byte NewMauville_Entrance_Layout
 	.4byte NewMauville_Entrance_MapEvents
 	.4byte NewMauville_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 185
 	.byte 62
 	.byte 0
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 1c8bdfb3f..1c8bdfb3f 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
diff --git a/data/text/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/text.inc
index 36739ec3e..36739ec3e 100644
--- a/data/text/maps/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/text.inc
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc
index be85150e3..be85150e3 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/events.inc
diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc
index 9771d7ec7..44a3d1895 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -1,9 +1,9 @@
 NewMauville_Inside:: @ 830733C
-	.4byte NewMauville_Inside_MapAttributes
+	.4byte NewMauville_Inside_Layout
 	.4byte NewMauville_Inside_MapEvents
 	.4byte NewMauville_Inside_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 186
 	.byte 62
 	.byte 0
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc
index e045cda5d..e045cda5d 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
diff --git a/data/text/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/text.inc
index c18354294..c18354294 100644
--- a/data/text/maps/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/text.inc
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc
index ac50e1197..ac50e1197 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/OldaleTown/events.inc
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
index 22965da3d..7f89ef759 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -1,9 +1,9 @@
 OldaleTown:: @ 8305560
-	.4byte OldaleTown_MapAttributes
+	.4byte OldaleTown_Layout
 	.4byte OldaleTown_MapEvents
 	.4byte OldaleTown_MapScripts
 	.4byte OldaleTown_MapConnections
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 11
 	.byte 1
 	.byte 0
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
new file mode 100644
index 000000000..dcac39584
--- /dev/null
+++ b/data/maps/OldaleTown/scripts.inc
@@ -0,0 +1,318 @@
+OldaleTown_MapScripts:: @ 814DD62
+	map_script 3, OldaleTown_MapScript1_14DD68
+	.byte 0
+
+OldaleTown_MapScript1_14DD68:: @ 814DD68
+	call OldaleTown_EventScript_1A014E
+	setflag FLAG_VISITED_OLDALE_TOWN
+	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92
+	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E
+	call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C
+	end
+
+OldaleTown_EventScript_14DD8C:: @ 814DD8C
+	setvar VAR_ROUTE102_ACCESSIBLE, 1
+	return
+
+OldaleTown_EventScript_14DD92:: @ 814DD92
+	setobjectxyperm 3, 1, 11
+	setobjectmovementtype 3, 9
+	return
+
+OldaleTown_EventScript_14DD9E:: @ 814DD9E
+	setobjectxyperm 2, 13, 14
+	setobjectmovementtype 2, 8
+	return
+
+OldaleTown_EventScript_14DDAA:: @ 814DDAA
+	msgbox OldaleTown_Text_16B20E, 3
+	end
+
+OldaleTown_EventScript_14DDB3:: @ 814DDB3
+	msgbox OldaleTown_Text_16AEC0, 2
+	end
+
+OldaleTown_EventScript_14DDBC:: @ 814DDBC
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79
+	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79
+	setflag FLAG_TEMP_1
+	playbgm MUS_TSURETEK, FALSE
+	msgbox OldaleTown_Text_16AEF2, 4
+	closemessage
+	switch FACING
+	case 1, OldaleTown_EventScript_14DE07
+	case 2, OldaleTown_EventScript_14DE1E
+	case 4, OldaleTown_EventScript_14DE35
+	end
+
+OldaleTown_EventScript_14DE07:: @ 814DE07
+	applymovement 2, OldaleTown_Movement_14DE97
+	applymovement 255, OldaleTown_Movement_14DEC1
+	waitmovement 0
+	goto OldaleTown_EventScript_14DE4C
+	end
+
+OldaleTown_EventScript_14DE1E:: @ 814DE1E
+	applymovement 2, OldaleTown_Movement_14DEA2
+	applymovement 255, OldaleTown_Movement_14DECB
+	waitmovement 0
+	goto OldaleTown_EventScript_14DE4C
+	end
+
+OldaleTown_EventScript_14DE35:: @ 814DE35
+	applymovement 255, OldaleTown_Movement_14DEB9
+	applymovement 2, OldaleTown_Movement_14DE8E
+	waitmovement 0
+	goto OldaleTown_EventScript_14DE4C
+	end
+
+OldaleTown_EventScript_14DE4C:: @ 814DE4C
+	msgbox OldaleTown_Text_16AF2F, 4
+	giveitem_std ITEM_POTION
+	compare RESULT, 0
+	goto_if_eq OldaleTown_EventScript_14DE83
+	msgbox OldaleTown_Text_16AFE1, 4
+	setflag FLAG_RECEIVED_POTION_OLDALE
+	fadedefaultbgm
+	release
+	end
+
+OldaleTown_EventScript_14DE79:: @ 814DE79
+	msgbox OldaleTown_Text_16AFE1, 4
+	release
+	end
+
+OldaleTown_EventScript_14DE83:: @ 814DE83
+	msgbox OldaleTown_Text_1A0CC2, 4
+	fadedefaultbgm
+	release
+	end
+
+OldaleTown_Movement_14DE8E:: @ 814DE8E
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+OldaleTown_Movement_14DE97:: @ 814DE97
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+OldaleTown_Movement_14DEA2:: @ 814DEA2
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+@ 814DEAB
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	walk_in_place_fastest_down
+	end_movement
+
+OldaleTown_Movement_14DEB9:: @ 814DEB9
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+OldaleTown_Movement_14DEC1:: @ 814DEC1
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+OldaleTown_Movement_14DECB:: @ 814DECB
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+@ 814DED3
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+OldaleTown_EventScript_14DEDF:: @ 814DEDF
+	lock
+	faceplayer
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26
+	msgbox OldaleTown_Text_16B0CC, 4
+	closemessage
+	applymovement 3, OldaleTown_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+OldaleTown_EventScript_14DEFF:: @ 814DEFF
+	lockall
+	applymovement 255, OldaleTown_Movement_14DFEC
+	applymovement 3, OldaleTown_Movement_14DFEF
+	waitmovement 0
+	msgbox OldaleTown_Text_16B045, 4
+	closemessage
+	applymovement 3, OldaleTown_Movement_14DFF5
+	waitmovement 0
+	releaseall
+	end
+
+OldaleTown_EventScript_14DF26:: @ 814DF26
+	msgbox OldaleTown_Text_16B12A, 4
+	release
+	end
+
+OldaleTown_EventScript_14DF30:: @ 814DF30
+	lockall
+	applymovement 4, OldaleTown_Movement_1A0839
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF41:: @ 814DF41
+	lockall
+	applymovement 4, OldaleTown_Movement_14DFDE
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_1A0843
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF5C:: @ 814DF5C
+	lockall
+	applymovement 4, OldaleTown_Movement_14DFE1
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_1A0843
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF77:: @ 814DF77
+	lockall
+	applymovement 4, OldaleTown_Movement_14DFE3
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_1A0843
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF92:: @ 814DF92
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq OldaleTown_EventScript_14DFAA
+	compare RESULT, 1
+	goto_if_eq OldaleTown_EventScript_14DFB8
+	end
+
+OldaleTown_EventScript_14DFAA:: @ 814DFAA
+	msgbox OldaleTown_Text_16B196, 4
+	goto OldaleTown_EventScript_14DFC6
+	end
+
+OldaleTown_EventScript_14DFB8:: @ 814DFB8
+	msgbox OldaleTown_Text_16B1BE, 4
+	goto OldaleTown_EventScript_14DFC6
+	end
+
+OldaleTown_EventScript_14DFC6:: @ 814DFC6
+	closemessage
+	applymovement 4, OldaleTown_Movement_14DFE5
+	waitmovement 0
+	removeobject 4
+	setvar VAR_OLDALE_STATE, 2
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	releaseall
+	end
+
+OldaleTown_Movement_14DFDE:: @ 814DFDE
+	walk_left
+	walk_left
+	end_movement
+
+OldaleTown_Movement_14DFE1:: @ 814DFE1
+	walk_left
+	end_movement
+
+OldaleTown_Movement_14DFE3:: @ 814DFE3
+	face_left
+	end_movement
+
+OldaleTown_Movement_14DFE5:: @ 814DFE5
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+OldaleTown_Movement_14DFEC:: @ 814DFEC
+	delay_8
+	walk_right
+	end_movement
+
+OldaleTown_Movement_14DFEF:: @ 814DFEF
+	walk_fast_up
+	walk_in_place_fastest_left
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	end_movement
+
+OldaleTown_Movement_14DFF5:: @ 814DFF5
+	walk_down
+	walk_left
+	end_movement
diff --git a/data/text/maps/OldaleTown.inc b/data/maps/OldaleTown/text.inc
index 2d0b31a44..2d0b31a44 100644
--- a/data/text/maps/OldaleTown.inc
+++ b/data/maps/OldaleTown/text.inc
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc
index e037e3b0e..e037e3b0e 100644
--- a/data/maps/events/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/events.inc
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 550ff5a75..b2b31cb73 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_House1:: @ 8305ABC
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte OldaleTown_House1_MapEvents
 	.4byte OldaleTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 59
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc
index 1e519a737..1e519a737 100644
--- a/data/scripts/maps/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
diff --git a/data/text/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/text.inc
index 943003b97..943003b97 100644
--- a/data/text/maps/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/text.inc
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc
index 0968fda57..0968fda57 100644
--- a/data/maps/events/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/events.inc
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
index eb1660cf9..33ad6fcd7 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_House2:: @ 8305AD8
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte OldaleTown_House2_MapEvents
 	.4byte OldaleTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 60
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc
index 57a9ab8ac..57a9ab8ac 100644
--- a/data/scripts/maps/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
diff --git a/data/text/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/text.inc
index 54a6547b4..54a6547b4 100644
--- a/data/text/maps/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/text.inc
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc
index 9d0b70937..9d0b70937 100644
--- a/data/maps/events/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/events.inc
diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc
index a0e8a8851..d74999efb 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_Mart:: @ 8305B2C
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte OldaleTown_Mart_MapEvents
 	.4byte OldaleTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc
index 15cf40027..15cf40027 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
diff --git a/data/text/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/text.inc
index 5abb0cb9b..5abb0cb9b 100644
--- a/data/text/maps/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/text.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
index 89ad23d8f..89ad23d8f 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
index 82ced7328..a3bfaff18 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_PokemonCenter_1F:: @ 8305AF4
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte OldaleTown_PokemonCenter_1F_MapEvents
 	.4byte OldaleTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index c993807c6..c993807c6 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/text.inc
index 4fa7f4d9b..4fa7f4d9b 100644
--- a/data/text/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
index 9af6ec676..9af6ec676 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 79e6ca99d..73c9d23d4 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_PokemonCenter_2F:: @ 8305B10
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte OldaleTown_PokemonCenter_2F_MapEvents
 	.4byte OldaleTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index 622f50c29..622f50c29 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc
index f8db75501..f8db75501 100644
--- a/data/maps/events/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/events.inc
diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc
index 057e83264..dd589e122 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown:: @ 83055EC
-	.4byte PacifidlogTown_MapAttributes
+	.4byte PacifidlogTown_Layout
 	.4byte PacifidlogTown_MapEvents
 	.4byte PacifidlogTown_MapScripts
 	.4byte PacifidlogTown_MapConnections
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 16
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc
index d7ac80a0a..d7ac80a0a 100644
--- a/data/scripts/maps/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
diff --git a/data/text/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/text.inc
index f598c566a..f598c566a 100644
--- a/data/text/maps/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/text.inc
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc
index 95d0009d9..95d0009d9 100644
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/events.inc
diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
index 7842574f9..dcf7d338d 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House1:: @ 8305E90
-	.4byte PacifidlogTown_House1_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House1_MapEvents
 	.4byte PacifidlogTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 77
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc
index 4b3586a16..4b3586a16 100644
--- a/data/scripts/maps/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/text.inc
index 5d2f5a2c9..5d2f5a2c9 100644
--- a/data/text/maps/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/text.inc
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc
index 00493650a..00493650a 100644
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/events.inc
diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc
index 3fc2aba99..758c10751 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House2:: @ 8305EAC
-	.4byte PacifidlogTown_House2_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House2_MapEvents
 	.4byte PacifidlogTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 78
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 110bdcbe6..110bdcbe6 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/text.inc
index 5c669dc98..5c669dc98 100644
--- a/data/text/maps/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/text.inc
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc
index 0f7bb798b..0f7bb798b 100644
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/events.inc
diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc
index 6bf1e6bd6..55427804f 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House3:: @ 8305EC8
-	.4byte PacifidlogTown_House3_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House3_MapEvents
 	.4byte PacifidlogTown_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 77
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index 3b21ac996..3b21ac996 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/text.inc
index 1aabc9578..1aabc9578 100644
--- a/data/text/maps/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/text.inc
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc
index e41a86e44..e41a86e44 100644
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/events.inc
diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc
index df930a533..fbadb5440 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House4:: @ 8305EE4
-	.4byte PacifidlogTown_House4_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House4_MapEvents
 	.4byte PacifidlogTown_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 78
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc
index 584366c88..584366c88 100644
--- a/data/scripts/maps/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/text.inc
index 3ca9e5cca..3ca9e5cca 100644
--- a/data/text/maps/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/text.inc
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc
index bac0ca3e1..bac0ca3e1 100644
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/events.inc
diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc
index d0fca156f..c8d5bcf3c 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House5:: @ 8305F00
-	.4byte PacifidlogTown_House5_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House5_MapEvents
 	.4byte PacifidlogTown_House5_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 77
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc
index 46b1990df..46b1990df 100644
--- a/data/scripts/maps/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/text.inc
index 5fc9ca5c5..5fc9ca5c5 100644
--- a/data/text/maps/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/text.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
index 05f1e9698..05f1e9698 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
index ef2ddbf4c..706a9d8b2 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_PokemonCenter_1F:: @ 8305E58
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte PacifidlogTown_PokemonCenter_1F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index 557b6497e..557b6497e 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc
index 9f87c6a54..9f87c6a54 100644
--- a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
index 8bc70f400..8bc70f400 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
index b985545a8..9408e8611 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_PokemonCenter_2F:: @ 8305E74
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte PacifidlogTown_PokemonCenter_2F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index 2bff37736..2bff37736 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc
index 43216cdc9..43216cdc9 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/PetalburgCity/events.inc
diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc
index c1706a55a..ddda0a3b0 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity:: @ 8305448
-	.4byte PetalburgCity_MapAttributes
+	.4byte PetalburgCity_Layout
 	.4byte PetalburgCity_MapEvents
 	.4byte PetalburgCity_MapScripts
 	.4byte PetalburgCity_MapConnections
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 1
 	.byte 7
 	.byte 0
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
new file mode 100644
index 000000000..77b12b556
--- /dev/null
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -0,0 +1,428 @@
+PetalburgCity_MapScripts:: @ 814B70C
+	map_script 3, PetalburgCity_MapScript1_14B717
+	map_script 2, PetalburgCity_MapScript2_14B73D
+	.byte 0
+
+PetalburgCity_MapScript1_14B717:: @ 814B717
+	setflag FLAG_VISITED_PETALBURG_CITY
+	compare VAR_PETALBURG_STATE, 0
+	call_if_eq PetalburgCity_EventScript_14B731
+	compare VAR_PETALBURG_STATE, 2
+	call_if_eq PetalburgCity_EventScript_14B739
+	end
+
+PetalburgCity_EventScript_14B731:: @ 814B731
+	setobjectxyperm 9, 5, 11
+	return
+
+PetalburgCity_EventScript_14B739:: @ 814B739
+	savebgm MUS_TSURETEK
+	return
+
+PetalburgCity_MapScript2_14B73D:: @ 814B73D
+	map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747
+	.2byte 0
+
+PetalburgCity_EventScript_14B747:: @ 814B747
+	lockall
+	setflag FLAG_SPECIAL_FLAG_0
+	special SavePlayerParty
+	special PutZigzagoonInPlayerParty
+	applymovement 2, PetalburgCity_Movement_14B7ED
+	applymovement 255, PetalburgCity_Movement_14B7CC
+	waitmovement 0
+	msgbox PetalburgCity_Text_16D361, 4
+	special ScrSpecial_StartWallyTutorialBattle
+	waitstate
+	msgbox PetalburgCity_Text_16D3DE, 4
+	applymovement 2, PetalburgCity_Movement_1A083F, 0, 0
+	waitmovement 0, 0, 2
+	msgbox PetalburgCity_Text_16D408, 4
+	closemessage
+	clearflag FLAG_SPECIAL_FLAG_0
+	setvar VAR_PETALBURG_STATE, 3
+	fadedefaultbgm
+	clearflag FLAG_SPECIAL_FLAG_1
+	special LoadPlayerParty
+	setvar VAR_PETALBURG_GYM_STATE, 1
+	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_EventScript_14B7AC:: @ 814B7AC
+	lock
+	faceplayer
+	msgbox PetalburgCity_Text_164490, 4
+	closemessage
+	applymovement 3, PetalburgCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+PetalburgCity_EventScript_14B7C3:: @ 814B7C3
+	msgbox PetalburgCity_Text_16433E, 2
+	end
+
+PetalburgCity_Movement_14B7CC:: @ 814B7CC
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
+
+PetalburgCity_Movement_14B7ED:: @ 814B7ED
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	end_movement
+
+PetalburgCity_EventScript_14B812:: @ 814B812
+	msgbox PetalburgCity_Text_1645BB, 3
+	end
+
+PetalburgCity_EventScript_14B81B:: @ 814B81B
+	msgbox PetalburgCity_Text_164602, 3
+	end
+
+PetalburgCity_EventScript_14B824:: @ 814B824
+	msgbox PetalburgCity_Text_16453F, 2
+	end
+
+PetalburgCity_EventScript_14B82D:: @ 814B82D
+	msgbox PetalburgCity_Text_164634, 3
+	end
+
+PetalburgCity_EventScript_14B836:: @ 814B836
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B842:: @ 814B842
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B84E:: @ 814B84E
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B85A:: @ 814B85A
+	lockall
+	setvar VAR_SPECIAL_8, 3
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B866:: @ 814B866
+	applymovement 9, PetalburgCity_Movement_1A0839
+	waitmovement 0
+	playbgm MUS_TSURETEK, FALSE
+	playse SE_PIN
+	applymovement 9, PetalburgCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, PetalburgCity_Movement_1A0835
+	waitmovement 0
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_EventScript_14B91B
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_EventScript_14B930
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_EventScript_14B93B
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_EventScript_14B950
+	msgbox PetalburgCity_Text_16438A, 4
+	closemessage
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_EventScript_14B965
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_EventScript_14B977
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_EventScript_14B989
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_EventScript_14B99B
+	msgbox PetalburgCity_Text_164426, 4
+	applymovement 9, PetalburgCity_Movement_1A0843
+	applymovement 255, PetalburgCity_Movement_1A0843
+	waitmovement 0
+	msgbox PetalburgCity_Text_164449, 4
+	closemessage
+	applymovement 9, PetalburgCity_Movement_14B9F4
+	waitmovement 0
+	fadedefaultbgm
+	releaseall
+	end
+
+PetalburgCity_EventScript_14B91B:: @ 814B91B
+	applymovement 9, PetalburgCity_Movement_14B9B1
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B930:: @ 814B930
+	applymovement 9, PetalburgCity_Movement_14B9B6
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B93B:: @ 814B93B
+	applymovement 9, PetalburgCity_Movement_14B9B9
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B950:: @ 814B950
+	applymovement 9, PetalburgCity_Movement_14B9BE
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B965:: @ 814B965
+	applymovement 9, PetalburgCity_Movement_14B9C4
+	applymovement 255, PetalburgCity_Movement_14BA01
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B977:: @ 814B977
+	applymovement 9, PetalburgCity_Movement_14B9CF
+	applymovement 255, PetalburgCity_Movement_14BA0B
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B989:: @ 814B989
+	applymovement 9, PetalburgCity_Movement_14B9DD
+	applymovement 255, PetalburgCity_Movement_14BA18
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B99B:: @ 814B99B
+	applymovement 9, PetalburgCity_Movement_14B9E8
+	applymovement 255, PetalburgCity_Movement_14BA22
+	waitmovement 0
+	return
+
+@ 814B9AD
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+PetalburgCity_Movement_14B9B1:: @ 814B9B1
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9B6:: @ 814B9B6
+	walk_right
+	walk_right
+	end_movement
+
+PetalburgCity_Movement_14B9B9:: @ 814B9B9
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+PetalburgCity_Movement_14B9BE:: @ 814B9BE
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+PetalburgCity_Movement_14B9C4:: @ 814B9C4
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9CF:: @ 814B9CF
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9DD:: @ 814B9DD
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9E8:: @ 814B9E8
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9F4:: @ 814B9F4
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+PetalburgCity_Movement_14BA01:: @ 814BA01
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
+
+PetalburgCity_Movement_14BA0B:: @ 814BA0B
+	delay_16
+	delay_16
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	end_movement
+
+PetalburgCity_Movement_14BA18:: @ 814BA18
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
+
+PetalburgCity_Movement_14BA22:: @ 814BA22
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	end_movement
+
+PetalburgCity_EventScript_14BA2D:: @ 814BA2D
+	msgbox PetalburgCity_Text_16438A, 2
+	end
diff --git a/data/text/maps/PetalburgCity.inc b/data/maps/PetalburgCity/text.inc
index fbe00df96..fbe00df96 100644
--- a/data/text/maps/PetalburgCity.inc
+++ b/data/maps/PetalburgCity/text.inc
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc
index b5dd1f57b..b5dd1f57b 100644
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ b/data/maps/PetalburgCity_Gym/events.inc
diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
index af00ed5f0..6c519b07e 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_Gym:: @ 8305F38
-	.4byte PetalburgCity_Gym_MapAttributes
+	.4byte PetalburgCity_Gym_Layout
 	.4byte PetalburgCity_Gym_MapEvents
 	.4byte PetalburgCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 79
 	.byte 7
 	.byte 0
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
new file mode 100644
index 000000000..a3fb5c494
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -0,0 +1,1027 @@
+PetalburgCity_Gym_MapScripts:: @ 8154477
+	map_script 1, PetalburgCity_Gym_MapScript1_15448C
+	map_script 3, PetalburgCity_Gym_MapScript1_15451B
+	map_script 4, PetalburgCity_Gym_MapScript2_154553
+	map_script 2, PetalburgCity_Gym_MapScript2_154562
+	.byte 0
+
+PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
+	compare VAR_PETALBURG_GYM_STATE, 6
+	goto_if_eq PetalburgCity_Gym_EventScript_1544A3
+	compare VAR_PETALBURG_GYM_STATE, 7
+	call_if_ge PetalburgCity_Gym_EventScript_1544ED
+	end
+
+PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3
+	setvar VAR_SPECIAL_5, 1
+	call PetalburgCity_Gym_EventScript_154F9A
+	call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB
+	call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC
+	call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD
+	call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E
+	call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F
+	call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060
+	call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081
+	end
+
+PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
+	setvar VAR_SPECIAL_5, 1
+	call PetalburgCity_Gym_EventScript_154F9A
+	call PetalburgCity_Gym_EventScript_154FBB
+	call PetalburgCity_Gym_EventScript_154FDC
+	call PetalburgCity_Gym_EventScript_154FFD
+	call PetalburgCity_Gym_EventScript_15501E
+	call PetalburgCity_Gym_EventScript_15503F
+	call PetalburgCity_Gym_EventScript_155060
+	call PetalburgCity_Gym_EventScript_155081
+	return
+
+PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
+	compare VAR_PETALBURG_GYM_STATE, 1
+	call_if_eq PetalburgCity_Gym_EventScript_15453B
+	compare VAR_PETALBURG_GYM_STATE, 6
+	call_if_lt PetalburgCity_Gym_EventScript_154543
+	call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B
+	end
+
+PetalburgCity_Gym_EventScript_15453B:: @ 815453B
+	setobjectxyperm 10, 5, 108
+	return
+
+PetalburgCity_Gym_EventScript_154543:: @ 8154543
+	setobjectxyperm 1, 4, 107
+	return
+
+PetalburgCity_Gym_EventScript_15454B:: @ 815454B
+	setobjectxyperm 1, 4, 107
+	return
+
+PetalburgCity_Gym_MapScript2_154553:: @ 8154553
+	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D
+	.2byte 0
+
+PetalburgCity_Gym_EventScript_15455D:: @ 815455D
+	turnobject 255, 2
+	end
+
+PetalburgCity_Gym_MapScript2_154562:: @ 8154562
+	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C
+	.2byte 0
+
+PetalburgCity_Gym_EventScript_15456C:: @ 815456C
+	lockall
+	msgbox PetalburgCity_Gym_Text_17A196, 4
+	msgbox PetalburgCity_Gym_Text_17A1B0, 4
+	closemessage
+	applymovement 255, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_1545B4
+	waitmovement 0
+	playse SE_KAIDAN
+	removeobject 10
+	setflag FLAG_HIDE_WALLY_PETALBURG
+	delay 30
+	applymovement 255, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgCity_Gym_Text_17A2A4, 4
+	setvar VAR_PETALBURG_GYM_STATE, 2
+	releaseall
+	end
+
+PetalburgCity_Gym_Movement_1545B4:: @ 81545B4
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	end_movement
+
+PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
+	lock
+	faceplayer
+	switch VAR_PETALBURG_GYM_STATE
+	case 2, PetalburgCity_Gym_EventScript_154907
+	case 3, PetalburgCity_Gym_EventScript_154911
+	case 4, PetalburgCity_Gym_EventScript_15491B
+	case 5, PetalburgCity_Gym_EventScript_154925
+	case 6, PetalburgCity_Gym_EventScript_1549D6
+	case 7, PetalburgCity_Gym_EventScript_15493D
+	msgbox PetalburgCity_Gym_Text_179DF6, 4
+	closemessage
+	switch FACING
+	case 1, PetalburgCity_Gym_EventScript_15463D
+	case 2, PetalburgCity_Gym_EventScript_154648
+	case 3, PetalburgCity_Gym_EventScript_154653
+	case 4, PetalburgCity_Gym_EventScript_15465E
+	end
+
+PetalburgCity_Gym_EventScript_15463D:: @ 815463D
+	setvar VAR_SPECIAL_8, 0
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_154648:: @ 8154648
+	setvar VAR_SPECIAL_8, 1
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_154653:: @ 8154653
+	setvar VAR_SPECIAL_8, 2
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_15465E:: @ 815465E
+	setvar VAR_SPECIAL_8, 3
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_154669:: @ 8154669
+	addobject 10
+	playse SE_DOOR
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_1547EE
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154800
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_15481C
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_15481C
+	msgbox PetalburgCity_Gym_Text_179F07, 4
+	msgbox PetalburgCity_Gym_Text_179F37, 4
+	msgbox PetalburgCity_Gym_Text_179F70, 4
+	msgbox PetalburgCity_Gym_Text_17A03A, 4
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_154884
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_15488F
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_1548A1
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_1548B3
+	msgbox PetalburgCity_Gym_Text_17A04A, 4
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_1548C5
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_1548D0
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_1548DB
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_1548E6
+	msgbox PetalburgCity_Gym_Text_17A0A8, 4
+	msgbox PetalburgCity_Gym_Text_17A0EB, 4
+	msgbox PetalburgCity_Gym_Text_17A156, 4
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_15492F
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154930
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_15493B
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_15493C
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_1548FC
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
+	msgbox PetalburgCity_Gym_Text_17A171, 4
+	closemessage
+	setflag FLAG_SPECIAL_FLAG_1
+	playbgm MUS_TSURETEK, FALSE
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_154835
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_15484E
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_154860
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_154872
+	removeobject 10
+	setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1
+	setvar VAR_PETALBURG_GYM_STATE, 1
+	setvar VAR_PETALBURG_STATE, 2
+	clearflag FLAG_HIDE_WALLY_PETALBURG
+	clearflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	special InitBirchState
+	warp MAP_PETALBURG_CITY, 255, 15, 8
+	waitstate
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_154B27
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154800:: @ 8154800
+	applymovement 10, PetalburgCity_Gym_Movement_154B1D
+	waitmovement 0
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	applymovement 255, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15481C:: @ 815481C
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 255, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_154B27
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154835:: @ 8154835
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_154B3E
+	applymovement 255, PetalburgCity_Gym_Movement_154B4D
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15484E:: @ 815484E
+	applymovement 10, PetalburgCity_Gym_Movement_154B2E
+	applymovement 255, PetalburgCity_Gym_Movement_154B45
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154860:: @ 8154860
+	applymovement 10, PetalburgCity_Gym_Movement_154B3E
+	applymovement 255, PetalburgCity_Gym_Movement_154B57
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154872:: @ 8154872
+	applymovement 10, PetalburgCity_Gym_Movement_154B36
+	applymovement 255, PetalburgCity_Gym_Movement_154B5F
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154884:: @ 8154884
+	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15488F:: @ 815488F
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 255, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	applymovement 255, PetalburgCity_Gym_Movement_1A083F
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3
+	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	applymovement 255, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1
+	applymovement 10, PetalburgCity_Gym_Movement_1A0839
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC
+	applymovement 10, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154907:: @ 8154907
+	msgbox PetalburgCity_Gym_Text_17A41E, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154911:: @ 8154911
+	msgbox PetalburgCity_Gym_Text_17A518, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_15491B:: @ 815491B
+	msgbox PetalburgCity_Gym_Text_17A5F3, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154925:: @ 8154925
+	msgbox PetalburgCity_Gym_Text_17A5F3, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_15492F:: @ 815492F
+	return
+
+PetalburgCity_Gym_EventScript_154930:: @ 8154930
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15493B:: @ 815493B
+	return
+
+PetalburgCity_Gym_EventScript_15493C:: @ 815493C
+	return
+
+PetalburgCity_Gym_EventScript_15493D:: @ 815493D
+	call PetalburgCity_Gym_EventScript_154969
+	compare RESULT, 1
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
+	goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C
+	goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69
+	msgbox PetalburgCity_Gym_Text_17AA6B, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154969:: @ 8154969
+	specialvar RESULT, IsEnigmaBerryValid
+	compare RESULT, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	checkitem ITEM_ENIGMA_BERRY, 1
+	compare RESULT, 1
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	checkpcitem ITEM_ENIGMA_BERRY, 1
+	compare RESULT, 1
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	msgbox PetalburgCity_Gym_Text_1C5570, 4
+	setvar RESULT, 1
+	return
+
+PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2
+	setvar RESULT, 0
+	return
+
+PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8
+	giveitem_std ITEM_ENIGMA_BERRY
+	compare RESULT, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
+	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
+	msgbox PetalburgCity_Gym_Text_17A653, 4
+	trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A
+	message PetalburgCity_Gym_Text_17A7DD
+	waitmessage
+	call PetalburgCity_Gym_EventScript_1A02C5
+	msgbox PetalburgCity_Gym_Text_17A805, 4
+	setflag FLAG_DEFEATED_PETALBURG_GYM
+	setvar VAR_PETALBURG_GYM_STATE, 7
+	setflag FLAG_BADGE05_GET
+	call PetalburgCity_Gym_EventScript_1A0424
+	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	clearflag FLAG_HIDE_WATTSON_MAUVILLE
+	setvar VAR_SPECIAL_8, 5
+	call PetalburgCity_Gym_EventScript_1A01C0
+	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+	call PetalburgCity_Gym_EventScript_1544ED
+	special DrawWholeMapView
+	goto PetalburgCity_Gym_EventScript_154A2C
+	end
+
+PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
+	giveitem_std ITEM_TM42_FACADE
+	compare RESULT, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
+	setflag FLAG_RECEIVED_TM42
+	msgbox PetalburgCity_Gym_Text_17A8CF, 4
+	msgbox PetalburgCity_Gym_Text_17A976, 4
+	closemessage
+	compare FACING, 2
+	call_if_eq PetalburgCity_Gym_EventScript_154ABC
+	compare FACING, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154AC7
+	compare FACING, 3
+	call_if_eq PetalburgCity_Gym_EventScript_154AD2
+	compare FACING, 4
+	call_if_eq PetalburgCity_Gym_EventScript_154ADD
+	delay 70
+	compare FACING, 2
+	call_if_eq PetalburgCity_Gym_EventScript_154AE8
+	compare FACING, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154AF3
+	compare FACING, 3
+	call_if_eq PetalburgCity_Gym_EventScript_154AFE
+	compare FACING, 4
+	call_if_eq PetalburgCity_Gym_EventScript_154B09
+	msgbox PetalburgCity_Gym_Text_17A9F6, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC
+	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2
+	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3
+	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
+	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	waitmovement 0
+	return
+
+@ 8154B14
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
+
+PetalburgCity_Gym_Movement_154B27:: @ 8154B27
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_up
+	end_movement
+
+PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B36:: @ 8154B36
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B45:: @ 8154B45
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D
+	delay_16
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_Movement_154B57:: @ 8154B57
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_EventScript_154B69:: @ 8154B69
+	msgbox PetalburgCity_Gym_Text_17AB17, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154B73:: @ 8154B73
+	lockall
+	compare VAR_PETALBURG_GYM_STATE, 6
+	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 85
+	msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8
+	closemessage
+	delay 30
+	warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_154BB7:: @ 8154BB7
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9
+	msgbox PetalburgCity_Gym_Text_17B844, 4
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
+	lockall
+	compare VAR_PETALBURG_GYM_STATE, 6
+	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 98
+	msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 46
+	msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 59
+	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 59
+	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 72
+	msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 20
+	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 20
+	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 33
+	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 33
+	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 7
+	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 7
+	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
+	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29
+	msgbox PetalburgCity_Gym_Text_17AE30, 6
+	end
+
+PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_154FBB
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
+	msgbox PetalburgCity_Gym_Text_17AEBB, 2
+	end
+
+PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
+	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65
+	msgbox PetalburgCity_Gym_Text_17AFD3, 6
+	end
+
+PetalburgCity_Gym_EventScript_154E56:: @ 8154E56
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_154FFD
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
+	msgbox PetalburgCity_Gym_Text_17B016, 2
+	end
+
+PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
+	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1
+	msgbox PetalburgCity_Gym_Text_17B12C, 6
+	end
+
+PetalburgCity_Gym_EventScript_154E92:: @ 8154E92
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_15503F
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
+	msgbox PetalburgCity_Gym_Text_17B1F4, 2
+	end
+
+PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
+	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD
+	msgbox PetalburgCity_Gym_Text_17B2E4, 6
+	end
+
+PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_155081
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
+	msgbox PetalburgCity_Gym_Text_17B39B, 2
+	end
+
+PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
+	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19
+	msgbox PetalburgCity_Gym_Text_17B46F, 6
+	end
+
+PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_154FDC
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
+	msgbox PetalburgCity_Gym_Text_17B521, 2
+	end
+
+PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
+	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55
+	msgbox PetalburgCity_Gym_Text_17B5EA, 6
+	end
+
+PetalburgCity_Gym_EventScript_154F46:: @ 8154F46
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_15501E
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
+	msgbox PetalburgCity_Gym_Text_17B6B5, 2
+	end
+
+PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
+	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91
+	msgbox PetalburgCity_Gym_Text_17B749, 6
+	end
+
+PetalburgCity_Gym_EventScript_154F82:: @ 8154F82
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_155060
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154F91:: @ 8154F91
+	msgbox PetalburgCity_Gym_Text_17B7C0, 2
+	end
+
+PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A
+	setvar VAR_SPECIAL_4, 1
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_1550A2
+	return
+
+PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB
+	setvar VAR_SPECIAL_4, 2
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_1550C7
+	return
+
+PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC
+	setvar VAR_SPECIAL_4, 3
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_1550EC
+	return
+
+PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD
+	setvar VAR_SPECIAL_4, 4
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_155111
+	return
+
+PetalburgCity_Gym_EventScript_15501E:: @ 815501E
+	setvar VAR_SPECIAL_4, 5
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_155124
+	return
+
+PetalburgCity_Gym_EventScript_15503F:: @ 815503F
+	setvar VAR_SPECIAL_4, 6
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_155149
+	return
+
+PetalburgCity_Gym_EventScript_155060:: @ 8155060
+	setvar VAR_SPECIAL_4, 7
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_15515C
+	return
+
+PetalburgCity_Gym_EventScript_155081:: @ 8155081
+	setvar VAR_SPECIAL_4, 8
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_15516F
+	return
+
+PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2
+	setmetatile 6, 85, 528, 0
+	setmetatile 7, 85, 529, 0
+	setmetatile 1, 98, 528, 0
+	setmetatile 2, 98, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7
+	setmetatile 6, 46, 528, 0
+	setmetatile 7, 46, 529, 0
+	setmetatile 1, 59, 528, 0
+	setmetatile 2, 59, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC
+	setmetatile 6, 59, 528, 0
+	setmetatile 7, 59, 529, 0
+	setmetatile 1, 72, 528, 0
+	setmetatile 2, 72, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155111:: @ 8155111
+	setmetatile 1, 20, 528, 0
+	setmetatile 2, 20, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155124:: @ 8155124
+	setmetatile 6, 20, 528, 0
+	setmetatile 7, 20, 529, 0
+	setmetatile 1, 33, 528, 0
+	setmetatile 2, 33, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155149:: @ 8155149
+	setmetatile 6, 33, 528, 0
+	setmetatile 7, 33, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_15515C:: @ 815515C
+	setmetatile 1, 7, 528, 0
+	setmetatile 2, 7, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_15516F:: @ 815516F
+	setmetatile 6, 7, 528, 0
+	setmetatile 7, 7, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155182:: @ 8155182
+	special PetalburgGymSlideOpenDoors
+	waitstate
+	return
+
+PetalburgCity_Gym_EventScript_155187:: @ 8155187
+	special PetalburgGymOpenDoorsInstantly
+	return
+
+PetalburgCity_Gym_EventScript_15518B:: @ 815518B
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0
+	msgbox PetalburgCity_Gym_Text_17AB96, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
+	msgbox PetalburgCity_Gym_Text_17AD49, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
+	lockall
+	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
+	goto PetalburgCity_Gym_EventScript_1551D4
+	end
+
+PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
+	lockall
+	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
+	goto PetalburgCity_Gym_EventScript_1551D4
+	end
+
+PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA
+	msgbox PetalburgCity_Gym_Text_17BAC0, 4
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4
+	msgbox PetalburgCity_Gym_Text_17BAA5, 4
+	releaseall
+	end
diff --git a/data/text/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/text.inc
index bbd072564..bbd072564 100644
--- a/data/text/maps/PetalburgCity_Gym.inc
+++ b/data/maps/PetalburgCity_Gym/text.inc
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc
index df1970bd4..df1970bd4 100644
--- a/data/maps/events/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/events.inc
diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index e1f5c1f63..1aaa3ee6d 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_House1:: @ 8305F54
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte PetalburgCity_House1_MapEvents
 	.4byte PetalburgCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 59
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc
index 7a3b7c1b1..7a3b7c1b1 100644
--- a/data/scripts/maps/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/scripts.inc
diff --git a/data/text/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/text.inc
index d41fadd1f..d41fadd1f 100644
--- a/data/text/maps/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/text.inc
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc
index b26cc139f..b26cc139f 100644
--- a/data/maps/events/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/events.inc
diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc
index fb76b1bfe..1f115285c 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_House2:: @ 8305F70
-	.4byte PetalburgCity_House2_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte PetalburgCity_House2_MapEvents
 	.4byte PetalburgCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 80
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc
index 4cc1325a2..4cc1325a2 100644
--- a/data/scripts/maps/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/scripts.inc
diff --git a/data/text/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/text.inc
index 426dac360..426dac360 100644
--- a/data/text/maps/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/text.inc
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc
index 3171dca99..3171dca99 100644
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/events.inc
diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc
index 56275cfaf..21a487898 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_Mart:: @ 8305FC4
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte PetalburgCity_Mart_MapEvents
 	.4byte PetalburgCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc
index 7584f6f19..7584f6f19 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/scripts.inc
diff --git a/data/text/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/text.inc
index d6fcc6fff..d6fcc6fff 100644
--- a/data/text/maps/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/text.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
index d4dc0c63e..d4dc0c63e 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
index 2596fb65d..0c87b4934 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_PokemonCenter_1F:: @ 8305F8C
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte PetalburgCity_PokemonCenter_1F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 136cc11c5..136cc11c5 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc
index 1c4689672..1c4689672 100644
--- a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
index 365e3a258..365e3a258 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
index ac6c77b6a..7646fd56e 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_PokemonCenter_2F:: @ 8305FA8
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte PetalburgCity_PokemonCenter_2F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index a95823736..a95823736 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc
index bc33ab969..bc33ab969 100644
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/events.inc
diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
index e16ac5a7f..297065253 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_WallysHouse:: @ 8305F1C
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte PetalburgCity_WallysHouse_MapEvents
 	.4byte PetalburgCity_WallysHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 60
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index 1a1605817..1a1605817 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
diff --git a/data/text/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/text.inc
index 888dfbc91..888dfbc91 100644
--- a/data/text/maps/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/text.inc
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc
index d624d94dc..d624d94dc 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/PetalburgWoods/events.inc
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
index b3a981af9..d473ea6ed 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -1,9 +1,9 @@
 PetalburgWoods:: @ 8306EA4
-	.4byte PetalburgWoods_MapAttributes
+	.4byte PetalburgWoods_Layout
 	.4byte PetalburgWoods_MapEvents
 	.4byte PetalburgWoods_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 136
 	.byte 59
 	.byte 0
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
new file mode 100644
index 000000000..69b85d743
--- /dev/null
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -0,0 +1,282 @@
+PetalburgWoods_MapScripts:: @ 815CC9C
+	map_script 3, PetalburgWoods_MapScript1_15CCA2
+	.byte 0
+
+PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2
+	call PetalburgWoods_EventScript_1A0196
+	end
+
+PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
+	lockall
+	call PetalburgWoods_EventScript_15CDE6
+	applymovement 4, PetalburgWoods_Movement_15CE89
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194D92, 4
+	closemessage
+	playbgm MUS_EVIL_TEAM, FALSE
+	applymovement 3, PetalburgWoods_Movement_15CEC3
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194DED, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_15CEB0
+	waitmovement 0
+	applymovement 4, PetalburgWoods_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E6B, 4
+	closemessage
+	applymovement 4, PetalburgWoods_Movement_15CE9E
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E9A, 4
+	applymovement 3, PetalburgWoods_Movement_15CEC8
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194EE8, 4
+	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	applymovement 3, PetalburgWoods_Movement_15CEB3
+	waitmovement 0
+	call PetalburgWoods_EventScript_15CDFA
+	applymovement 4, PetalburgWoods_Movement_15CE80
+	waitmovement 0
+	goto PetalburgWoods_EventScript_15CE69
+	end
+
+PetalburgWoods_EventScript_15CD42:: @ 815CD42
+	lockall
+	call PetalburgWoods_EventScript_15CDE6
+	applymovement 4, PetalburgWoods_Movement_15CE8E
+	waitmovement 0
+	applymovement 255, PetalburgWoods_Movement_1A083F
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194D92, 4
+	closemessage
+	playbgm MUS_EVIL_TEAM, FALSE
+	applymovement 3, PetalburgWoods_Movement_15CEC3
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194DED, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_15CEBF
+	waitmovement 0
+	applymovement 4, PetalburgWoods_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E6B, 4
+	closemessage
+	applymovement 4, PetalburgWoods_Movement_15CEA4
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E9A, 4
+	applymovement 255, PetalburgWoods_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194EE8, 4
+	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	applymovement 3, PetalburgWoods_Movement_15CEB3
+	waitmovement 0
+	call PetalburgWoods_EventScript_15CDFA
+	applymovement 4, PetalburgWoods_Movement_15CE95
+	waitmovement 0
+	goto PetalburgWoods_EventScript_15CE69
+	end
+
+PetalburgWoods_EventScript_15CDE6:: @ 815CDE6
+	applymovement 4, PetalburgWoods_Movement_15CE73
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194D71, 4
+	closemessage
+	return
+
+PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
+	msgbox PetalburgWoods_Text_194FA4, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_15CEB7
+	waitmovement 0
+	removeobject 3
+	applymovement 255, PetalburgWoods_Movement_1A0845
+	waitmovement 0
+	msgbox PetalburgWoods_Text_19507E, 4
+	giveitem_std ITEM_GREAT_BALL
+	compare RESULT, 0
+	goto_if_eq PetalburgWoods_EventScript_15CE3F
+	goto PetalburgWoods_EventScript_15CE4D
+	end
+
+PetalburgWoods_EventScript_15CE3F:: @ 815CE3F
+	msgbox PetalburgWoods_Text_195182, 4
+	goto PetalburgWoods_EventScript_15CE4D
+	end
+
+PetalburgWoods_EventScript_15CE4D:: @ 815CE4D
+	msgbox PetalburgWoods_Text_19510A, 4
+	applymovement 4, PetalburgWoods_Movement_15CEA8
+	waitmovement 0
+	msgbox PetalburgWoods_Text_195153, 4
+	closemessage
+	return
+
+PetalburgWoods_EventScript_15CE69:: @ 815CE69
+	removeobject 4
+	setvar VAR_PETALBURG_WOODS_STATE, 1
+	releaseall
+	end
+
+PetalburgWoods_Movement_15CE73:: @ 815CE73
+	face_up
+	delay_16
+	face_right
+	delay_16
+	face_left
+	delay_16
+	face_down
+	delay_16
+	face_right
+	delay_16
+	face_up
+	delay_16
+	end_movement
+
+PetalburgWoods_Movement_15CE80:: @ 815CE80
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+PetalburgWoods_Movement_15CE89:: @ 815CE89
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	end_movement
+
+PetalburgWoods_Movement_15CE8E:: @ 815CE8E
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
+
+PetalburgWoods_Movement_15CE95:: @ 815CE95
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+PetalburgWoods_Movement_15CE9E:: @ 815CE9E
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgWoods_Movement_15CEA4:: @ 815CEA4
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgWoods_Movement_15CEA8:: @ 815CEA8
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_up
+	end_movement
+
+PetalburgWoods_Movement_15CEB0:: @ 815CEB0
+	walk_fast_down
+	walk_fast_down
+	end_movement
+
+PetalburgWoods_Movement_15CEB3:: @ 815CEB3
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	end_movement
+
+PetalburgWoods_Movement_15CEB7:: @ 815CEB7
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	delay_16
+	delay_16
+	end_movement
+
+PetalburgWoods_Movement_15CEBF:: @ 815CEBF
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	end_movement
+
+PetalburgWoods_Movement_15CEC3:: @ 815CEC3
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	end_movement
+
+PetalburgWoods_Movement_15CEC8:: @ 815CEC8
+	walk_down
+	end_movement
+
+PetalburgWoods_EventScript_15CECA:: @ 815CECA
+	msgbox PetalburgWoods_Text_1953AC, 2
+	end
+
+PetalburgWoods_EventScript_15CED3:: @ 815CED3
+	msgbox PetalburgWoods_Text_19542B, 2
+	end
+
+PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B
+	msgbox PetalburgWoods_Text_19549E, 4
+	giveitem_std ITEM_MIRACLE_SEED
+	compare RESULT, 0
+	goto_if_eq PetalburgWoods_EventScript_1A029B
+	setflag FLAG_RECEIVED_MIRACLE_SEED
+	release
+	end
+
+PetalburgWoods_EventScript_15CF0B:: @ 815CF0B
+	msgbox PetalburgWoods_Text_195503, 4
+	release
+	end
+
+PetalburgWoods_EventScript_15CF15:: @ 815CF15
+	msgbox PetalburgWoods_Text_1955B0, 3
+	end
+
+PetalburgWoods_EventScript_15CF1E:: @ 815CF1E
+	msgbox PetalburgWoods_Text_1956A6, 3
+	end
+
+PetalburgWoods_EventScript_15CF27:: @ 815CF27
+	trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202
+	msgbox PetalburgWoods_Text_195232, 6
+	end
+
+PetalburgWoods_EventScript_15CF3E:: @ 815CF3E
+	trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq PetalburgWoods_EventScript_15CF65
+	msgbox PetalburgWoods_Text_1952CC, 6
+	end
+
+PetalburgWoods_EventScript_15CF65:: @ 815CF65
+	trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338
+	msgbox PetalburgWoods_Text_195356, 6
+	end
diff --git a/data/text/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/text.inc
index 21a04dcc8..21a04dcc8 100644
--- a/data/text/maps/PetalburgWoods.inc
+++ b/data/maps/PetalburgWoods/text.inc
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc
index e8c27a9c9..e8c27a9c9 100644
--- a/data/maps/events/RecordCorner.inc
+++ b/data/maps/RecordCorner/events.inc
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
index a8322ebee..ee1142c85 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -1,9 +1,9 @@
 RecordCorner:: @ 83079B0
-	.4byte RecordCorner_MapAttributes
+	.4byte RecordCorner_Layout
 	.4byte RecordCorner_MapEvents
 	.4byte RecordCorner_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 224
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc
index 8a2c1db22..8a2c1db22 100644
--- a/data/scripts/maps/RecordCorner.inc
+++ b/data/maps/RecordCorner/scripts.inc
diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc
index 933509835..933509835 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/Route101/events.inc
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
index 1b4b6b1c4..c3d5606d5 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -1,9 +1,9 @@
 Route101:: @ 8305608
-	.4byte Route101_MapAttributes
+	.4byte Route101_Layout
 	.4byte Route101_MapEvents
 	.4byte Route101_MapScripts
 	.4byte Route101_MapConnections
-	.2byte BGM_DOORO1
+	.2byte MUS_DOORO1
 	.2byte 17
 	.byte 16
 	.byte 0
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
new file mode 100644
index 000000000..c7f570044
--- /dev/null
+++ b/data/maps/Route101/scripts.inc
@@ -0,0 +1,246 @@
+Route101_MapScripts:: @ 814E924
+	map_script 3, Route101_MapScript1_14E92F
+	map_script 2, Route101_MapScript2_14E935
+	.byte 0
+
+Route101_MapScript1_14E92F:: @ 814E92F
+	call Route101_EventScript_1A02F4
+	end
+
+Route101_MapScript2_14E935:: @ 814E935
+	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F
+	.2byte 0
+
+Route101_EventScript_14E93F:: @ 814E93F
+	setflag FLAG_SPECIAL_FLAG_0
+	setvar VAR_ROUTE101_STATE, 1
+	end
+
+Route101_EventScript_14E948:: @ 814E948
+	lockall
+	playbgm MUS_EVENT0, TRUE
+	msgbox Route101_Text_16D10E, 4
+	closemessage
+	setobjectxy 2, 0, 15
+	setobjectxy 4, 0, 16
+	applymovement 255, Route101_Movement_14EA2C
+	applymovement 2, Route101_Movement_14EA50
+	applymovement 4, Route101_Movement_14EA1F
+	waitmovement 0
+	applymovement 4, Route101_Movement_14EA00
+	applymovement 2, Route101_Movement_14EA31
+	waitmovement 0
+	applymovement 2, Route101_Movement_1A0843
+	waitmovement 0
+	applymovement 4, Route101_Movement_14EA27
+	applymovement 2, Route101_Movement_14EA58
+	waitmovement 0
+	msgbox Route101_Text_16D119, 4
+	closemessage
+	setvar VAR_ROUTE101_STATE, 2
+	releaseall
+	end
+
+Route101_EventScript_14E9B8:: @ 814E9B8
+	lockall
+	msgbox Route101_Text_16D15E, 4
+	closemessage
+	applymovement 255, Route101_Movement_14E9FA
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_14E9CE:: @ 814E9CE
+	lockall
+	msgbox Route101_Text_16D15E, 4
+	closemessage
+	applymovement 255, Route101_Movement_14E9FC
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_14E9E4:: @ 814E9E4
+	lockall
+	msgbox Route101_Text_16D15E, 4
+	closemessage
+	applymovement 255, Route101_Movement_14E9FE
+	waitmovement 0
+	releaseall
+	end
+
+Route101_Movement_14E9FA:: @ 814E9FA
+	walk_up
+	end_movement
+
+Route101_Movement_14E9FC:: @ 814E9FC
+	walk_right
+	end_movement
+
+Route101_Movement_14E9FE:: @ 814E9FE
+	walk_down
+	end_movement
+
+Route101_Movement_14EA00:: @ 814EA00
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	end_movement
+
+Route101_Movement_14EA1F:: @ 814EA1F
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
+
+@ 814EA26
+	end_movement
+
+Route101_Movement_14EA27:: @ 814EA27
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	end_movement
+
+Route101_Movement_14EA2C:: @ 814EA2C
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route101_Movement_14EA31:: @ 814EA31
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	end_movement
+
+Route101_Movement_14EA50:: @ 814EA50
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+@ 814EA57
+	end_movement
+
+Route101_Movement_14EA58:: @ 814EA58
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	end_movement
+
+@ 814EA5D
+	walk_up
+	walk_up
+	end_movement
+
+@ 814EA60
+	walk_up
+	walk_left
+	walk_up
+	end_movement
+
+Route101_EventScript_14EA64:: @ 814EA64
+	msgbox Route101_Text_16D25E, 2
+	end
+
+Route101_EventScript_14EA6D:: @ 814EA6D
+	msgbox Route101_Text_16D2CB, 2
+	end
+
+Route101_EventScript_14EA76:: @ 814EA76
+	msgbox Route101_Text_16D349, 3
+	end
+
+Route101_EventScript_14EA7F:: @ 814EA7F
+	lock
+	faceplayer
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_RESCUED_BIRCH
+	fadescreen 1
+	removeobject 4
+	setobjectxy 255, 6, 13
+	applymovement 255, Route101_Movement_1A083F
+	waitmovement 0
+	special ScrSpecial_ChooseStarter
+	waitstate
+	applymovement 2, Route101_Movement_14EAD7
+	waitmovement 0
+	msgbox Route101_Text_16D191, 4
+	special ScrSpecial_HealPlayerParty
+	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_BIRCH_STARTERS_BAG
+	setvar VAR_BIRCH_LAB_STATE, 2
+	setvar VAR_ROUTE101_STATE, 3
+	clearflag FLAG_SPECIAL_FLAG_0
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
+	waitstate
+	release
+	end
+
+Route101_Movement_14EAD7:: @ 814EAD7
+	walk_right
+	end_movement
diff --git a/data/text/maps/Route101.inc b/data/maps/Route101/text.inc
index 3bfa1ef6e..3bfa1ef6e 100644
--- a/data/text/maps/Route101.inc
+++ b/data/maps/Route101/text.inc
diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc
index 4de0e95d2..4de0e95d2 100644
--- a/data/maps/events/Route102.inc
+++ b/data/maps/Route102/events.inc
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
index a4318e2d2..a84770fae 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -1,9 +1,9 @@
 Route102:: @ 8305624
-	.4byte Route102_MapAttributes
+	.4byte Route102_Layout
 	.4byte Route102_MapEvents
 	.4byte Route102_MapScripts
 	.4byte Route102_MapConnections
-	.2byte BGM_DOORO1
+	.2byte MUS_DOORO1
 	.2byte 18
 	.byte 17
 	.byte 0
diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc
index ad1571caa..ad1571caa 100644
--- a/data/scripts/maps/Route102.inc
+++ b/data/maps/Route102/scripts.inc
diff --git a/data/text/maps/Route102.inc b/data/maps/Route102/text.inc
index cf367edc2..cf367edc2 100644
--- a/data/text/maps/Route102.inc
+++ b/data/maps/Route102/text.inc
diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc
index f131106da..f131106da 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/Route103/events.inc
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index b23f9d523..f0423adeb 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -1,9 +1,9 @@
 Route103:: @ 8305640
-	.4byte Route103_MapAttributes
+	.4byte Route103_Layout
 	.4byte Route103_MapEvents
 	.4byte Route103_MapScripts
 	.4byte Route103_MapConnections
-	.2byte BGM_DOORO1
+	.2byte MUS_DOORO1
 	.2byte 19
 	.byte 18
 	.byte 0
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
new file mode 100644
index 000000000..361dc78c3
--- /dev/null
+++ b/data/maps/Route103/scripts.inc
@@ -0,0 +1,216 @@
+Route103_MapScripts:: @ 814EB81
+	map_script 3, Route103_MapScript1_14EB87
+	.byte 0
+
+Route103_MapScript1_14EB87:: @ 814EB87
+	call Route103_EventScript_1A014E
+	call Route103_EventScript_1A02F4
+	end
+
+Route103_EventScript_14EB92:: @ 814EB92
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq Route103_EventScript_14EBAB
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EC04
+	end
+
+Route103_EventScript_14EBAB:: @ 814EBAB
+	msgbox Route103_Text_16D57A, 4
+	playbgm MUS_GIRL_SUP, TRUE
+	applymovement 2, Route103_Movement_1A0839
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0833
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0835
+	waitmovement 0
+	msgbox Route103_Text_16D5B6, 4
+	switch VAR_STARTER_MON
+	case 0, Route103_EventScript_14EC5D
+	case 1, Route103_EventScript_14EC6D
+	case 2, Route103_EventScript_14EC7D
+	end
+
+Route103_EventScript_14EC04:: @ 814EC04
+	msgbox Route103_Text_16D762, 4
+	playbgm MUS_BOY_SUP, TRUE
+	applymovement 2, Route103_Movement_1A0839
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0833
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0835
+	waitmovement 0
+	msgbox Route103_Text_16D7A9, 4
+	switch VAR_STARTER_MON
+	case 0, Route103_EventScript_14EC8D
+	case 1, Route103_EventScript_14EC9D
+	case 2, Route103_EventScript_14ECAD
+	end
+
+Route103_EventScript_14EC5D:: @ 814EC5D
+	trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B
+	goto Route103_EventScript_14ECBD
+	end
+
+Route103_EventScript_14EC6D:: @ 814EC6D
+	trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B
+	goto Route103_EventScript_14ECBD
+	end
+
+Route103_EventScript_14EC7D:: @ 814EC7D
+	trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B
+	goto Route103_EventScript_14ECBD
+	end
+
+Route103_EventScript_14EC8D:: @ 814EC8D
+	trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836
+	goto Route103_EventScript_14ECCB
+	end
+
+Route103_EventScript_14EC9D:: @ 814EC9D
+	trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836
+	goto Route103_EventScript_14ECCB
+	end
+
+Route103_EventScript_14ECAD:: @ 814ECAD
+	trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836
+	goto Route103_EventScript_14ECCB
+	end
+
+Route103_EventScript_14ECBD:: @ 814ECBD
+	msgbox Route103_Text_16D688, 4
+	goto Route103_EventScript_14ECD9
+	end
+
+Route103_EventScript_14ECCB:: @ 814ECCB
+	msgbox Route103_Text_16D856, 4
+	goto Route103_EventScript_14ECD9
+	end
+
+Route103_EventScript_14ECD9:: @ 814ECD9
+	closemessage
+	switch FACING
+	case 1, Route103_EventScript_14ED29
+	case 2, Route103_EventScript_14ED0C
+	case 3, Route103_EventScript_14ED29
+	case 4, Route103_EventScript_14ED29
+	end
+
+Route103_EventScript_14ED0C:: @ 814ED0C
+	applymovement 2, Route103_Movement_14ED67
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_14ED6B
+	waitmovement 0
+	goto Route103_EventScript_14ED46
+	end
+
+Route103_EventScript_14ED29:: @ 814ED29
+	applymovement 2, Route103_Movement_14ED71
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_14ED74
+	waitmovement 0
+	goto Route103_EventScript_14ED46
+	end
+
+Route103_EventScript_14ED46:: @ 814ED46
+	removeobject 2
+	setvar VAR_ROUTE103_STATE, 1
+	setvar VAR_BIRCH_LAB_STATE, 4
+	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_DEFEATED_RIVAL_ROUTE103
+	setvar VAR_OLDALE_STATE, 1
+	clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+Route103_Movement_14ED67:: @ 814ED67
+	walk_left
+	walk_down
+	walk_down
+	end_movement
+
+Route103_Movement_14ED6B:: @ 814ED6B
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+Route103_Movement_14ED71:: @ 814ED71
+	walk_down
+	walk_down
+	end_movement
+
+Route103_Movement_14ED74:: @ 814ED74
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	end_movement
+
+Route103_EventScript_14ED79:: @ 814ED79
+	msgbox Route103_Text_16D950, 2
+	end
+
+Route103_EventScript_14ED82:: @ 814ED82
+	msgbox Route103_Text_16D996, 2
+	end
+
+Route103_EventScript_14ED8B:: @ 814ED8B
+	msgbox Route103_Text_16D9FB, 3
+	end
+
+Route103_EventScript_14ED94:: @ 814ED94
+	trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B
+	msgbox Route103_Text_1B7DB2, 6
+	end
+
+Route103_EventScript_14EDAB:: @ 814EDAB
+	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EDD6
+	msgbox Route103_Text_1B7E50, 6
+	end
+
+Route103_EventScript_14EDD6:: @ 814EDD6
+	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
+	msgbox Route103_Text_1B8053, 6
+	end
+
+Route103_EventScript_14EDF1:: @ 814EDF1
+	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EE1C
+	msgbox Route103_Text_1B7F40, 6
+	end
+
+Route103_EventScript_14EE1C:: @ 814EE1C
+	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
+	msgbox Route103_Text_1B814D, 6
+	end
+
+Route103_EventScript_14EE37:: @ 814EE37
+	trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258
+	msgbox Route103_Text_1B8281, 6
+	end
+
+Route103_EventScript_14EE4E:: @ 814EE4E
+	trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EE75
+	msgbox Route103_Text_1B830D, 6
+	end
+
+Route103_EventScript_14EE75:: @ 814EE75
+	trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C
+	msgbox Route103_Text_1B83A4, 6
+	end
diff --git a/data/text/maps/Route103.inc b/data/maps/Route103/text.inc
index ebdedea82..ebdedea82 100644
--- a/data/text/maps/Route103.inc
+++ b/data/maps/Route103/text.inc
diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc
index 61934c590..61934c590 100644
--- a/data/maps/events/Route104.inc
+++ b/data/maps/Route104/events.inc
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
index 71e7059b5..da47dab56 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -1,9 +1,9 @@
 Route104:: @ 830565C
-	.4byte Route104_MapAttributes
+	.4byte Route104_Layout
 	.4byte Route104_MapEvents
 	.4byte Route104_MapScripts
 	.4byte Route104_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 20
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104.inc b/data/maps/Route104/scripts.inc
index 8fda04ea5..8fda04ea5 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/maps/Route104/scripts.inc
diff --git a/data/text/maps/Route104.inc b/data/maps/Route104/text.inc
index 95f70a7ec..95f70a7ec 100644
--- a/data/text/maps/Route104.inc
+++ b/data/maps/Route104/text.inc
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc
index 9ae66cabb..9ae66cabb 100644
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/events.inc
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
index 3055a73d6..e5a626a43 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -1,9 +1,9 @@
 Route104_MrBrineysHouse:: @ 8306C20
-	.4byte Route104_MrBrineysHouse_MapAttributes
+	.4byte Route104_MrBrineysHouse_Layout
 	.4byte Route104_MrBrineysHouse_MapEvents
 	.4byte Route104_MrBrineysHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 102
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 514b1b9cc..514b1b9cc 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
diff --git a/data/text/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/text.inc
index 37fd0c0e1..37fd0c0e1 100644
--- a/data/text/maps/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/text.inc
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
index edf18089d..edf18089d 100644
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
index 3dae6a068..30e6625d8 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -1,9 +1,9 @@
 Route104_PrettyPetalFlowerShop:: @ 8306C3C
-	.4byte Route104_PrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 118
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 5e70a8ec2..5e70a8ec2 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc
index 2d7c90dc1..2d7c90dc1 100644
--- a/data/maps/events/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/events.inc
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
index 7f5115386..3fbbdad95 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -1,9 +1,9 @@
 Route104_Prototype:: @ 8307CF8
-	.4byte Route104_Prototype_MapAttributes
+	.4byte Route104_Prototype_Layout
 	.4byte Route104_Prototype_MapEvents
 	.4byte Route104_Prototype_MapScripts
 	.4byte 0x0
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 288
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc
index e0aba01c9..e0aba01c9 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/scripts.inc
diff --git a/data/text/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/text.inc
index 7ce19f609..7ce19f609 100644
--- a/data/text/maps/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/text.inc
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
index 89ceb8270..89ceb8270 100644
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index 51b27eb0a..f7b4982aa 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -1,9 +1,9 @@
 Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14
-	.4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 118
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
index f979ab60b..f979ab60b 100644
--- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
diff --git a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc
index 3ec76ff55..3ec76ff55 100644
--- a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc
diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc
index 999966093..999966093 100644
--- a/data/maps/events/Route105.inc
+++ b/data/maps/Route105/events.inc
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
index 344b8f634..79fedb244 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -1,9 +1,9 @@
 Route105:: @ 8305678
-	.4byte Route105_MapAttributes
+	.4byte Route105_Layout
 	.4byte Route105_MapEvents
 	.4byte Route105_MapScripts
 	.4byte Route105_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 21
 	.byte 20
 	.byte 0
diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc
index 305a2e9af..305a2e9af 100644
--- a/data/scripts/maps/Route105.inc
+++ b/data/maps/Route105/scripts.inc
diff --git a/data/text/maps/Route105.inc b/data/maps/Route105/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route105.inc
+++ b/data/maps/Route105/text.inc
diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc
index 55f395ded..55f395ded 100644
--- a/data/maps/events/Route106.inc
+++ b/data/maps/Route106/events.inc
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index 494690340..bf8dd9626 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,9 +1,9 @@
 Route106:: @ 8305694
-	.4byte Route106_MapAttributes
+	.4byte Route106_Layout
 	.4byte Route106_MapEvents
 	.4byte Route106_MapScripts
 	.4byte Route106_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 22
 	.byte 21
 	.byte 0
diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc
index ae65c7013..ae65c7013 100644
--- a/data/scripts/maps/Route106.inc
+++ b/data/maps/Route106/scripts.inc
diff --git a/data/text/maps/Route106.inc b/data/maps/Route106/text.inc
index 38e92c65d..38e92c65d 100644
--- a/data/text/maps/Route106.inc
+++ b/data/maps/Route106/text.inc
diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc
index 9bdeaf3b0..9bdeaf3b0 100644
--- a/data/maps/events/Route107.inc
+++ b/data/maps/Route107/events.inc
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index 382b617ba..19ba4ebd6 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,9 +1,9 @@
 Route107:: @ 83056B0
-	.4byte Route107_MapAttributes
+	.4byte Route107_Layout
 	.4byte Route107_MapEvents
 	.4byte Route107_MapScripts
 	.4byte Route107_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 23
 	.byte 22
 	.byte 0
diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc
index ad2d293fc..ad2d293fc 100644
--- a/data/scripts/maps/Route107.inc
+++ b/data/maps/Route107/scripts.inc
diff --git a/data/text/maps/Route107.inc b/data/maps/Route107/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route107.inc
+++ b/data/maps/Route107/text.inc
diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc
index 997fb5ce2..997fb5ce2 100644
--- a/data/maps/events/Route108.inc
+++ b/data/maps/Route108/events.inc
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
index 3214f7b89..0169859e0 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -1,9 +1,9 @@
 Route108:: @ 83056CC
-	.4byte Route108_MapAttributes
+	.4byte Route108_Layout
 	.4byte Route108_MapEvents
 	.4byte Route108_MapScripts
 	.4byte Route108_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 24
 	.byte 23
 	.byte 0
diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc
index 2e40c882d..2e40c882d 100644
--- a/data/scripts/maps/Route108.inc
+++ b/data/maps/Route108/scripts.inc
diff --git a/data/text/maps/Route108.inc b/data/maps/Route108/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route108.inc
+++ b/data/maps/Route108/text.inc
diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc
index 7376fd4bf..7376fd4bf 100644
--- a/data/maps/events/Route109.inc
+++ b/data/maps/Route109/events.inc
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
index db91d1368..95c3cfaeb 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -1,9 +1,9 @@
 Route109:: @ 83056E8
-	.4byte Route109_MapAttributes
+	.4byte Route109_Layout
 	.4byte Route109_MapEvents
 	.4byte Route109_MapScripts
 	.4byte Route109_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 25
 	.byte 24
 	.byte 0
diff --git a/data/scripts/maps/Route109.inc b/data/maps/Route109/scripts.inc
index 6f24b2142..6f24b2142 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/maps/Route109/scripts.inc
diff --git a/data/text/maps/Route109.inc b/data/maps/Route109/text.inc
index a86efa2c4..a86efa2c4 100644
--- a/data/text/maps/Route109.inc
+++ b/data/maps/Route109/text.inc
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc
index f82513f08..f82513f08 100644
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/events.inc
diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
index 064d428bd..6677181f7 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -1,9 +1,9 @@
 Route109_SeashoreHouse:: @ 8307D30
-	.4byte Route109_SeashoreHouse_MapAttributes
+	.4byte Route109_SeashoreHouse_Layout
 	.4byte Route109_SeashoreHouse_MapEvents
 	.4byte Route109_SeashoreHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 244
 	.byte 24
 	.byte 0
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index 13d37e7bd..13d37e7bd 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
diff --git a/data/text/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/text.inc
index ebd6f05e5..ebd6f05e5 100644
--- a/data/text/maps/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/text.inc
diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc
index eb032e0cc..eb032e0cc 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/Route110/events.inc
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
index 442a02ccb..952233450 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -1,9 +1,9 @@
 Route110:: @ 8305704
-	.4byte Route110_MapAttributes
+	.4byte Route110_Layout
 	.4byte Route110_MapEvents
 	.4byte Route110_MapScripts
 	.4byte Route110_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 26
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
new file mode 100644
index 000000000..36e5cd7a2
--- /dev/null
+++ b/data/maps/Route110/scripts.inc
@@ -0,0 +1,539 @@
+Route110_MapScripts:: @ 814F900
+	map_script 5, Route110_MapScript1_14F910
+	map_script 3, Route110_MapScript1_14F914
+	map_script 2, Route110_MapScript2_14F933
+	.byte 0
+
+Route110_MapScript1_14F910:: @ 814F910
+	special UpdateCyclingRoadState
+	end
+
+Route110_MapScript1_14F914:: @ 814F914
+	call Route110_EventScript_1A0196
+	call Route110_EventScript_1A014E
+	call Route110_EventScript_1A0172
+	compare VAR_CYCLING_CHALLENGE_STATE, 1
+	call_if_eq Route110_EventScript_14F92F
+	end
+
+Route110_EventScript_14F92F:: @ 814F92F
+	savebgm MUS_CYCLING
+	return
+
+Route110_MapScript2_14F933:: @ 814F933
+	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D
+	.2byte 0
+
+Route110_EventScript_14F93D:: @ 814F93D
+	special ScrSpecial_BeginCyclingRoadChallenge
+	setvar VAR_CYCLING_CHALLENGE_STATE, 2
+	return
+
+Route110_EventScript_14F946:: @ 814F946
+	lock
+	faceplayer
+	msgbox Route110_Text_16E6C0, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F95C:: @ 814F95C
+	lock
+	faceplayer
+	msgbox Route110_Text_16E6F2, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F972:: @ 814F972
+	lock
+	faceplayer
+	msgbox Route110_Text_16E729, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F988:: @ 814F988
+	lock
+	faceplayer
+	msgbox Route110_Text_16E76A, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F99E:: @ 814F99E
+	msgbox Route110_Text_16EB22, 2
+	end
+
+Route110_EventScript_14F9A7:: @ 814F9A7
+	msgbox Route110_Text_16EB65, 2
+	end
+
+Route110_EventScript_14F9B0:: @ 814F9B0
+	msgbox Route110_Text_16EBC9, 2
+	end
+
+Route110_EventScript_14F9B9:: @ 814F9B9
+	msgbox Route110_Text_16EDC5, 2
+	end
+
+Route110_EventScript_14F9C2:: @ 814F9C2
+	msgbox Route110_Text_16EE30, 2
+	end
+
+Route110_EventScript_14F9CB:: @ 814F9CB
+	msgbox Route110_Text_16EE74, 2
+	end
+
+Route110_EventScript_14F9D4:: @ 814F9D4
+	msgbox Route110_Text_16EEF6, 2
+	end
+
+Route110_EventScript_14F9DD:: @ 814F9DD
+	msgbox Route110_Text_16F381, 3
+	end
+
+Route110_EventScript_14F9E6:: @ 814F9E6
+	msgbox Route110_Text_16F39C, 3
+	end
+
+Route110_EventScript_14F9EF:: @ 814F9EF
+	msgbox Route110_Text_16F3B1, 3
+	end
+
+Route110_EventScript_14F9F8:: @ 814F9F8
+	msgbox Route110_Text_16F3E9, 3
+	end
+
+Route110_EventScript_14FA01:: @ 814FA01
+	msgbox Route110_Text_16F3FF, 3
+	end
+
+Route110_EventScript_14FA0A:: @ 814FA0A
+	msgbox Route110_Text_16F40F, 3
+	end
+
+Route110_EventScript_14FA13:: @ 814FA13
+	msgbox Route110_Text_16F429, 3
+	end
+
+Route110_EventScript_14FA1C:: @ 814FA1C
+	msgbox Route110_Text_16F4AE, 3
+	end
+
+Route110_EventScript_14FA25:: @ 814FA25
+	msgbox Route110_Text_16F4F7, 3
+	end
+
+Route110_EventScript_14FA2E:: @ 814FA2E
+	lockall
+	specialvar RESULT, GetRecordedCyclingRoadResults
+	compare RESULT, 0
+	goto_if_eq Route110_EventScript_14FA49
+	msgbox Route110_Text_16F53A, 4
+	releaseall
+	end
+
+Route110_EventScript_14FA49:: @ 814FA49
+	msgbox Route110_Text_16F57C, 4
+	releaseall
+	end
+
+Route110_EventScript_14FA53:: @ 814FA53
+	lock
+	faceplayer
+	specialvar RESULT, GetPlayerAvatarBike
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FA84
+	compare VAR_CYCLING_CHALLENGE_STATE, 0
+	goto_if_eq Route110_EventScript_14FA7A
+	msgbox Route110_Text_16F26A, 4
+	release
+	end
+
+Route110_EventScript_14FA7A:: @ 814FA7A
+	msgbox Route110_Text_16F1D0, 4
+	release
+	end
+
+Route110_EventScript_14FA84:: @ 814FA84
+	msgbox Route110_Text_16F2C4, 4
+	release
+	end
+
+Route110_EventScript_14FA8E:: @ 814FA8E
+	trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2
+	msgbox Route110_Text_1BA6F8, 6
+	end
+
+Route110_EventScript_14FAA5:: @ 814FAA5
+	trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759
+	msgbox Route110_Text_1BA76C, 6
+	end
+
+Route110_EventScript_14FABC:: @ 814FABC
+	trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FAE3
+	msgbox Route110_Text_1BA829, 6
+	end
+
+Route110_EventScript_14FAE3:: @ 814FAE3
+	trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD
+	msgbox Route110_Text_1BA8E9, 6
+	end
+
+Route110_EventScript_14FAFA:: @ 814FAFA
+	trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C
+	msgbox Route110_Text_1BA94A, 6
+	end
+
+Route110_EventScript_14FB11:: @ 814FB11
+	trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264
+	msgbox Route110_Text_1BA27C, 6
+	end
+
+Route110_EventScript_14FB28:: @ 814FB28
+	trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC
+	msgbox Route110_Text_1BA30C, 6
+	end
+
+Route110_EventScript_14FB3F:: @ 814FB3F
+	trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FB66
+	msgbox Route110_Text_1BA3A5, 6
+	end
+
+Route110_EventScript_14FB66:: @ 814FB66
+	trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432
+	msgbox Route110_Text_1BA456, 6
+	end
+
+Route110_EventScript_14FB7D:: @ 814FB7D
+	trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C
+	msgbox Route110_Text_1BA65F, 6
+	end
+
+Route110_EventScript_14FB94:: @ 814FB94
+	trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FBBB
+	msgbox Route110_Text_1BA52E, 6
+	end
+
+Route110_EventScript_14FBBB:: @ 814FBBB
+	trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1
+	msgbox Route110_Text_1BA5C4, 6
+	end
+
+Route110_EventScript_14FBD2:: @ 814FBD2
+	trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FBF9
+	msgbox Route110_Text_1BA9E9, 6
+	end
+
+Route110_EventScript_14FBF9:: @ 814FBF9
+	trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76
+	msgbox Route110_Text_1BAA8F, 6
+	end
+
+Route110_EventScript_14FC10:: @ 814FC10
+	trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7
+	msgbox Route110_Text_1BAB19, 6
+	end
+
+Route110_EventScript_14FC27:: @ 814FC27
+	lockall
+	applymovement 21, Route110_Movement_1A0843
+	waitmovement 0
+	call Route110_EventScript_14FC39
+	releaseall
+	end
+
+Route110_EventScript_14FC39:: @ 814FC39
+	special FinishCyclingRoadChallenge
+	msgbox Route110_Text_16EF65, 4
+	switch RESULT
+	case 10, Route110_EventScript_14FCC3
+	case 9, Route110_EventScript_14FCD1
+	case 8, Route110_EventScript_14FCD1
+	case 7, Route110_EventScript_14FCD1
+	case 6, Route110_EventScript_14FCDF
+	case 5, Route110_EventScript_14FCDF
+	case 4, Route110_EventScript_14FCDF
+	case 3, Route110_EventScript_14FCED
+	case 2, Route110_EventScript_14FCED
+	case 1, Route110_EventScript_14FCED
+	case 0, Route110_EventScript_14FCFB
+	end
+
+Route110_EventScript_14FCC3:: @ 814FCC3
+	msgbox Route110_Text_16EF9F, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCD1:: @ 814FCD1
+	msgbox Route110_Text_16F012, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCDF:: @ 814FCDF
+	msgbox Route110_Text_16F069, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCED:: @ 814FCED
+	msgbox Route110_Text_16F0D0, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCFB:: @ 814FCFB
+	msgbox Route110_Text_16F139, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FD09:: @ 814FD09
+	setvar VAR_CYCLING_CHALLENGE_STATE, 3
+	savebgm 0
+	fadedefaultbgm
+	return
+
+Route110_EventScript_14FD13:: @ 814FD13
+	setvar VAR_SPECIAL_8, 1
+	goto Route110_EventScript_14FD34
+	end
+
+Route110_EventScript_14FD1E:: @ 814FD1E
+	setvar VAR_SPECIAL_8, 2
+	goto Route110_EventScript_14FD34
+	end
+
+Route110_EventScript_14FD29:: @ 814FD29
+	setvar VAR_SPECIAL_8, 3
+	goto Route110_EventScript_14FD34
+	end
+
+Route110_EventScript_14FD34:: @ 814FD34
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq Route110_EventScript_14FDA7
+	compare RESULT, 1
+	call_if_eq Route110_EventScript_14FDAC
+	applymovement 28, Route110_Movement_1A0845
+	waitmovement 0
+	applymovement 28, Route110_Movement_1A0833
+	waitmovement 0
+	applymovement 28, Route110_Movement_1A0835
+	waitmovement 0
+	delay 30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq Route110_EventScript_14FF14
+	compare VAR_SPECIAL_8, 2
+	call_if_eq Route110_EventScript_14FF1F
+	compare VAR_SPECIAL_8, 3
+	call_if_eq Route110_EventScript_14FF2A
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq Route110_EventScript_14FDB1
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FE2B
+	releaseall
+	end
+
+Route110_EventScript_14FDA7:: @ 814FDA7
+	playbgm MUS_GIRL_SUP, TRUE
+	return
+
+Route110_EventScript_14FDAC:: @ 814FDAC
+	playbgm MUS_BOY_SUP, TRUE
+	return
+
+Route110_EventScript_14FDB1:: @ 814FDB1
+	msgbox Route110_Text_16E7A1, 4
+	switch VAR_STARTER_MON
+	case 0, Route110_EventScript_14FDE0
+	case 1, Route110_EventScript_14FDF0
+	case 2, Route110_EventScript_14FE00
+	end
+
+Route110_EventScript_14FDE0:: @ 814FDE0
+	trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826
+	goto Route110_EventScript_14FE10
+	end
+
+Route110_EventScript_14FDF0:: @ 814FDF0
+	trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826
+	goto Route110_EventScript_14FE10
+	end
+
+Route110_EventScript_14FE00:: @ 814FE00
+	trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826
+	goto Route110_EventScript_14FE10
+	end
+
+Route110_EventScript_14FE10:: @ 814FE10
+	msgbox Route110_Text_16E84C, 4
+	call Route110_EventScript_14FEA5
+	msgbox Route110_Text_16E8B3, 4
+	goto Route110_EventScript_14FEB2
+	end
+
+Route110_EventScript_14FE2B:: @ 814FE2B
+	msgbox Route110_Text_16E99A, 4
+	switch VAR_STARTER_MON
+	case 0, Route110_EventScript_14FE5A
+	case 1, Route110_EventScript_14FE6A
+	case 2, Route110_EventScript_14FE7A
+	end
+
+Route110_EventScript_14FE5A:: @ 814FE5A
+	trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F
+	goto Route110_EventScript_14FE8A
+	end
+
+Route110_EventScript_14FE6A:: @ 814FE6A
+	trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F
+	goto Route110_EventScript_14FE8A
+	end
+
+Route110_EventScript_14FE7A:: @ 814FE7A
+	trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F
+	goto Route110_EventScript_14FE8A
+	end
+
+Route110_EventScript_14FE8A:: @ 814FE8A
+	msgbox Route110_Text_16EA2A, 4
+	call Route110_EventScript_14FEA5
+	msgbox Route110_Text_16EA7B, 4
+	goto Route110_EventScript_14FEB2
+	end
+
+Route110_EventScript_14FEA5:: @ 814FEA5
+	giveitem_std ITEM_ITEMFINDER
+	return
+
+Route110_EventScript_14FEB2:: @ 814FEB2
+	closemessage
+	compare VAR_SPECIAL_8, 1
+	call_if_eq Route110_EventScript_14FF56
+	compare VAR_SPECIAL_8, 2
+	call_if_eq Route110_EventScript_14FF5E
+	compare VAR_SPECIAL_8, 3
+	call_if_eq Route110_EventScript_14FF66
+	setobjectmovementtype 28, 10
+	setobjectmovementtype 29, 10
+	removeobject 28
+	addobject 29
+	delay 45
+	compare VAR_SPECIAL_8, 1
+	call_if_eq Route110_EventScript_14FF35
+	compare VAR_SPECIAL_8, 2
+	call_if_eq Route110_EventScript_14FF40
+	compare VAR_SPECIAL_8, 3
+	call_if_eq Route110_EventScript_14FF4B
+	removeobject 29
+	setvar VAR_ROUTE110_STATE, 1
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+Route110_EventScript_14FF14:: @ 814FF14
+	applymovement 28, Route110_Movement_14FF6E
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF1F:: @ 814FF1F
+	applymovement 28, Route110_Movement_14FF72
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF2A:: @ 814FF2A
+	applymovement 28, Route110_Movement_14FF74
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF35:: @ 814FF35
+	applymovement 29, Route110_Movement_14FF78
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF40:: @ 814FF40
+	applymovement 29, Route110_Movement_14FF80
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF4B:: @ 814FF4B
+	applymovement 29, Route110_Movement_14FF89
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF56:: @ 814FF56
+	setobjectxyperm 29, 33, 55
+	return
+
+Route110_EventScript_14FF5E:: @ 814FF5E
+	setobjectxyperm 29, 34, 55
+	return
+
+Route110_EventScript_14FF66:: @ 814FF66
+	setobjectxyperm 29, 35, 55
+	return
+
+Route110_Movement_14FF6E:: @ 814FF6E
+	walk_down
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+Route110_Movement_14FF72:: @ 814FF72
+	walk_down
+	end_movement
+
+Route110_Movement_14FF74:: @ 814FF74
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+Route110_Movement_14FF78:: @ 814FF78
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route110_Movement_14FF80:: @ 814FF80
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_down
+	end_movement
+
+Route110_Movement_14FF89:: @ 814FF89
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
diff --git a/data/text/maps/Route110.inc b/data/maps/Route110/text.inc
index 78be8d595..78be8d595 100644
--- a/data/text/maps/Route110.inc
+++ b/data/maps/Route110/text.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
index 0474772cb..0474772cb 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
index 749ab18e9..1fb9928b3 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
@@ -1,9 +1,9 @@
 Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C
-	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes
+	.4byte Route110_SeasideCyclingRoadEntrace_Layout
 	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents
 	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 257
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
index 8d6465c89..8d6465c89 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
diff --git a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc
index 8d5a0433e..8d5a0433e 100644
--- a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
index 996562b61..996562b61 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
index a4bd0cbd7..a4da7397c 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
@@ -1,9 +1,9 @@
 Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes
+	.4byte Route110_SeasideCyclingRoadEntrace_Layout
 	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents
 	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 257
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
index edae49291..edae49291 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
diff --git a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc
index 77bf90751..77bf90751 100644
--- a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc
diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc
index 4b7e39efd..4b7e39efd 100644
--- a/data/maps/events/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/events.inc
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
index f2b2c691d..14997e663 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHouseCorridor:: @ 8307D84
-	.4byte Route110_TrickHouseCorridor_MapAttributes
+	.4byte Route110_TrickHouseCorridor_Layout
 	.4byte Route110_TrickHouseCorridor_MapEvents
 	.4byte Route110_TrickHouseCorridor_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 247
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index be70476e6..be70476e6 100644
--- a/data/scripts/maps/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc
index 732c6c705..732c6c705 100644
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ b/data/maps/Route110_TrickHouseEnd/events.inc
diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
index d61808d7f..58ca3e71d 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHouseEnd:: @ 8307D68
-	.4byte Route110_TrickHouseEnd_MapAttributes
+	.4byte Route110_TrickHouseEnd_Layout
 	.4byte Route110_TrickHouseEnd_MapEvents
 	.4byte Route110_TrickHouseEnd_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 246
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index ca992427c..ca992427c 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
diff --git a/data/text/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/text.inc
index 03f2252fd..03f2252fd 100644
--- a/data/text/maps/Route110_TrickHouseEnd.inc
+++ b/data/maps/Route110_TrickHouseEnd/text.inc
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc
index 07c5a6555..07c5a6555 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ b/data/maps/Route110_TrickHouseEntrance/events.inc
diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
index 80d6c597f..8146c2fa0 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHouseEntrance:: @ 8307D4C
-	.4byte Route110_TrickHouseEntrance_MapAttributes
+	.4byte Route110_TrickHouseEntrance_Layout
 	.4byte Route110_TrickHouseEntrance_MapEvents
 	.4byte Route110_TrickHouseEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 245
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
new file mode 100644
index 000000000..79f52f7bf
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -0,0 +1,759 @@
+Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
+	map_script 3, Route110_TrickHouseEntrance_MapScript1_160F3B
+	map_script 2, Route110_TrickHouseEntrance_MapScript2_1611CD
+	map_script 4, Route110_TrickHouseEntrance_MapScript2_1610B2
+	.byte 0
+
+Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
+	setflag FLAG_LANDMARK_TRICK_HOUSE
+	compare VAR_TRICK_HOUSE_STATE, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE
+	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
+	case 0, Route110_TrickHouseEntrance_EventScript_16109A
+	case 1, Route110_TrickHouseEntrance_EventScript_1610A0
+	case 3, Route110_TrickHouseEntrance_EventScript_1610A6
+	case 4, Route110_TrickHouseEntrance_EventScript_1610AC
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE
+	setvar VAR_TRICK_HOUSE_STATE, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16103C
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161046
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161050
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16105A
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161064
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16106E
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161078
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161082
+	return
+
+Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
+	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
+	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
+	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
+	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
+	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
+	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
+	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	return
+
+Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E
+	setobjectxyperm 1, 5, 2
+	setobjectmovementtype 1, 4
+	end
+
+Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
+	end
+
+Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE
+	.2byte 0
+
+Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4
+	addobject 1
+	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	turnobject 1, 4
+	turnobject 255, 3
+	end
+
+Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105
+	addobject 1
+	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
+	case 0, Route110_TrickHouseEntrance_EventScript_16116B
+	case 1, Route110_TrickHouseEntrance_EventScript_161173
+	case 2, Route110_TrickHouseEntrance_EventScript_161193
+	case 3, Route110_TrickHouseEntrance_EventScript_161183
+	case 4, Route110_TrickHouseEntrance_EventScript_16118B
+	case 5, Route110_TrickHouseEntrance_EventScript_16117B
+	case 6, Route110_TrickHouseEntrance_EventScript_16119B
+	case 7, Route110_TrickHouseEntrance_EventScript_1611A3
+	end
+
+Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B
+	setobjectxy 1, 6, 3
+	end
+
+Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173
+	setobjectxy 1, 11, 5
+	end
+
+Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B
+	setobjectxy 1, 11, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183
+	setobjectxy 1, 3, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B
+	setobjectxy 1, 0, 5
+	end
+
+Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193
+	setobjectxy 1, 9, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B
+	setobjectxy 1, 8, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3
+	setobjectxy 1, 4, 4
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB
+	removeobject 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF
+	addobject 1
+	setobjectxy 1, 5, 2
+	turnobject 1, 2
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE
+	addobject 1
+	setobjectxy 1, 5, 2
+	turnobject 1, 1
+	end
+
+Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7
+	.2byte 0
+
+Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
+	lockall
+	delay 20
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161327
+	msgbox Route110_TrickHouseEntrance_Text_19BD82, 4
+	closemessage
+	delay 20
+	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
+	waitmovement 0
+	removeobject 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
+	releaseall
+	end
+
+@ 8161218
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A
+	lockall
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
+	case 0, Route110_TrickHouseEntrance_EventScript_16124D
+	case 2, Route110_TrickHouseEntrance_EventScript_16136E
+	case 3, Route110_TrickHouseEntrance_EventScript_161330
+	case 6, Route110_TrickHouseEntrance_EventScript_161518
+	end
+
+Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
+	playse SE_PIN
+	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833
+	waitmovement 0
+	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835
+	waitmovement 0
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161303
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16130C
+	closemessage
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
+	warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1612CD:: @ 81612CD
+	msgbox Route110_TrickHouseEntrance_Text_19BA6E, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612D6:: @ 81612D6
+	msgbox Route110_TrickHouseEntrance_Text_19BAC0, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612DF:: @ 81612DF
+	msgbox Route110_TrickHouseEntrance_Text_19BB11, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612E8:: @ 81612E8
+	msgbox Route110_TrickHouseEntrance_Text_19BB61, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612F1:: @ 81612F1
+	msgbox Route110_TrickHouseEntrance_Text_19BBB4, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612FA:: @ 81612FA
+	msgbox Route110_TrickHouseEntrance_Text_19BC04, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_161303:: @ 8161303
+	msgbox Route110_TrickHouseEntrance_Text_19BC55, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C
+	msgbox Route110_TrickHouseEntrance_Text_19BCA8, 4
+	return
+
+Route110_TrickHouseEnd_Movement_161315:: @ 8161315
+Route110_TrickHouseEntrance_Movement_161315:: @ 8161315
+	face_up
+	delay_4
+	face_left
+	delay_4
+	face_down
+	delay_4
+	face_right
+	delay_4
+	end_movement
+
+Route110_TrickHouseEnd_Movement_16131E:: @ 816131E
+Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E
+	face_up
+	disable_anim
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	end_movement
+
+Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327
+	msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330
+	msgbox Route110_TrickHouseEntrance_Text_19BF19, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_19C07E, 4
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161426
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161452
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6
+	end
+
+Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
+	giveitem_std ITEM_RARE_CANDY
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
+	giveitem_std ITEM_TIMER_BALL
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
+	giveitem_std ITEM_HARD_STONE
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
+	giveitem_std ITEM_SMOKE_BALL
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
+	giveitem_std ITEM_TM12_TAUNT
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
+	giveitem_std ITEM_MAGNET
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6
+	giveitem_std ITEM_PP_MAX
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_19C128, 4
+	.ifdef SAPPHIRE
+	givedecoration_std DECOR_BLUE_TENT
+	.else
+	givedecoration_std DECOR_RED_TENT
+	.endif
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161551
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8
+	msgbox Route110_TrickHouseEntrance_Text_19C18D, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551
+	msgbox Route110_TrickHouseEntrance_Text_19C17E, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_16309F
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
+	waitmovement 0
+	removeobject 1
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A
+	lockall
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
+	case 0, Route110_TrickHouseEntrance_EventScript_1615BD
+	case 1, Route110_TrickHouseEntrance_EventScript_1615C7
+	case 4, Route110_TrickHouseEntrance_EventScript_1616B8
+	case 5, Route110_TrickHouseEntrance_EventScript_1616C2
+	end
+
+Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD
+	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7
+	msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO
+	closemessage
+	compare RESULT, YES
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
+	setmetatile 5, 1, 537, 0
+	special DrawWholeMapView
+	delay 20
+	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856
+	waitmovement 0
+	applymovement 255, Route110_TrickHouseEntrance_Movement_16165E
+	waitmovement 0
+	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
+	case 0, Route110_TrickHouseEntrance_EventScript_161660
+	case 1, Route110_TrickHouseEntrance_EventScript_16166B
+	case 2, Route110_TrickHouseEntrance_EventScript_161676
+	case 3, Route110_TrickHouseEntrance_EventScript_161681
+	case 4, Route110_TrickHouseEntrance_EventScript_16168C
+	case 5, Route110_TrickHouseEntrance_EventScript_161697
+	case 6, Route110_TrickHouseEntrance_EventScript_1616A2
+	case 7, Route110_TrickHouseEntrance_EventScript_1616AD
+	end
+
+Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E
+	set_invisible
+	end_movement
+
+Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8
+	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7
+	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7
+	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
+	releaseall
+	end
+
+gUnknown_081616E1:: @ 81616E1
+	lockall
+	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
+	case 0, Route110_TrickHouseEntrance_EventScript_161740
+	case 1, Route110_TrickHouseEntrance_EventScript_161769
+	case 2, Route110_TrickHouseEntrance_EventScript_161792
+	case 3, Route110_TrickHouseEntrance_EventScript_1617BB
+	case 4, Route110_TrickHouseEntrance_EventScript_1617E4
+	case 5, Route110_TrickHouseEntrance_EventScript_16180D
+	case 6, Route110_TrickHouseEntrance_EventScript_161836
+	case 7, Route110_TrickHouseEntrance_EventScript_16185F
+	end
+
+Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819CAD1, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
+	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819CCCB, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
+	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819CEF9, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
+	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819D164, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
+	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819D3A5, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
+	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819DC0A, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819DE8D, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
+	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819E0FF, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888
+	msgbox UnknownString_819C21F, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle1_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle2_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle3_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle4_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle5_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle6_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle7_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle8_EventScript_161892:: @ 8161892
+	msgbox Route110_TrickHousePuzzle1_Text_19C1FF, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle1_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle2_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle3_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle4_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C
+	playfanfare MUS_FANFA4
+	message Route110_TrickHousePuzzle1_Text_19C1B8
+	waitfanfare
+	waitmessage
+	msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0
+	lockall
+	msgbox Route110_TrickHouseEntrance_Text_19BA56, 4
+	releaseall
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16190B
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1
+	setvar VAR_SPECIAL_4, 6
+	setvar VAR_SPECIAL_5, 3
+	setvar VAR_SPECIAL_6, 0
+	call Route110_TrickHouseEntrance_EventScript_161920
+	return
+
+Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6
+	setvar VAR_SPECIAL_4, 11
+	setvar VAR_SPECIAL_5, 5
+	setvar VAR_SPECIAL_6, 0
+	call Route110_TrickHouseEntrance_EventScript_161920
+	return
+
+Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B
+	setvar VAR_SPECIAL_4, 9
+	setvar VAR_SPECIAL_5, 2
+	setvar VAR_SPECIAL_6, 0
+	call Route110_TrickHouseEntrance_EventScript_161920
+	return
+
+Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920
+	setfieldeffectargument 0, 32772
+	setfieldeffectargument 1, 32773
+	setfieldeffectargument 2, 32774
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
+	delay 10
+	return
diff --git a/data/text/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/text.inc
index fe39a4441..fe39a4441 100644
--- a/data/text/maps/Route110_TrickHouseEntrance.inc
+++ b/data/maps/Route110_TrickHouseEntrance/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc
index ef5b7732f..ef5b7732f 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
index c4c87877c..18d772089 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle1:: @ 8307DA0
-	.4byte Route110_TrickHousePuzzle1_MapAttributes
+	.4byte Route110_TrickHousePuzzle1_Layout
 	.4byte Route110_TrickHousePuzzle1_MapEvents
 	.4byte Route110_TrickHousePuzzle1_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 248
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index df0484baf..df0484baf 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/text.inc
index 84208ead5..84208ead5 100644
--- a/data/text/maps/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc
index c815a1624..c815a1624 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
index d278ca3aa..489d213d9 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle2:: @ 8307DBC
-	.4byte Route110_TrickHousePuzzle2_MapAttributes
+	.4byte Route110_TrickHousePuzzle2_Layout
 	.4byte Route110_TrickHousePuzzle2_MapEvents
 	.4byte Route110_TrickHousePuzzle2_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 249
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index cdde15d1a..cdde15d1a 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/text.inc
index cb64f04d8..cb64f04d8 100644
--- a/data/text/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc
index e45f2d33b..e45f2d33b 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 736a1dc19..c8b2da4a3 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle3:: @ 8307DD8
-	.4byte Route110_TrickHousePuzzle3_MapAttributes
+	.4byte Route110_TrickHousePuzzle3_Layout
 	.4byte Route110_TrickHousePuzzle3_MapEvents
 	.4byte Route110_TrickHousePuzzle3_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 250
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index 14a021e8d..14a021e8d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/text.inc
index 01287a068..01287a068 100644
--- a/data/text/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc
index 4d7189920..4d7189920 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
index f4117a578..b06a1404f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle4:: @ 8307DF4
-	.4byte Route110_TrickHousePuzzle4_MapAttributes
+	.4byte Route110_TrickHousePuzzle4_Layout
 	.4byte Route110_TrickHousePuzzle4_MapEvents
 	.4byte Route110_TrickHousePuzzle4_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 251
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index 3808f1f2d..3808f1f2d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/text.inc
index 293e5ab93..293e5ab93 100644
--- a/data/text/maps/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc
index 66884fc3d..66884fc3d 100644
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
index 7216f556e..dc42453f4 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle5:: @ 8307E10
-	.4byte Route110_TrickHousePuzzle5_MapAttributes
+	.4byte Route110_TrickHousePuzzle5_Layout
 	.4byte Route110_TrickHousePuzzle5_MapEvents
 	.4byte Route110_TrickHousePuzzle5_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 252
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index a7f283b2d..a7f283b2d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/text.inc
index 8cddc3f65..8cddc3f65 100644
--- a/data/text/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
index 6ac299c5f..6ac299c5f 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
index 5ffc844bd..3377987da 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle6:: @ 8307E2C
-	.4byte Route110_TrickHousePuzzle6_MapAttributes
+	.4byte Route110_TrickHousePuzzle6_Layout
 	.4byte Route110_TrickHousePuzzle6_MapEvents
 	.4byte Route110_TrickHousePuzzle6_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 253
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 971d2a275..971d2a275 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/text.inc
index 7fb5aa914..7fb5aa914 100644
--- a/data/text/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc
index d57546ce1..d57546ce1 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
index cea170daa..84014fdb5 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle7:: @ 8307E48
-	.4byte Route110_TrickHousePuzzle7_MapAttributes
+	.4byte Route110_TrickHousePuzzle7_Layout
 	.4byte Route110_TrickHousePuzzle7_MapEvents
 	.4byte Route110_TrickHousePuzzle7_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 254
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index 1ee608166..1ee608166 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/text.inc
index e8ce4b3a4..e8ce4b3a4 100644
--- a/data/text/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/text.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
index 481b2d926..481b2d926 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/events.inc
diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc
index 6a4dc7051..ede90bbe4 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle8:: @ 8307E64
-	.4byte Route110_TrickHousePuzzle8_MapAttributes
+	.4byte Route110_TrickHousePuzzle8_Layout
 	.4byte Route110_TrickHousePuzzle8_MapEvents
 	.4byte Route110_TrickHousePuzzle8_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 255
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index 2c55aae4c..2c55aae4c 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/text.inc
index 8b0025bfb..8b0025bfb 100644
--- a/data/text/maps/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/text.inc
diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc
index 837c17c39..837c17c39 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/Route111/events.inc
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
index 5af1fb1c2..3dd09e33b 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -1,9 +1,9 @@
 Route111:: @ 8305720
-	.4byte Route111_MapAttributes
+	.4byte Route111_Layout
 	.4byte Route111_MapEvents
 	.4byte Route111_MapScripts
 	.4byte Route111_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 27
 	.byte 26
 	.byte 0
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
new file mode 100644
index 000000000..e554de5f4
--- /dev/null
+++ b/data/maps/Route111/scripts.inc
@@ -0,0 +1,442 @@
+Route111_MapScripts:: @ 814FF91
+	map_script 1, Route111_MapScript1_14FF9C
+	map_script 3, Route111_MapScript1_14FFB9
+	.byte 0
+
+Route111_MapScript1_14FF9C:: @ 814FF9C
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6
+	end
+
+Route111_EventScript_14FFA6:: @ 814FFA6
+	setmetatile 29, 86, 124, 1
+	setmetatile 29, 87, 145, 1
+	return
+
+Route111_MapScript1_14FFB9:: @ 814FFB9
+	call Route111_EventScript_14FFCD
+	call Route111_EventScript_1AE313
+	goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D
+	end
+
+Route111_EventScript_14FFCD:: @ 814FFCD
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_1, 34
+	goto_if_lt Route111_EventScript_15000C
+	compare VAR_TEMP_1, 107
+	goto_if_gt Route111_EventScript_15000C
+	compare VAR_TEMP_1, 72
+	goto_if_gt Route111_EventScript_150009
+	compare VAR_TEMP_0, 2000
+	goto_if_gt Route111_EventScript_15000C
+	compare VAR_TEMP_0, 8
+	goto_if_lt Route111_EventScript_15000C
+
+Route111_EventScript_150009:: @ 8150009
+	setweather WEATHER_SANDSTORM
+
+Route111_EventScript_15000C:: @ 815000C
+	return
+
+Route111_EventScript_15000D:: @ 815000D
+	clearflag FLAG_HIDE_VICTOR_WINSTRATE
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
+	cleartrainerflag OPPONENT_VICTOR
+	cleartrainerflag OPPONENT_VICTORIA
+	cleartrainerflag OPPONENT_VIVI
+	end
+
+Route111_EventScript_150023:: @ 8150023
+	lockall
+	msgbox Route111_Text_16FA54, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route111_EventScript_15005F
+	giveitem_std ITEM_ROOT_FOSSIL
+	closemessage
+	setflag FLAG_HIDE_ROOT_FOSSIL
+	setflag FLAG_HIDE_CLAW_FOSSIL
+	removeobject 34
+	delay 30
+	applymovement 35, Route111_Movement_1500AF
+	waitmovement 0
+	removeobject 35
+	releaseall
+	end
+
+Route111_EventScript_15005F:: @ 815005F
+	msgbox Route111_Text_16FACE, 4
+	releaseall
+	end
+
+Route111_EventScript_150069:: @ 8150069
+	lockall
+	msgbox Route111_Text_16FAED, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route111_EventScript_1500A5
+	giveitem_std ITEM_CLAW_FOSSIL
+	closemessage
+	setflag FLAG_HIDE_CLAW_FOSSIL
+	setflag FLAG_HIDE_ROOT_FOSSIL
+	removeobject 35
+	delay 30
+	applymovement 34, Route111_Movement_1500AF
+	waitmovement 0
+	removeobject 34
+	releaseall
+	end
+
+Route111_EventScript_1500A5:: @ 81500A5
+	msgbox Route111_Text_16FB67, 4
+	releaseall
+	end
+
+Route111_Movement_1500AF:: @ 81500AF
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
+	end_movement
+
+Route111_EventScript_1500C5:: @ 81500C5
+	lock
+	faceplayer
+	dodailyevents
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100
+	msgbox Route111_Text_1C56F0, 4
+	giveitem_std ITEM_RAZZ_BERRY
+	compare RESULT, 0
+	goto_if_eq Route111_EventScript_1A029B
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
+	special GetPlayerBigGuyGirlString
+	msgbox Route111_Text_1C5781, 4
+	release
+	end
+
+Route111_EventScript_150100:: @ 8150100
+	msgbox Route111_Text_1C57D2, 4
+	release
+	end
+
+@ 815010A
+	lockall
+	setvar VAR_SPECIAL_4, 0
+	goto Route111_EventScript_15013A
+	end
+
+Route111_EventScript_150116:: @ 8150116
+	lockall
+	setvar VAR_SPECIAL_4, 1
+	goto Route111_EventScript_15013A
+	end
+
+Route111_EventScript_150122:: @ 8150122
+	lockall
+	setvar VAR_SPECIAL_4, 2
+	goto Route111_EventScript_15013A
+	end
+
+@ 815012E
+	lockall
+	setvar VAR_SPECIAL_4, 3
+	goto Route111_EventScript_15013A
+	end
+
+Route111_EventScript_15013A:: @ 815013A
+	checkitem ITEM_GO_GOGGLES, 1
+	compare RESULT, 0
+	goto_if_eq Route111_EventScript_150151
+	setvar VAR_TEMP_3, 1
+	releaseall
+	end
+
+Route111_EventScript_150151:: @ 8150151
+	msgbox Route111_Text_1A0F93, 4
+	closemessage
+	compare VAR_SPECIAL_4, 0
+	call_if_eq Route111_EventScript_150188
+	compare VAR_SPECIAL_4, 1
+	call_if_eq Route111_EventScript_150193
+	compare VAR_SPECIAL_4, 2
+	call_if_eq Route111_EventScript_15019E
+	compare VAR_SPECIAL_4, 3
+	call_if_eq Route111_EventScript_1501A9
+	releaseall
+	end
+
+Route111_EventScript_150188:: @ 8150188
+	applymovement 255, Route111_Movement_1501B4
+	waitmovement 0
+	return
+
+Route111_EventScript_150193:: @ 8150193
+	applymovement 255, Route111_Movement_1501B6
+	waitmovement 0
+	return
+
+Route111_EventScript_15019E:: @ 815019E
+	applymovement 255, Route111_Movement_1501B8
+	waitmovement 0
+	return
+
+Route111_EventScript_1501A9:: @ 81501A9
+	applymovement 255, Route111_Movement_1501BA
+	waitmovement 0
+	return
+
+Route111_Movement_1501B4:: @ 81501B4
+	walk_up
+	end_movement
+
+Route111_Movement_1501B6:: @ 81501B6
+	walk_down
+	end_movement
+
+Route111_Movement_1501B8:: @ 81501B8
+	walk_left
+	end_movement
+
+Route111_Movement_1501BA:: @ 81501BA
+	walk_right
+	end_movement
+
+Route111_EventScript_1501BC:: @ 81501BC
+	setweather WEATHER_SUNNY
+	fadenewbgm MUS_DOORO_X1
+	doweather
+	setvar VAR_TEMP_3, 0
+	end
+
+Route111_EventScript_1501C9:: @ 81501C9
+	setweather WEATHER_SANDSTORM
+	fadenewbgm MUS_ASHROAD
+	doweather
+	end
+
+Route111_EventScript_1501D1:: @ 81501D1
+	lock
+	faceplayer
+	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
+	msgbox Route111_Text_16F705, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route111_EventScript_1501F3
+	msgbox Route111_Text_16F785, 4
+	release
+	end
+
+Route111_EventScript_1501F3:: @ 81501F3
+	msgbox Route111_Text_16F7B3, 4
+	trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2
+	applymovement 1, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	msgbox Route111_Text_16F7FF, 4
+	closemessage
+	applymovement 1, Route111_Movement_150356
+	waitmovement 0
+	removeobject 1
+	call Route111_EventScript_15034F
+	applymovement 255, Route111_Movement_15035B
+	waitmovement 0
+	call Route111_EventScript_150348
+	addobject 2
+	applymovement 2, Route111_Movement_150359
+	waitmovement 0
+	call Route111_EventScript_15034F
+	msgbox Route111_Text_16F82D, 4
+	trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6
+	applymovement 2, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	msgbox Route111_Text_16F8D5, 4
+	closemessage
+	applymovement 2, Route111_Movement_150356
+	waitmovement 0
+	removeobject 2
+	call Route111_EventScript_15034F
+	applymovement 255, Route111_Movement_15035B
+	waitmovement 0
+	call Route111_EventScript_150348
+	addobject 3
+	applymovement 3, Route111_Movement_150359
+	waitmovement 0
+	call Route111_EventScript_15034F
+	msgbox Route111_Text_16F90E, 4
+	trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956
+	applymovement 3, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	msgbox Route111_Text_16F96C, 4
+	closemessage
+	applymovement 3, Route111_Movement_150356
+	waitmovement 0
+	removeobject 3
+	call Route111_EventScript_15034F
+	applymovement 255, Route111_Movement_15035B
+	waitmovement 0
+	call Route111_EventScript_150348
+	addobject 4
+	applymovement 4, Route111_Movement_150359
+	waitmovement 0
+	call Route111_EventScript_15034F
+	msgbox Route111_Text_16F991, 4
+	trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC
+	msgbox Route111_Text_16FA22, 4
+	closemessage
+	applymovement 4, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	applymovement 4, Route111_Movement_150356
+	waitmovement 0
+	removeobject 4
+	call Route111_EventScript_15034F
+	release
+	end
+
+Route111_EventScript_150348:: @ 8150348
+	opendoor 13, 113
+	waitdooranim
+	return
+
+Route111_EventScript_15034F:: @ 815034F
+	closedoor 13, 113
+	waitdooranim
+	return
+
+Route111_Movement_150356:: @ 8150356
+	walk_in_place_fastest_up
+	walk_up
+	end_movement
+
+Route111_Movement_150359:: @ 8150359
+	walk_down
+	end_movement
+
+Route111_Movement_15035B:: @ 815035B
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+Route111_EventScript_15035F:: @ 815035F
+	msgbox Route111_Text_16FC9C, 3
+	end
+
+Route111_EventScript_150368:: @ 8150368
+	msgbox Route111_Text_16FCB6, 3
+	end
+
+Route111_EventScript_150371:: @ 8150371
+	msgbox Route111_Text_16FCEF, 3
+	end
+
+Route111_EventScript_15037A:: @ 815037A
+	msgbox Route111_Text_16FD05, 3
+	end
+
+Route111_EventScript_150383:: @ 8150383
+	msgbox Route111_Text_16FD1B, 3
+	end
+
+Route111_EventScript_15038C:: @ 815038C
+	msgbox Route111_Text_16FD55, 3
+	end
+
+Route111_EventScript_150395:: @ 8150395
+	msgbox Route111_Text_16FB86, 2
+	end
+
+Route111_EventScript_15039E:: @ 815039E
+	msgbox Route111_Text_16FC3A, 2
+	end
+
+Route111_EventScript_1503A7:: @ 81503A7
+	trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
+	msgbox Route111_Text_1BAC10, 6
+	end
+
+Route111_EventScript_1503BE:: @ 81503BE
+	trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
+	msgbox Route111_Text_1BACD8, 6
+	end
+
+Route111_EventScript_1503D5:: @ 81503D5
+	trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
+	msgbox Route111_Text_1BADC2, 6
+	end
+
+Route111_EventScript_1503EC:: @ 81503EC
+	trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
+	msgbox Route111_Text_1BAE81, 6
+	end
+
+Route111_EventScript_150403:: @ 8150403
+	trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route111_EventScript_15042A
+	msgbox Route111_Text_1BAF5B, 6
+	end
+
+Route111_EventScript_15042A:: @ 815042A
+	trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
+	msgbox Route111_Text_1BB070, 6
+	end
+
+Route111_EventScript_150441:: @ 8150441
+	trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140
+	msgbox Route111_Text_1BB15B, 6
+	end
+
+Route111_EventScript_150458:: @ 8150458
+	trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
+	msgbox Route111_Text_1BB1F6, 6
+	end
+
+Route111_EventScript_15046F:: @ 815046F
+	trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E
+	msgbox Route111_Text_1BB290, 6
+	end
+
+Route111_EventScript_150486:: @ 8150486
+	trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route111_EventScript_1504AD
+	msgbox Route111_Text_1BB33E, 6
+	end
+
+Route111_EventScript_1504AD:: @ 81504AD
+	trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
+	msgbox Route111_Text_1BB40E, 6
+	end
+
+Route111_EventScript_1504C4:: @ 81504C4
+	trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route111_EventScript_1504EB
+	msgbox Route111_Text_1BB4CE, 6
+	end
+
+Route111_EventScript_1504EB:: @ 81504EB
+	trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
+	msgbox Route111_Text_1BB5C1, 6
+	end
diff --git a/data/text/maps/Route111.inc b/data/maps/Route111/text.inc
index 24bcc1008..24bcc1008 100644
--- a/data/text/maps/Route111.inc
+++ b/data/maps/Route111/text.inc
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc
index da7f2f605..da7f2f605 100644
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/events.inc
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
index 23f4959a3..8536613b9 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -1,9 +1,9 @@
 Route111_OldLadysRestStop:: @ 8306C74
-	.4byte Route111_OldLadysRestStop_MapAttributes
+	.4byte House3_Layout
 	.4byte Route111_OldLadysRestStop_MapEvents
 	.4byte Route111_OldLadysRestStop_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 64
 	.byte 26
 	.byte 0
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 1263c4b83..1263c4b83 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
diff --git a/data/text/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/text.inc
index aeef47a32..aeef47a32 100644
--- a/data/text/maps/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/text.inc
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc
index 70d00eabc..70d00eabc 100644
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index d7333f070..7cac82463 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -1,9 +1,9 @@
 Route111_WinstrateFamilysHouse:: @ 8306C58
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte Route111_WinstrateFamilysHouse_MapEvents
 	.4byte Route111_WinstrateFamilysHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 26
 	.byte 0
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 020b51791..020b51791 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
diff --git a/data/text/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/text.inc
index e1986320b..e1986320b 100644
--- a/data/text/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/text.inc
diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc
index e1673dc69..e1673dc69 100644
--- a/data/maps/events/Route112.inc
+++ b/data/maps/Route112/events.inc
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
index f798451d6..dc9a96bd6 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -1,9 +1,9 @@
 Route112:: @ 830573C
-	.4byte Route112_MapAttributes
+	.4byte Route112_Layout
 	.4byte Route112_MapEvents
 	.4byte Route112_MapScripts
 	.4byte Route112_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 28
 	.byte 27
 	.byte 0
diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc
index 83d93f222..83d93f222 100644
--- a/data/scripts/maps/Route112.inc
+++ b/data/maps/Route112/scripts.inc
diff --git a/data/text/maps/Route112.inc b/data/maps/Route112/text.inc
index c967c562c..c967c562c 100644
--- a/data/text/maps/Route112.inc
+++ b/data/maps/Route112/text.inc
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc
index a2c93ca9d..a2c93ca9d 100644
--- a/data/maps/events/Route112_CableCarStation.inc
+++ b/data/maps/Route112_CableCarStation/events.inc
diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
index 3d025fb7b..881f4591d 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -1,9 +1,9 @@
 Route112_CableCarStation:: @ 8306C90
-	.4byte Route112_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte Route112_CableCarStation_MapEvents
 	.4byte Route112_CableCarStation_MapScripts
 	.4byte 0x0
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 119
 	.byte 27
 	.byte 0
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/scripts.inc
index a593ccccc..a593ccccc 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
diff --git a/data/text/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/text.inc
index 245172542..245172542 100644
--- a/data/text/maps/Route112_CableCarStation.inc
+++ b/data/maps/Route112_CableCarStation/text.inc
diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc
index 3fd5ea281..3fd5ea281 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/Route113/events.inc
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
index 5792f97c3..9097be2f9 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -1,9 +1,9 @@
 Route113:: @ 8305758
-	.4byte Route113_MapAttributes
+	.4byte Route113_Layout
 	.4byte Route113_MapEvents
 	.4byte Route113_MapScripts
 	.4byte Route113_MapConnections
-	.2byte BGM_KAZANBAI
+	.2byte MUS_KAZANBAI
 	.2byte 29
 	.byte 28
 	.byte 0
diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc
index 41b289db0..41b289db0 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/maps/Route113/scripts.inc
diff --git a/data/text/maps/Route113.inc b/data/maps/Route113/text.inc
index 2ce41fda9..2ce41fda9 100644
--- a/data/text/maps/Route113.inc
+++ b/data/maps/Route113/text.inc
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc
index 24b90b2d7..24b90b2d7 100644
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/events.inc
diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index a8bfdd35d..e63be2dee 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -1,9 +1,9 @@
 Route113_GlassWorkshop:: @ 8307EB8
-	.4byte Route113_GlassWorkshop_MapAttributes
+	.4byte House4_Layout
 	.4byte Route113_GlassWorkshop_MapEvents
 	.4byte Route113_GlassWorkshop_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 67
 	.byte 28
 	.byte 0
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index e42a6f89a..e42a6f89a 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
diff --git a/data/text/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/text.inc
index 2923255a4..2923255a4 100644
--- a/data/text/maps/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/text.inc
diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc
index eb05dd1ce..eb05dd1ce 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/Route114/events.inc
diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc
index cfb5f4114..afeb34813 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -1,9 +1,9 @@
 Route114:: @ 8305774
-	.4byte Route114_MapAttributes
+	.4byte Route114_Layout
 	.4byte Route114_MapEvents
 	.4byte Route114_MapScripts
 	.4byte Route114_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 30
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc
index 54a4ee59a..54a4ee59a 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/maps/Route114/scripts.inc
diff --git a/data/text/maps/Route114.inc b/data/maps/Route114/text.inc
index 9a46954da..9a46954da 100644
--- a/data/text/maps/Route114.inc
+++ b/data/maps/Route114/text.inc
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc
index 1f41db668..1f41db668 100644
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/events.inc
diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
index 2da95c284..cd580f692 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -1,9 +1,9 @@
 Route114_FossilManiacsHouse:: @ 8306CC8
-	.4byte Route114_FossilManiacsHouse_MapAttributes
+	.4byte Route114_FossilManiacsHouse_Layout
 	.4byte Route114_FossilManiacsHouse_MapEvents
 	.4byte Route114_FossilManiacsHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 120
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index c93584561..c93584561 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
diff --git a/data/text/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/text.inc
index 4515a161a..4515a161a 100644
--- a/data/text/maps/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/text.inc
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc
index 13db6a8ca..13db6a8ca 100644
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/events.inc
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
index b410c822c..7cd10eb1a 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -1,9 +1,9 @@
 Route114_FossilManiacsTunnel:: @ 8306CE4
-	.4byte Route114_FossilManiacsTunnel_MapAttributes
+	.4byte Route114_FossilManiacsTunnel_Layout
 	.4byte Route114_FossilManiacsTunnel_MapEvents
 	.4byte Route114_FossilManiacsTunnel_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 121
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index 740a48314..740a48314 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
diff --git a/data/text/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/text.inc
index cbcd6172d..cbcd6172d 100644
--- a/data/text/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/text.inc
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc
index 86ebf06de..86ebf06de 100644
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/events.inc
diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc
index a5b7eea50..d37f4a323 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -1,9 +1,9 @@
 Route114_LanettesHouse:: @ 8306D00
-	.4byte Route114_LanettesHouse_MapAttributes
+	.4byte Route114_LanettesHouse_Layout
 	.4byte Route114_LanettesHouse_MapEvents
 	.4byte Route114_LanettesHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 122
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 30eb844ac..30eb844ac 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
diff --git a/data/text/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/text.inc
index 5d6747895..5d6747895 100644
--- a/data/text/maps/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/text.inc
diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc
index e03d62fb4..e03d62fb4 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/Route115/events.inc
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
index b11134e28..208c24a76 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -1,9 +1,9 @@
 Route115:: @ 8305790
-	.4byte Route115_MapAttributes
+	.4byte Route115_Layout
 	.4byte Route115_MapEvents
 	.4byte Route115_MapScripts
 	.4byte Route115_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 31
 	.byte 30
 	.byte 0
diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc
index f16c2088a..f16c2088a 100644
--- a/data/scripts/maps/Route115.inc
+++ b/data/maps/Route115/scripts.inc
diff --git a/data/text/maps/Route115.inc b/data/maps/Route115/text.inc
index f5fc22b0d..f5fc22b0d 100644
--- a/data/text/maps/Route115.inc
+++ b/data/maps/Route115/text.inc
diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc
index fd1b98f0a..fd1b98f0a 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/Route116/events.inc
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
index f4e145bf1..27d26658f 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -1,9 +1,9 @@
 Route116:: @ 83057AC
-	.4byte Route116_MapAttributes
+	.4byte Route116_Layout
 	.4byte Route116_MapEvents
 	.4byte Route116_MapScripts
 	.4byte Route116_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 32
 	.byte 31
 	.byte 0
diff --git a/data/scripts/maps/Route116.inc b/data/maps/Route116/scripts.inc
index 77fbf57a4..77fbf57a4 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/maps/Route116/scripts.inc
diff --git a/data/text/maps/Route116.inc b/data/maps/Route116/text.inc
index 64694199d..64694199d 100644
--- a/data/text/maps/Route116.inc
+++ b/data/maps/Route116/text.inc
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
index 454f184e3..454f184e3 100644
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/events.inc
diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
index a52c6cada..a446833da 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -1,9 +1,9 @@
 Route116_TunnelersRestHouse:: @ 8306D1C
-	.4byte Route116_TunnelersRestHouse_MapAttributes
+	.4byte Route116_TunnelersRestHouse_Layout
 	.4byte Route116_TunnelersRestHouse_MapEvents
 	.4byte Route116_TunnelersRestHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 123
 	.byte 31
 	.byte 0
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index 5ec6ef642..5ec6ef642 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
diff --git a/data/text/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/text.inc
index d777ff0c8..d777ff0c8 100644
--- a/data/text/maps/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/text.inc
diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc
index a668f4b32..a668f4b32 100644
--- a/data/maps/events/Route117.inc
+++ b/data/maps/Route117/events.inc
diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc
index 9649f4728..11df4b60f 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -1,9 +1,9 @@
 Route117:: @ 83057C8
-	.4byte Route117_MapAttributes
+	.4byte Route117_Layout
 	.4byte Route117_MapEvents
 	.4byte Route117_MapScripts
 	.4byte Route117_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 33
 	.byte 32
 	.byte 0
diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc
index 9f42412ab..9f42412ab 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/maps/Route117/scripts.inc
diff --git a/data/text/maps/Route117.inc b/data/maps/Route117/text.inc
index deadb8f5d..deadb8f5d 100644
--- a/data/text/maps/Route117.inc
+++ b/data/maps/Route117/text.inc
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc
index 3f2c3be51..3f2c3be51 100644
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ b/data/maps/Route117_PokemonDayCare/events.inc
diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
index 567819b48..0a4f59499 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -1,9 +1,9 @@
 Route117_PokemonDayCare:: @ 8306D38
-	.4byte Route117_PokemonDayCare_MapAttributes
+	.4byte Route117_PokemonDayCare_Layout
 	.4byte Route117_PokemonDayCare_MapEvents
 	.4byte Route117_PokemonDayCare_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 124
 	.byte 32
 	.byte 0
diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index 9ad740b4e..9ad740b4e 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc
index c12e77bd9..c12e77bd9 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/Route118/events.inc
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
index 5b1190621..930a9d860 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -1,9 +1,9 @@
 Route118:: @ 83057E4
-	.4byte Route118_MapAttributes
+	.4byte Route118_Layout
 	.4byte Route118_MapEvents
 	.4byte Route118_MapScripts
 	.4byte Route118_MapConnections
-	.2byte BGM_ROUTE_118
+	.2byte MUS_ROUTE_118
 	.2byte 34
 	.byte 33
 	.byte 0
diff --git a/data/scripts/maps/Route118.inc b/data/maps/Route118/scripts.inc
index b938d0cc2..b938d0cc2 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/maps/Route118/scripts.inc
diff --git a/data/text/maps/Route118.inc b/data/maps/Route118/text.inc
index 649efe3f0..649efe3f0 100644
--- a/data/text/maps/Route118.inc
+++ b/data/maps/Route118/text.inc
diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc
index 49677e8e5..49677e8e5 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/Route119/events.inc
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
index ef5887676..98d0ea5f6 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -1,9 +1,9 @@
 Route119:: @ 8305800
-	.4byte Route119_MapAttributes
+	.4byte Route119_Layout
 	.4byte Route119_MapEvents
 	.4byte Route119_MapScripts
 	.4byte Route119_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 35
 	.byte 34
 	.byte 0
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
new file mode 100644
index 000000000..fe1ef4e45
--- /dev/null
+++ b/data/maps/Route119/scripts.inc
@@ -0,0 +1,382 @@
+Route119_MapScripts:: @ 8151167
+	map_script 5, Route119_MapScript1_151172
+	map_script 3, Route119_MapScript1_15119B
+	.byte 0
+
+Route119_MapScript1_151172:: @ 8151172
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C
+	end
+
+Route119_EventScript_15117C:: @ 815117C
+	compare VAR_SPECIAL_4, 6
+	call_if_eq Route119_EventScript_151193
+	compare VAR_SPECIAL_4, 7
+	call_if_eq Route119_EventScript_151197
+	return
+
+Route119_EventScript_151193:: @ 8151193
+	removeobject 35
+	return
+
+Route119_EventScript_151197:: @ 8151197
+	removeobject 36
+	return
+
+Route119_MapScript1_15119B:: @ 815119B
+	call Route119_EventScript_1A014E
+	call Route119_EventScript_1A0172
+	call Route119_EventScript_1A0196
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
+	call_if_eq Route119_EventScript_1511B9
+	special SetRoute119Weather
+	end
+
+Route119_EventScript_1511B9:: @ 81511B9
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	setvar VAR_WEATHER_INSTITUTE_STATE, 2
+	return
+
+Route119_EventScript_1511C5:: @ 81511C5
+	setvar VAR_TEMP_1, 1
+	goto Route119_EventScript_1511DB
+	end
+
+Route119_EventScript_1511D0:: @ 81511D0
+	setvar VAR_TEMP_1, 2
+	goto Route119_EventScript_1511DB
+	end
+
+Route119_EventScript_1511DB:: @ 81511DB
+	lockall
+	addobject 25
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq Route119_EventScript_151254
+	compare RESULT, 1
+	call_if_eq Route119_EventScript_151259
+	delay 65
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513A6
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513B1
+	applymovement 255, Route119_Movement_1A0845
+	waitmovement 0
+	delay 30
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513D2
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513E1
+	removeobject 25
+	addobject 16
+	delay 30
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq Route119_EventScript_15125E
+	compare RESULT, 1
+	goto_if_eq Route119_EventScript_1512D8
+	releaseall
+	end
+
+Route119_EventScript_151254:: @ 8151254
+	playbgm MUS_GIRL_SUP, TRUE
+	return
+
+Route119_EventScript_151259:: @ 8151259
+	playbgm MUS_BOY_SUP, TRUE
+	return
+
+Route119_EventScript_15125E:: @ 815125E
+	msgbox Route119_Text_1710BB, 4
+	switch VAR_STARTER_MON
+	case 0, Route119_EventScript_15128D
+	case 1, Route119_EventScript_15129D
+	case 2, Route119_EventScript_1512AD
+	end
+
+Route119_EventScript_15128D:: @ 815128D
+	trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156
+	goto Route119_EventScript_1512BD
+	end
+
+Route119_EventScript_15129D:: @ 815129D
+	trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156
+	goto Route119_EventScript_1512BD
+	end
+
+Route119_EventScript_1512AD:: @ 81512AD
+	trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156
+	goto Route119_EventScript_1512BD
+	end
+
+Route119_EventScript_1512BD:: @ 81512BD
+	msgbox Route119_Text_1711B1, 4
+	call Route119_EventScript_151352
+	msgbox Route119_Text_171214, 4
+	goto Route119_EventScript_151362
+	end
+
+Route119_EventScript_1512D8:: @ 81512D8
+	msgbox Route119_Text_171358, 4
+	switch VAR_STARTER_MON
+	case 0, Route119_EventScript_151307
+	case 1, Route119_EventScript_151317
+	case 2, Route119_EventScript_151327
+	end
+
+Route119_EventScript_151307:: @ 8151307
+	trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2
+	goto Route119_EventScript_151337
+	end
+
+Route119_EventScript_151317:: @ 8151317
+	trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2
+	goto Route119_EventScript_151337
+	end
+
+Route119_EventScript_151327:: @ 8151327
+	trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2
+	goto Route119_EventScript_151337
+	end
+
+Route119_EventScript_151337:: @ 8151337
+	msgbox Route119_Text_17140B, 4
+	call Route119_EventScript_151352
+	msgbox Route119_Text_171475, 4
+	goto Route119_EventScript_151362
+	end
+
+Route119_EventScript_151352:: @ 8151352
+	giveitem_std ITEM_HM02_FLY
+	setflag FLAG_RECEIVED_HM02
+	return
+
+Route119_EventScript_151362:: @ 8151362
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513D2
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513E1
+	removeobject 16
+	addobject 25
+	delay 30
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513BC
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513C7
+	removeobject 25
+	setvar VAR_ROUTE119_STATE, 1
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+Route119_EventScript_1513A6:: @ 81513A6
+	applymovement 25, Route119_Movement_1513F0
+	waitmovement 0
+	return
+
+Route119_EventScript_1513B1:: @ 81513B1
+	applymovement 25, Route119_Movement_1513FA
+	waitmovement 0
+	return
+
+Route119_EventScript_1513BC:: @ 81513BC
+	applymovement 25, Route119_Movement_151405
+	waitmovement 0
+	return
+
+Route119_EventScript_1513C7:: @ 81513C7
+	applymovement 25, Route119_Movement_15140F
+	waitmovement 0
+	return
+
+Route119_EventScript_1513D2:: @ 81513D2
+	setobjectxyperm 16, 25, 32
+	setobjectxyperm 25, 25, 32
+	return
+
+Route119_EventScript_1513E1:: @ 81513E1
+	setobjectxyperm 16, 26, 32
+	setobjectxyperm 25, 26, 32
+	return
+
+Route119_Movement_1513F0:: @ 81513F0
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
+
+Route119_Movement_1513FA:: @ 81513FA
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
+
+Route119_Movement_151405:: @ 8151405
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route119_Movement_15140F:: @ 815140F
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route119_EventScript_15141A:: @ 815141A
+	msgbox Route119_Text_171698, 2
+	end
+
+Route119_EventScript_151423:: @ 8151423
+	msgbox Route119_Text_171749, 3
+	end
+
+Route119_EventScript_15142C:: @ 815142C
+	msgbox Route119_Text_171762, 3
+	end
+
+Route119_EventScript_151435:: @ 8151435
+	trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F
+	msgbox Route119_Text_1BE561, 6
+	end
+
+Route119_EventScript_15144C:: @ 815144C
+	trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF
+	msgbox Route119_Text_1BE5F8, 6
+	end
+
+Route119_EventScript_151463:: @ 8151463
+	trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B
+	msgbox Route119_Text_1BE695, 6
+	end
+
+Route119_EventScript_15147A:: @ 815147A
+	trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729
+	msgbox Route119_Text_1BE748, 6
+	end
+
+Route119_EventScript_151491:: @ 8151491
+	trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3
+	msgbox Route119_Text_1BE7E9, 6
+	end
+
+Route119_EventScript_1514A8:: @ 81514A8
+	trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D
+	msgbox Route119_Text_1BE89A, 6
+	end
+
+Route119_EventScript_1514BF:: @ 81514BF
+	trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route119_EventScript_1514E6
+	msgbox Route119_Text_1BE937, 6
+	end
+
+Route119_EventScript_1514E6:: @ 81514E6
+	trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0
+	msgbox Route119_Text_1BE9E8, 6
+	end
+
+Route119_EventScript_1514FD:: @ 81514FD
+	trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route119_EventScript_151524
+	msgbox Route119_Text_1BEAB3, 6
+	end
+
+Route119_EventScript_151524:: @ 8151524
+	trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49
+	msgbox Route119_Text_1BEB68, 6
+	end
+
+Route119_EventScript_15153B:: @ 815153B
+	trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C
+	msgbox Route119_Text_1BEC2A, 6
+	end
+
+Route119_EventScript_151552:: @ 8151552
+	trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A
+	msgbox Route119_Text_1BECB1, 6
+	end
+
+Route119_EventScript_151569:: @ 8151569
+	trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C
+	msgbox Route119_Text_1BED5C, 6
+	end
+
+Route119_EventScript_151580:: @ 8151580
+	trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC
+	msgbox Route119_Text_1BEE06, 6
+	end
+
+Route119_EventScript_151597:: @ 8151597
+	trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B
+	msgbox Route119_Text_1BEE66, 6
+	end
+
+Route119_EventScript_1515AE:: @ 81515AE
+	trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37
+	msgbox Route119_Text_1BEF67, 6
+	end
+
+Route119_EventScript_1515C5:: @ 81515C5
+	lock
+	faceplayer
+	msgbox Route119_Text_171520, 4
+	closemessage
+	applymovement LAST_TALKED, Route119_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route119_EventScript_1515DC:: @ 81515DC
+	lock
+	faceplayer
+	msgbox Route119_Text_17157C, 4
+	closemessage
+	applymovement LAST_TALKED, Route119_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route119_EventScript_1515F3:: @ 81515F3
+	msgbox Route119_Text_1715D7, 2
+	end
+
+Route119_EventScript_1515FC:: @ 81515FC
+	msgbox Route119_Text_1716F4, 2
+	end
+
+Route119_EventScript_151605:: @ 8151605
+	msgbox Route119_Text_171774, 3
+	end
diff --git a/data/text/maps/Route119.inc b/data/maps/Route119/text.inc
index 489ca053d..489ca053d 100644
--- a/data/text/maps/Route119.inc
+++ b/data/maps/Route119/text.inc
diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc
index 0b7bc6b70..0b7bc6b70 100644
--- a/data/maps/events/Route119_House.inc
+++ b/data/maps/Route119_House/events.inc
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index d64c4b804..3a7cdcbbd 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -1,9 +1,9 @@
 Route119_House:: @ 8307F28
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte Route119_House_MapEvents
 	.4byte Route119_House_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 59
 	.byte 34
 	.byte 0
diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc
index 76763c68e..76763c68e 100644
--- a/data/scripts/maps/Route119_House.inc
+++ b/data/maps/Route119_House/scripts.inc
diff --git a/data/text/maps/Route119_House.inc b/data/maps/Route119_House/text.inc
index fe069c1ed..fe069c1ed 100644
--- a/data/text/maps/Route119_House.inc
+++ b/data/maps/Route119_House/text.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
index 0107020cd..0107020cd 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/events.inc
diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc
index b392fbc41..b35d3cccf 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -1,9 +1,9 @@
 Route119_WeatherInstitute_1F:: @ 8307EF0
-	.4byte Route119_WeatherInstitute_1F_MapAttributes
+	.4byte Route119_WeatherInstitute_1F_Layout
 	.4byte Route119_WeatherInstitute_1F_MapEvents
 	.4byte Route119_WeatherInstitute_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 272
 	.byte 34
 	.byte 0
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index e5ca6550b..e5ca6550b 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
diff --git a/data/text/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/text.inc
index 1f7fff794..1f7fff794 100644
--- a/data/text/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/text.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
index 62cb0391f..62cb0391f 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index 9a5c3d9d8..b93deba00 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,9 +1,9 @@
 Route119_WeatherInstitute_2F:: @ 8307F0C
-	.4byte Route119_WeatherInstitute_2F_MapAttributes
+	.4byte Route119_WeatherInstitute_2F_Layout
 	.4byte Route119_WeatherInstitute_2F_MapEvents
 	.4byte Route119_WeatherInstitute_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 273
 	.byte 34
 	.byte 0
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
new file mode 100644
index 000000000..0a1a51562
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -0,0 +1,92 @@
+Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2
+	map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8
+	.byte 0
+
+Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8
+	call Route119_WeatherInstitute_2F_EventScript_1A0196
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4
+	setobjectxyperm 5, 1, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
+	setobjectxyperm 5, 4, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
+	msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
+	msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A
+	trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
+	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
+	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
+	closemessage
+	setvar VAR_WEATHER_INSTITUTE_STATE, 1
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+	fadedefaultbgm
+	fadescreen 1
+	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	removeobject 1
+	removeobject 2
+	removeobject 3
+	fadescreen 0
+	applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8
+	waitmovement 0
+	moveobjectoffscreen 5
+	goto Route119_WeatherInstitute_2F_EventScript_163D7A
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
+	msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4
+	playfanfare MUS_FANFA4
+	message Route119_WeatherInstitute_2F_Text_19F267
+	waitfanfare
+	waitmessage
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	setflag FLAG_RECEIVED_CASTFORM
+	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163DB4:: @ 8163DB4
+	msgbox Route119_WeatherInstitute_2F_Text_19F231, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE
+	msgbox Route119_WeatherInstitute_2F_Text_19F2FE, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE
+	goto Route119_WeatherInstitute_2F_EventScript_163D7A
+	end
diff --git a/data/text/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/text.inc
index f2854f6d0..f2854f6d0 100644
--- a/data/text/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/text.inc
diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc
index 1c0444b22..1c0444b22 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/Route120/events.inc
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
index 3f8be7e95..10f7725b7 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -1,9 +1,9 @@
 Route120:: @ 830581C
-	.4byte Route120_MapAttributes
+	.4byte Route120_Layout
 	.4byte Route120_MapEvents
 	.4byte Route120_MapScripts
 	.4byte Route120_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 36
 	.byte 35
 	.byte 0
diff --git a/data/scripts/maps/Route120.inc b/data/maps/Route120/scripts.inc
index 6f561391f..6f561391f 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/maps/Route120/scripts.inc
diff --git a/data/text/maps/Route120.inc b/data/maps/Route120/text.inc
index adaf369b1..adaf369b1 100644
--- a/data/text/maps/Route120.inc
+++ b/data/maps/Route120/text.inc
diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc
index 7405af540..7405af540 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/Route121/events.inc
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
index ba2c3d2da..918fe47f6 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -1,9 +1,9 @@
 Route121:: @ 8305838
-	.4byte Route121_MapAttributes
+	.4byte Route121_Layout
 	.4byte Route121_MapEvents
 	.4byte Route121_MapScripts
 	.4byte Route121_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 37
 	.byte 36
 	.byte 0
diff --git a/data/scripts/maps/Route121.inc b/data/maps/Route121/scripts.inc
index 5fe7f6330..5fe7f6330 100644
--- a/data/scripts/maps/Route121.inc
+++ b/data/maps/Route121/scripts.inc
diff --git a/data/text/maps/Route121.inc b/data/maps/Route121/text.inc
index 7861b1744..7861b1744 100644
--- a/data/text/maps/Route121.inc
+++ b/data/maps/Route121/text.inc
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc
index 6ed6613ec..6ed6613ec 100644
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ b/data/maps/Route121_SafariZoneEntrance/events.inc
diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
index 4a0bbe244..0d97afab4 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -1,9 +1,9 @@
 Route121_SafariZoneEntrance:: @ 8306D54
-	.4byte Route121_SafariZoneEntrance_MapAttributes
+	.4byte Route121_SafariZoneEntrance_Layout
 	.4byte Route121_SafariZoneEntrance_MapEvents
 	.4byte Route121_SafariZoneEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 125
 	.byte 36
 	.byte 0
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
new file mode 100644
index 000000000..30cba964b
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -0,0 +1,138 @@
+Route121_SafariZoneEntrance_MapScripts:: @ 815C323
+	map_script 2, Route121_SafariZoneEntrance_MapScript2_15C329
+	.byte 0
+
+Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329
+	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333
+	.2byte 0
+
+Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333
+	lockall
+	applymovement 255, Route121_SafariZoneEntrance_Movement_15C348
+	waitmovement 0
+	special ExitSafariMode
+	setvar VAR_SAFARI_ZONE_STATE, 0
+	releaseall
+	end
+
+Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351
+	msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A
+	lock
+	faceplayer
+	msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379
+	msgbox Route121_SafariZoneEntrance_Text_1C373C, 4
+	release
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379
+	msgbox Route121_SafariZoneEntrance_Text_1C375F, 4
+	release
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383
+	lockall
+	applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841
+	waitmovement 0
+	showmoneybox 0, 0
+	nop
+	msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3
+	msgbox Route121_SafariZoneEntrance_Text_1C3895, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare RESULT, 0
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450
+	call Route121_SafariZoneEntrance_EventScript_15C425
+	checkmoney 0x1f4, 0
+	compare RESULT, 0
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E
+	msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4
+	takemoney 0x1f4, 0
+	updatemoneybox 0, 0
+	nop
+	msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4
+	playfanfare MUS_FANFA4
+	message Route121_SafariZoneEntrance_Text_1C3910
+	waitfanfare
+	waitmessage
+	msgbox Route121_SafariZoneEntrance_Text_1C392D, 4
+	closemessage
+	hidemoneybox 0, 0
+	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E
+	waitmovement 0
+	special EnterSafariMode
+	setvar VAR_SAFARI_ZONE_STATE, 2
+	warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33
+	waitstate
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
+	getpartysize
+	compare RESULT, 6
+	goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F
+	specialvar RESULT, CheckFreePokemonStorageSpace
+	compare RESULT, 1
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F
+	msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F
+	return
+
+Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450
+	msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E
+	msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
+	closemessage
+	hidemoneybox 0, 0
+	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C
+	waitmovement 0
+	releaseall
+	end
+
+Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C
+	walk_right
+	end_movement
+
+Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	delay_16
+	end_movement
+
+Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487
+	msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3
+	end
diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc
index 3bad2b895..3bad2b895 100644
--- a/data/maps/events/Route122.inc
+++ b/data/maps/Route122/events.inc
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
index 9889cc813..c6a2d4e4d 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -1,9 +1,9 @@
 Route122:: @ 8305854
-	.4byte Route122_MapAttributes
+	.4byte Route122_Layout
 	.4byte Route122_MapEvents
 	.4byte Route122_MapScripts
 	.4byte Route122_MapConnections
-	.2byte BGM_DOORO_X4
+	.2byte MUS_DOORO_X4
 	.2byte 38
 	.byte 37
 	.byte 0
diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc
index 4c4e49aa1..4c4e49aa1 100644
--- a/data/scripts/maps/Route122.inc
+++ b/data/maps/Route122/scripts.inc
diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc
index b25ec5c64..b25ec5c64 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/Route123/events.inc
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
index f33ab3e98..87c3ed8a6 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -1,9 +1,9 @@
 Route123:: @ 8305870
-	.4byte Route123_MapAttributes
+	.4byte Route123_Layout
 	.4byte Route123_MapEvents
 	.4byte Route123_MapScripts
 	.4byte Route123_MapConnections
-	.2byte BGM_DOORO_X4
+	.2byte MUS_DOORO_X4
 	.2byte 39
 	.byte 38
 	.byte 0
diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc
index d954bec1a..d954bec1a 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/maps/Route123/scripts.inc
diff --git a/data/text/maps/Route123.inc b/data/maps/Route123/text.inc
index 911915f9e..911915f9e 100644
--- a/data/text/maps/Route123.inc
+++ b/data/maps/Route123/text.inc
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc
index ff950e5cb..ff950e5cb 100644
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/events.inc
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index 0eb77ca2e..427ef4720 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -1,9 +1,9 @@
 Route123_BerryMastersHouse:: @ 8307ED4
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte Route123_BerryMastersHouse_MapEvents
 	.4byte Route123_BerryMastersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 38
 	.byte 0
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 3356df83b..3356df83b 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
diff --git a/data/text/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/text.inc
diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc
index 694718fb6..694718fb6 100644
--- a/data/maps/events/Route124.inc
+++ b/data/maps/Route124/events.inc
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
index 6e4466225..c2c5cd41d 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -1,9 +1,9 @@
 Route124:: @ 830588C
-	.4byte Route124_MapAttributes
+	.4byte Route124_Layout
 	.4byte Route124_MapEvents
 	.4byte Route124_MapScripts
 	.4byte Route124_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 40
 	.byte 39
 	.byte 0
diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc
index 3f02fc6e3..3f02fc6e3 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/maps/Route124/scripts.inc
diff --git a/data/text/maps/Route124.inc b/data/maps/Route124/text.inc
index 6f33d40b7..6f33d40b7 100644
--- a/data/text/maps/Route124.inc
+++ b/data/maps/Route124/text.inc
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
index e165c9da8..e165c9da8 100644
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index 472ebc45a..259e378de 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -1,9 +1,9 @@
 Route124_DivingTreasureHuntersHouse:: @ 8307F44
-	.4byte Route124_DivingTreasureHuntersHouse_MapAttributes
+	.4byte Route124_DivingTreasureHuntersHouse_Layout
 	.4byte Route124_DivingTreasureHuntersHouse_MapEvents
 	.4byte Route124_DivingTreasureHuntersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 302
 	.byte 39
 	.byte 0
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 7bcddfe19..7bcddfe19 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
diff --git a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/text.inc
index 3eda96254..3eda96254 100644
--- a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/text.inc
diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc
index 8ad4ce22a..8ad4ce22a 100644
--- a/data/maps/events/Route125.inc
+++ b/data/maps/Route125/events.inc
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
index e7a43a64d..cb315cc66 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -1,9 +1,9 @@
 Route125:: @ 83058A8
-	.4byte Route125_MapAttributes
+	.4byte Route125_Layout
 	.4byte Route125_MapEvents
 	.4byte Route125_MapScripts
 	.4byte Route125_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 41
 	.byte 40
 	.byte 0
diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc
index a1495ac83..a1495ac83 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/maps/Route125/scripts.inc
diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc
index f90152ea4..f90152ea4 100644
--- a/data/maps/events/Route126.inc
+++ b/data/maps/Route126/events.inc
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
index a973af531..0539f9007 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -1,9 +1,9 @@
 Route126:: @ 83058C4
-	.4byte Route126_MapAttributes
+	.4byte Route126_Layout
 	.4byte Route126_MapEvents
 	.4byte Route126_MapScripts
 	.4byte Route126_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 42
 	.byte 41
 	.byte 0
diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc
index 4a28abfb7..4a28abfb7 100644
--- a/data/scripts/maps/Route126.inc
+++ b/data/maps/Route126/scripts.inc
diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc
index 66078b122..66078b122 100644
--- a/data/maps/events/Route127.inc
+++ b/data/maps/Route127/events.inc
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
index a9f887a2b..abd4154cc 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -1,9 +1,9 @@
 Route127:: @ 83058E0
-	.4byte Route127_MapAttributes
+	.4byte Route127_Layout
 	.4byte Route127_MapEvents
 	.4byte Route127_MapScripts
 	.4byte Route127_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 43
 	.byte 42
 	.byte 0
diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc
index 7552f7c5d..7552f7c5d 100644
--- a/data/scripts/maps/Route127.inc
+++ b/data/maps/Route127/scripts.inc
diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc
index 9ea71c52e..9ea71c52e 100644
--- a/data/maps/events/Route128.inc
+++ b/data/maps/Route128/events.inc
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
index 9ecc76fb7..df2b21a6e 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -1,9 +1,9 @@
 Route128:: @ 83058FC
-	.4byte Route128_MapAttributes
+	.4byte Route128_Layout
 	.4byte Route128_MapEvents
 	.4byte Route128_MapScripts
 	.4byte Route128_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 44
 	.byte 43
 	.byte 0
diff --git a/data/scripts/maps/Route128.inc b/data/maps/Route128/scripts.inc
index ec4fb954e..ec4fb954e 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/maps/Route128/scripts.inc
diff --git a/data/text/maps/Route128.inc b/data/maps/Route128/text.inc
index da813609b..da813609b 100644
--- a/data/text/maps/Route128.inc
+++ b/data/maps/Route128/text.inc
diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc
index e86dd6ce0..e86dd6ce0 100644
--- a/data/maps/events/Route129.inc
+++ b/data/maps/Route129/events.inc
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
index 580d69fc7..a1285fe08 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -1,9 +1,9 @@
 Route129:: @ 8305918
-	.4byte Route129_MapAttributes
+	.4byte Route129_Layout
 	.4byte Route129_MapEvents
 	.4byte Route129_MapScripts
 	.4byte Route129_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 45
 	.byte 44
 	.byte 0
diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc
index ea43c5eab..ea43c5eab 100644
--- a/data/scripts/maps/Route129.inc
+++ b/data/maps/Route129/scripts.inc
diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc
index f6770fa34..f6770fa34 100644
--- a/data/maps/events/Route130.inc
+++ b/data/maps/Route130/events.inc
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index a788bf9b5..f286a2b81 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,9 +1,9 @@
 Route130:: @ 8305934
-	.4byte Route130_MapAttributes
+	.4byte Route130_Layout
 	.4byte Route130_MapEvents
 	.4byte Route130_MapScripts
 	.4byte Route130_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 264
 	.byte 45
 	.byte 0
diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc
index b0381969d..b0381969d 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/maps/Route130/scripts.inc
diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc
index 0d61e6f95..0d61e6f95 100644
--- a/data/maps/events/Route131.inc
+++ b/data/maps/Route131/events.inc
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
index e7d9ea231..51b4d9e4f 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -1,9 +1,9 @@
 Route131:: @ 8305950
-	.4byte Route131_MapAttributes
+	.4byte Route131_Layout
 	.4byte Route131_MapEvents
 	.4byte Route131_MapScripts
 	.4byte Route131_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 47
 	.byte 46
 	.byte 0
diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc
index ffd204bb9..ffd204bb9 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/maps/Route131/scripts.inc
diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc
index 167fbfd4b..167fbfd4b 100644
--- a/data/maps/events/Route132.inc
+++ b/data/maps/Route132/events.inc
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
index d7ad0b2a4..4f2e2d47f 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -1,9 +1,9 @@
 Route132:: @ 830596C
-	.4byte Route132_MapAttributes
+	.4byte Route132_Layout
 	.4byte Route132_MapEvents
 	.4byte Route132_MapScripts
 	.4byte Route132_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 48
 	.byte 47
 	.byte 0
diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc
index 642330fd4..642330fd4 100644
--- a/data/scripts/maps/Route132.inc
+++ b/data/maps/Route132/scripts.inc
diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc
index d71755575..d71755575 100644
--- a/data/maps/events/Route133.inc
+++ b/data/maps/Route133/events.inc
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
index 4c0f718ec..3cd851068 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -1,9 +1,9 @@
 Route133:: @ 8305988
-	.4byte Route133_MapAttributes
+	.4byte Route133_Layout
 	.4byte Route133_MapEvents
 	.4byte Route133_MapScripts
 	.4byte Route133_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 49
 	.byte 48
 	.byte 0
diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc
index 78bec4141..78bec4141 100644
--- a/data/scripts/maps/Route133.inc
+++ b/data/maps/Route133/scripts.inc
diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc
index b167d48b1..b167d48b1 100644
--- a/data/maps/events/Route134.inc
+++ b/data/maps/Route134/events.inc
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
index 2ca22c40e..15fe8168e 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -1,9 +1,9 @@
 Route134:: @ 83059A4
-	.4byte Route134_MapAttributes
+	.4byte Route134_Layout
 	.4byte Route134_MapEvents
 	.4byte Route134_MapScripts
 	.4byte Route134_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 50
 	.byte 49
 	.byte 0
diff --git a/data/scripts/maps/Route134.inc b/data/maps/Route134/scripts.inc
index 06b53ce31..06b53ce31 100644
--- a/data/scripts/maps/Route134.inc
+++ b/data/maps/Route134/scripts.inc
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc
index bfc6cff77..bfc6cff77 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/RustboroCity/events.inc
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
index d1352ea3e..73af7f1fc 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -1,9 +1,9 @@
 RustboroCity:: @ 830549C
-	.4byte RustboroCity_MapAttributes
+	.4byte RustboroCity_Layout
 	.4byte RustboroCity_MapEvents
 	.4byte RustboroCity_MapScripts
 	.4byte RustboroCity_MapConnections
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 4
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity.inc b/data/maps/RustboroCity/scripts.inc
index 72699ab79..72699ab79 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/maps/RustboroCity/scripts.inc
diff --git a/data/text/maps/RustboroCity.inc b/data/maps/RustboroCity/text.inc
index 4f2954f35..4f2954f35 100644
--- a/data/text/maps/RustboroCity.inc
+++ b/data/maps/RustboroCity/text.inc
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc
index 6a96e223c..6a96e223c 100644
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/events.inc
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
index c3b5a6d7c..c1aa1fc37 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_CuttersHouse:: @ 8306360
-	.4byte RustboroCity_CuttersHouse_MapAttributes
+	.4byte RustboroCity_CuttersHouse_Layout
 	.4byte RustboroCity_CuttersHouse_MapEvents
 	.4byte RustboroCity_CuttersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 98
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc
index b43e0aafe..b43e0aafe 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc
diff --git a/data/text/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/text.inc
index 8b4c237f5..8b4c237f5 100644
--- a/data/text/maps/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/text.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc
index 5cfbd5134..5cfbd5134 100644
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
index 5539006ff..e0148dea7 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_DevonCorp_1F:: @ 830622C
-	.4byte RustboroCity_DevonCorp_1F_MapAttributes
+	.4byte RustboroCity_DevonCorp_1F_Layout
 	.4byte RustboroCity_DevonCorp_1F_MapEvents
 	.4byte RustboroCity_DevonCorp_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 92
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 7b56c72a2..7b56c72a2 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/text.inc
index 209fd049c..209fd049c 100644
--- a/data/text/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/text.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc
index 1babeffd7..1babeffd7 100644
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
index 76bbea60b..dbed45197 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_DevonCorp_2F:: @ 8306248
-	.4byte RustboroCity_DevonCorp_2F_MapAttributes
+	.4byte RustboroCity_DevonCorp_2F_Layout
 	.4byte RustboroCity_DevonCorp_2F_MapEvents
 	.4byte RustboroCity_DevonCorp_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 93
 	.byte 10
 	.byte 0
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
new file mode 100644
index 000000000..e0b0e30f8
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -0,0 +1,175 @@
+RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA
+	map_script 3, RustboroCity_DevonCorp_2F_MapScript1_1574D0
+	.byte 0
+
+RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
+	return
+
+RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519
+	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519
+	msgbox RustboroCity_DevonCorp_2F_Text_182C25, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543
+	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543
+	msgbox RustboroCity_DevonCorp_2F_Text_182D7E, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 2
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640
+	msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4
+	checkitem ITEM_ROOT_FOSSIL, 1
+	compare RESULT, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6
+	checkitem ITEM_CLAW_FOSSIL, 1
+	compare RESULT, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
+	closemessage
+	playse SE_PIN
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	waitmovement 0
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
+	bufferitemname 0, ITEM_ROOT_FOSSIL
+	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
+	takeitem ITEM_ROOT_FOSSIL, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 1
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
+	closemessage
+	playse SE_PIN
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	waitmovement 0
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
+	bufferitemname 0, ITEM_CLAW_FOSSIL
+	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
+	takeitem ITEM_CLAW_FOSSIL, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 2
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636
+	msgbox RustboroCity_DevonCorp_2F_Text_182FD7, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640
+	msgbox RustboroCity_DevonCorp_2F_Text_183072, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A
+	compare VAR_WHICH_FOSSIL_REVIVED, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661
+	compare VAR_WHICH_FOSSIL_REVIVED, 2
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
+	bufferspeciesname 1, SPECIES_LILEEP
+	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
+	copyvar VAR_SPECIAL_4, RESULT
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
+	setflag FLAG_RECEIVED_FOSSIL_MON
+	playfanfare MUS_FANFA4
+	message RustboroCity_DevonCorp_2F_Text_18319E
+	waitfanfare
+	waitmessage
+	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
+	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
+	bufferspeciesname 1, SPECIES_ANORITH
+	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
+	copyvar VAR_SPECIAL_4, RESULT
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
+	setflag FLAG_RECEIVED_FOSSIL_MON
+	playfanfare MUS_FANFA4
+	message RustboroCity_DevonCorp_2F_Text_18319E
+	waitfanfare
+	waitmessage
+	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
+	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707
+	msgbox RustboroCity_DevonCorp_2F_Text_1831C8, 4
+	release
+	end
diff --git a/data/text/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/text.inc
index a6a6bb6c2..a6a6bb6c2 100644
--- a/data/text/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/text.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc
index b77f343af..b77f343af 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc
diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc
index c3d4549de..b8cadbed2 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_DevonCorp_3F:: @ 8306264
-	.4byte RustboroCity_DevonCorp_3F_MapAttributes
+	.4byte RustboroCity_DevonCorp_3F_Layout
 	.4byte RustboroCity_DevonCorp_3F_MapEvents
 	.4byte RustboroCity_DevonCorp_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 270
 	.byte 10
 	.byte 0
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
new file mode 100644
index 000000000..cead5e5a2
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -0,0 +1,194 @@
+RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711
+	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721
+	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739
+	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748
+	.byte 0
+
+RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
+	compare VAR_DEVON_CORP_3F_STATE, 0
+	call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D
+	setobjectxyperm 2, 3, 2
+	setobjectmovementtype 2, 9
+	return
+
+RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743
+	.2byte 0
+
+RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743
+	turnobject 255, 4
+	end
+
+RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752
+	.2byte 0
+
+RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
+	lockall
+	msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4
+	closemessage
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815
+	waitmovement 0
+	delay 80
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_183903, 4
+	closemessage
+	playbgm MUS_TSURETEK, FALSE
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4
+	closemessage
+	fadedefaultbgm
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4
+	giveitem_std ITEM_LETTER
+	msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4
+	playfanfare MUS_FANFA4
+	message RustboroCity_DevonCorp_3F_Text_183422
+	waitfanfare
+	waitmessage
+	setflag FLAG_SYS_POKENAV_GET
+	setflag FLAG_RECEIVED_POKENAV
+	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
+	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
+	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setvar VAR_BRINEY_LOCATION, 1
+	clearflag FLAG_HIDE_RIVAL_RUSTBORO
+	setvar VAR_DEVON_CORP_3F_STATE, 1
+	releaseall
+	end
+
+@ 81577FE
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
+
+RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864
+	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
+	msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4
+	giveitem_std ITEM_EXP_SHARE
+	compare RESULT, 0
+	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
+	setflag FLAG_RECEIVED_EXP_SHARE
+	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
+	msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5
+	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5
+	msgbox RustboroCity_DevonCorp_3F_Text_1839A3, 4
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF
+	msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3
+	end
diff --git a/data/text/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/text.inc
index c868a4836..c868a4836 100644
--- a/data/text/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/text.inc
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
index 22a262f47..22a262f47 100644
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/events.inc
diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc
index 68a5697be..3d1739875 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat1_1F:: @ 830630C
-	.4byte RustboroCity_Flat1_1F_MapAttributes
+	.4byte RustboroCity_Flat1_1F_Layout
 	.4byte RustboroCity_Flat1_1F_MapEvents
 	.4byte RustboroCity_Flat1_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 314
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc
index dbbdf22b7..dbbdf22b7 100644
--- a/data/scripts/maps/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/text.inc
index 4721931e4..4721931e4 100644
--- a/data/text/maps/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/text.inc
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc
index e906fe011..e906fe011 100644
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/events.inc
diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
index f0b29ae0d..0ae9dd797 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat1_2F:: @ 8306328
-	.4byte RustboroCity_Flat1_2F_MapAttributes
+	.4byte RustboroCity_Flat1_2F_Layout
 	.4byte RustboroCity_Flat1_2F_MapEvents
 	.4byte RustboroCity_Flat1_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 315
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index 53672bb42..53672bb42 100644
--- a/data/scripts/maps/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/text.inc
index 7ddb678bf..7ddb678bf 100644
--- a/data/text/maps/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/text.inc
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc
index 76ed3f04e..76ed3f04e 100644
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/events.inc
diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc
index 5f54f2624..3a9ee86c3 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat2_1F:: @ 8306398
-	.4byte RustboroCity_Flat2_1F_MapAttributes
+	.4byte RustboroCity_Flat2_1F_Layout
 	.4byte RustboroCity_Flat2_1F_MapEvents
 	.4byte RustboroCity_Flat2_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 295
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index a6ba54ce7..a6ba54ce7 100644
--- a/data/scripts/maps/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/text.inc
index d949a0ab8..d949a0ab8 100644
--- a/data/text/maps/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/text.inc
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc
index 3f56e718c..3f56e718c 100644
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/events.inc
diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
index 086947abf..da3544023 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat2_2F:: @ 83063B4
-	.4byte RustboroCity_Flat2_2F_MapAttributes
+	.4byte RustboroCity_Flat2_2F_Layout
 	.4byte RustboroCity_Flat2_2F_MapEvents
 	.4byte RustboroCity_Flat2_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 296
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index 5ed9ac0ef..5ed9ac0ef 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/text.inc
index 8a3d52fda..8a3d52fda 100644
--- a/data/text/maps/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/text.inc
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
index ed3ef80e7..ed3ef80e7 100644
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/events.inc
diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
index 42866ebf2..9d5235d93 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat2_3F:: @ 83063D0
-	.4byte RustboroCity_Flat2_3F_MapAttributes
+	.4byte RustboroCity_Flat2_3F_Layout
 	.4byte RustboroCity_Flat2_3F_MapEvents
 	.4byte RustboroCity_Flat2_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 297
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc
index d3b05b5bf..d3b05b5bf 100644
--- a/data/scripts/maps/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/text.inc
index 9f95ce92e..9f95ce92e 100644
--- a/data/text/maps/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/text.inc
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc
index 97b5a6627..97b5a6627 100644
--- a/data/maps/events/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/events.inc
diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc
index 5d18e933b..d98b04da8 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Gym:: @ 8306280
-	.4byte RustboroCity_Gym_MapAttributes
+	.4byte RustboroCity_Gym_Layout
 	.4byte RustboroCity_Gym_MapEvents
 	.4byte RustboroCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 94
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 307617e50..307617e50 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
diff --git a/data/text/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/text.inc
index 7bb737097..7bb737097 100644
--- a/data/text/maps/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/text.inc
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc
index 5a8023d2f..5a8023d2f 100644
--- a/data/maps/events/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/events.inc
diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc
index 9ee09b4e3..34d733c02 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_House1:: @ 8306344
-	.4byte RustboroCity_House1_MapAttributes
+	.4byte RustboroCity_House1_Layout
 	.4byte RustboroCity_House1_MapEvents
 	.4byte RustboroCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 97
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc
index abbac505b..abbac505b 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
diff --git a/data/text/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/text.inc
index 6427aa326..6427aa326 100644
--- a/data/text/maps/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/text.inc
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc
index 4a7a60f12..4a7a60f12 100644
--- a/data/maps/events/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/events.inc
diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc
index 0122c6a92..be12d46f8 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_House2:: @ 830637C
-	.4byte RustboroCity_House2_MapAttributes
+	.4byte RustboroCity_House_Layout
 	.4byte RustboroCity_House2_MapEvents
 	.4byte RustboroCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 96
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc
index b448065f4..b448065f4 100644
--- a/data/scripts/maps/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/scripts.inc
diff --git a/data/text/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/text.inc
index 7a1d9c706..7a1d9c706 100644
--- a/data/text/maps/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/text.inc
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc
index bdd17333c..bdd17333c 100644
--- a/data/maps/events/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/events.inc
diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc
index 8876f8499..7c23668ca 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_House3:: @ 83063EC
-	.4byte RustboroCity_House3_MapAttributes
+	.4byte RustboroCity_House_Layout
 	.4byte RustboroCity_House3_MapEvents
 	.4byte RustboroCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 96
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc
index 86d77c18e..86d77c18e 100644
--- a/data/scripts/maps/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
diff --git a/data/text/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/text.inc
index 43a3f6ff0..43a3f6ff0 100644
--- a/data/text/maps/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/text.inc
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc
index b39aec815..b39aec815 100644
--- a/data/maps/events/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/events.inc
diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc
index 535c3e2fc..88af62f92 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Mart:: @ 83062F0
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte RustboroCity_Mart_MapEvents
 	.4byte RustboroCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc
index c8e3f3a43..c8e3f3a43 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
diff --git a/data/text/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/text.inc
index f11395b68..f11395b68 100644
--- a/data/text/maps/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/text.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
index 7173fb49c..7173fb49c 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index 57cb84729..9b98aff0c 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_PokemonCenter_1F:: @ 83062B8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte RustboroCity_PokemonCenter_1F_MapEvents
 	.4byte RustboroCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 653cceb25..653cceb25 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/text.inc
index 0265f0363..0265f0363 100644
--- a/data/text/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
index bf5737d14..bf5737d14 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
index 838a5e5a9..ff85dfc1d 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_PokemonCenter_2F:: @ 83062D4
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte RustboroCity_PokemonCenter_2F_MapEvents
 	.4byte RustboroCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index d0ffc5435..d0ffc5435 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
index fc3f934fa..fc3f934fa 100644
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/events.inc
diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc
index dfb46b6f1..98f0e1b1d 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_PokemonSchool:: @ 830629C
-	.4byte RustboroCity_PokemonSchool_MapAttributes
+	.4byte RustboroCity_PokemonSchool_Layout
 	.4byte RustboroCity_PokemonSchool_MapEvents
 	.4byte RustboroCity_PokemonSchool_MapScripts
 	.4byte 0x0
-	.2byte BGM_P_SCHOOL
+	.2byte MUS_P_SCHOOL
 	.2byte 95
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index f8193cbb8..f8193cbb8 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
diff --git a/data/text/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/text.inc
index e12349bd2..e12349bd2 100644
--- a/data/text/maps/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/text.inc
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc
index 9dda724af..9dda724af 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/RusturfTunnel/events.inc
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
index 3e497a1e5..a3d4108ce 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -1,9 +1,9 @@
 RusturfTunnel:: @ 8306DE0
-	.4byte RusturfTunnel_MapAttributes
+	.4byte RusturfTunnel_Layout
 	.4byte RusturfTunnel_MapEvents
 	.4byte RusturfTunnel_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 130
 	.byte 60
 	.byte 0
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
new file mode 100644
index 000000000..13fb80043
--- /dev/null
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -0,0 +1,420 @@
+RusturfTunnel_MapScripts:: @ 815C745
+	map_script 3, RusturfTunnel_MapScript1_15C762
+	map_script 2, RusturfTunnel_MapScript2_15C750
+	.byte 0
+
+RusturfTunnel_MapScript2_15C750:: @ 815C750
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1
+	.2byte 0
+
+RusturfTunnel_MapScript1_15C762:: @ 815C762
+	call RusturfTunnel_EventScript_1A0196
+	compare VAR_RUSTURF_TUNNEL_STATE, 2
+	call_if_eq RusturfTunnel_EventScript_15C773
+	end
+
+RusturfTunnel_EventScript_15C773:: @ 815C773
+	setobjectxyperm 7, 13, 4
+	setobjectxyperm 6, 13, 5
+	return
+
+RusturfTunnel_EventScript_15C782:: @ 815C782
+	lock
+	faceplayer
+	msgbox RusturfTunnel_Text_194766, 4
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_15C799:: @ 815C799
+	lock
+	faceplayer
+	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC
+	setflag FLAG_TEMP_1
+	msgbox RusturfTunnel_Text_1944C5, 4
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
+	msgbox RusturfTunnel_Text_1945B2, 4
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
+	lockall
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C8CA
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C8DF
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8EA
+	call RusturfTunnel_EventScript_15C92D
+	msgbox RusturfTunnel_Text_19461D, 4
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C8EB
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8EB
+	giveitem_std ITEM_HM04_STRENGTH
+	setflag FLAG_RECEIVED_HM04
+	msgbox RusturfTunnel_Text_194693, 4
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C880
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C892
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8AE
+	msgbox RusturfTunnel_Text_194706, 4
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C8F7
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C909
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C91B
+	call RusturfTunnel_EventScript_1A0442
+	releaseall
+	end
+
+RusturfTunnel_EventScript_15C880:: @ 815C880
+	applymovement 255, RusturfTunnel_Movement_15C96A
+	applymovement 1, RusturfTunnel_Movement_15C98F
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C892:: @ 815C892
+	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement 1, RusturfTunnel_Movement_15C994
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_1A0845
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8AE:: @ 815C8AE
+	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement 1, RusturfTunnel_Movement_15C994
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_1A0845
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8CA:: @ 815C8CA
+	applymovement 1, RusturfTunnel_Movement_1A0841
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_1A0845
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8DF:: @ 815C8DF
+	applymovement 1, RusturfTunnel_Movement_15C970
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8EA:: @ 815C8EA
+	return
+
+RusturfTunnel_EventScript_15C8EB:: @ 815C8EB
+	closemessage
+	applymovement 1, RusturfTunnel_Movement_15C98D
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8F7:: @ 815C8F7
+	applymovement 10, RusturfTunnel_Movement_15C945
+	applymovement 1, RusturfTunnel_Movement_15C973
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C909:: @ 815C909
+	applymovement 10, RusturfTunnel_Movement_15C951
+	applymovement 1, RusturfTunnel_Movement_15C980
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C91B:: @ 815C91B
+	applymovement 10, RusturfTunnel_Movement_15C951
+	applymovement 1, RusturfTunnel_Movement_15C980
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C92D:: @ 815C92D
+	playse SE_PIN
+	applymovement 1, RusturfTunnel_Movement_1A0833
+	waitmovement 0
+	applymovement 1, RusturfTunnel_Movement_1A0835
+	waitmovement 0
+	return
+
+RusturfTunnel_Movement_15C945:: @ 815C945
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+RusturfTunnel_Movement_15C951:: @ 815C951
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815C95D
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+@ 815C960
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	end_movement
+
+@ 815C965
+	walk_up
+	walk_in_place_fastest_down
+	delay_8
+	walk_in_place_fastest_right
+	end_movement
+
+RusturfTunnel_Movement_15C96A:: @ 815C96A
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+RusturfTunnel_Movement_15C96D:: @ 815C96D
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
+
+RusturfTunnel_Movement_15C970:: @ 815C970
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
+
+RusturfTunnel_Movement_15C973:: @ 815C973
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+RusturfTunnel_Movement_15C980:: @ 815C980
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+RusturfTunnel_Movement_15C98D:: @ 815C98D
+	walk_right
+	end_movement
+
+RusturfTunnel_Movement_15C98F:: @ 815C98F
+	walk_in_place_fast_up
+	walk_in_place_fast_up
+	walk_fast_up
+	walk_fast_right
+	end_movement
+
+RusturfTunnel_Movement_15C994:: @ 815C994
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_fast_right
+	walk_in_place_fastest_up
+	end_movement
+
+RusturfTunnel_EventScript_15C999:: @ 815C999
+	setvar VAR_TEMP_1, 1
+	end
+
+RusturfTunnel_EventScript_15C99F:: @ 815C99F
+	setvar VAR_TEMP_1, 2
+	end
+
+RusturfTunnel_EventScript_15C9A5:: @ 815C9A5
+	setvar VAR_TEMP_1, 3
+	end
+
+RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
+	lockall
+	msgbox RusturfTunnel_Text_194159, 4
+	closemessage
+	applymovement 6, RusturfTunnel_Movement_15C9D3
+	applymovement 7, RusturfTunnel_Movement_15C9D3
+	waitmovement 0
+	moveobjectoffscreen 6
+	moveobjectoffscreen 7
+	setvar VAR_RUSTURF_TUNNEL_STATE, 3
+	releaseall
+	end
+
+RusturfTunnel_Movement_15C9D3:: @ 815C9D3
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	end_movement
+
+RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox RusturfTunnel_Text_194188, 4
+	waitmoncry
+	release
+	end
+
+RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
+	lock
+	faceplayer
+	playbgm MUS_EVIL_TEAM, FALSE
+	msgbox RusturfTunnel_Text_19419B, 4
+	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
+	msgbox RusturfTunnel_Text_194274, 4
+	giveitem_std ITEM_DEVON_GOODS
+	closemessage
+	applymovement 255, RusturfTunnel_Movement_15CA99
+	applymovement 6, RusturfTunnel_Movement_15CAA2
+	waitmovement 0
+	removeobject 6
+	delay 50
+	addobject 5
+	applymovement 5, RusturfTunnel_Movement_15CAAC
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_15CA9F
+	applymovement 5, RusturfTunnel_Movement_15CAC0
+	waitmovement 0
+	msgbox RusturfTunnel_Text_19432A, 4
+	applymovement 5, RusturfTunnel_Movement_1A0839
+	waitmovement 0
+	message RusturfTunnel_Text_19434F
+	waitmessage
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	waitbuttonpress
+	waitmoncry
+	closemessage
+	applymovement 5, RusturfTunnel_Movement_15CAB4
+	applymovement 7, RusturfTunnel_Movement_15CAC3
+	waitmovement 0
+	removeobject 5
+	removeobject 7
+	clearflag FLAG_DEVON_GOODS_STOLEN
+	setflag FLAG_RECOVERED_DEVON_GOODS
+	setvar VAR_RUSTBORO_STATE, 4
+	setvar VAR_BRINEY_HOUSE_STATE, 1
+	setflag FLAG_HIDE_BRINEY_ROUTE116
+	release
+	end
+
+RusturfTunnel_Movement_15CA99:: @ 815CA99
+	face_down
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	walk_in_place_fastest_left
+	end_movement
+
+RusturfTunnel_Movement_15CA9F:: @ 815CA9F
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+RusturfTunnel_Movement_15CAA2:: @ 815CAA2
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	end_movement
+
+RusturfTunnel_Movement_15CAAC:: @ 815CAAC
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+RusturfTunnel_Movement_15CAB4:: @ 815CAB4
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+RusturfTunnel_Movement_15CAC0:: @ 815CAC0
+	delay_16
+	walk_right
+	end_movement
+
+RusturfTunnel_Movement_15CAC3:: @ 815CAC3
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+RusturfTunnel_EventScript_15CACD:: @ 815CACD
+	trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2
+	msgbox RusturfTunnel_Text_1948C4, 6
+	end
diff --git a/data/text/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/text.inc
index 3403808fd..3403808fd 100644
--- a/data/text/maps/RusturfTunnel.inc
+++ b/data/maps/RusturfTunnel/text.inc
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc
index 0e034da5c..0e034da5c 100644
--- a/data/maps/events/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/events.inc
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
index 6370e81ca..4f55319d8 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -1,9 +1,9 @@
 SSTidalCorridor:: @ 8307B54
-	.4byte SSTidalCorridor_MapAttributes
+	.4byte SSTidalCorridor_Layout
 	.4byte SSTidalCorridor_MapEvents
 	.4byte SSTidalCorridor_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_BOAT
+	.2byte MUS_M_BOAT
 	.2byte 278
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/scripts.inc
index 7bc5a7fdd..7bc5a7fdd 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
diff --git a/data/text/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/text.inc
index 530ff6c55..530ff6c55 100644
--- a/data/text/maps/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/text.inc
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc
index c9cbf6715..c9cbf6715 100644
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/events.inc
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index 5b6bec321..c52690612 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,9 +1,9 @@
 SSTidalLowerDeck:: @ 8307B70
-	.4byte SSTidalLowerDeck_MapAttributes
+	.4byte SSTidalLowerDeck_Layout
 	.4byte SSTidalLowerDeck_MapEvents
 	.4byte SSTidalLowerDeck_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_BOAT
+	.2byte MUS_M_BOAT
 	.2byte 279
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index e91c20625..e91c20625 100644
--- a/data/scripts/maps/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
diff --git a/data/text/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/text.inc
index 2c54d743c..2c54d743c 100644
--- a/data/text/maps/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/text.inc
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc
index e86c60ed6..e86c60ed6 100644
--- a/data/maps/events/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/events.inc
diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc
index 36bcab75e..09fb99472 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -1,9 +1,9 @@
 SSTidalRooms:: @ 8307B8C
-	.4byte SSTidalRooms_MapAttributes
+	.4byte SSTidalRooms_Layout
 	.4byte SSTidalRooms_MapEvents
 	.4byte SSTidalRooms_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_BOAT
+	.2byte MUS_M_BOAT
 	.2byte 280
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc
index 89372bd84..89372bd84 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
diff --git a/data/text/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/text.inc
index a0f9000d3..a0f9000d3 100644
--- a/data/text/maps/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/text.inc
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc
index ed750532f..ed750532f 100644
--- a/data/maps/events/SafariZone_Northeast.inc
+++ b/data/maps/SafariZone_Northeast/events.inc
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
index 55bef875f..b4939c053 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Northeast:: @ 8307BC4
-	.4byte SafariZone_Northeast_MapAttributes
+	.4byte SafariZone_Northeast_Layout
 	.4byte SafariZone_Northeast_MapEvents
 	.4byte SafariZone_Northeast_MapScripts
 	.4byte SafariZone_Northeast_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 240
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc
index 11e14da0f..11e14da0f 100644
--- a/data/scripts/maps/SafariZone_Northeast.inc
+++ b/data/maps/SafariZone_Northeast/scripts.inc
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc
index 18a6db38e..18a6db38e 100644
--- a/data/maps/events/SafariZone_Northwest.inc
+++ b/data/maps/SafariZone_Northwest/events.inc
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
index a3c85c6ed..533f797a5 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Northwest:: @ 8307BA8
-	.4byte SafariZone_Northwest_MapAttributes
+	.4byte SafariZone_Northwest_Layout
 	.4byte SafariZone_Northwest_MapEvents
 	.4byte SafariZone_Northwest_MapScripts
 	.4byte SafariZone_Northwest_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 239
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc
index f17b7078d..f17b7078d 100644
--- a/data/scripts/maps/SafariZone_Northwest.inc
+++ b/data/maps/SafariZone_Northwest/scripts.inc
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc
index 8ed841ff1..8ed841ff1 100644
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ b/data/maps/SafariZone_RestHouse/events.inc
diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
index 3db84b0b7..f13ab4f49 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -1,9 +1,9 @@
 SafariZone_RestHouse:: @ 8307CDC
-	.4byte SafariZone_RestHouse_MapAttributes
+	.4byte SafariZone_RestHouse_Layout
 	.4byte SafariZone_RestHouse_MapEvents
 	.4byte SafariZone_RestHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 330
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc
index edaee1580..edaee1580 100644
--- a/data/scripts/maps/SafariZone_RestHouse.inc
+++ b/data/maps/SafariZone_RestHouse/scripts.inc
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc
index a18b2b394..a18b2b394 100644
--- a/data/maps/events/SafariZone_Southeast.inc
+++ b/data/maps/SafariZone_Southeast/events.inc
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
index 1307c9700..f60a67472 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Southeast:: @ 8307BFC
-	.4byte SafariZone_Southeast_MapAttributes
+	.4byte SafariZone_Southeast_Layout
 	.4byte SafariZone_Southeast_MapEvents
 	.4byte SafariZone_Southeast_MapScripts
 	.4byte SafariZone_Southeast_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 242
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/scripts.inc
index d7d581891..d7d581891 100644
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ b/data/maps/SafariZone_Southeast/scripts.inc
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc
index 909997d64..909997d64 100644
--- a/data/maps/events/SafariZone_Southwest.inc
+++ b/data/maps/SafariZone_Southwest/events.inc
diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc
index 548dc24b7..9a472f3ec 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Southwest:: @ 8307BE0
-	.4byte SafariZone_Southwest_MapAttributes
+	.4byte SafariZone_Southwest_Layout
 	.4byte SafariZone_Southwest_MapEvents
 	.4byte SafariZone_Southwest_MapScripts
 	.4byte SafariZone_Southwest_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 241
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc
index 51bffeeab..51bffeeab 100644
--- a/data/scripts/maps/SafariZone_Southwest.inc
+++ b/data/maps/SafariZone_Southwest/scripts.inc
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc
index a90403222..a90403222 100644
--- a/data/maps/events/ScorchedSlab.inc
+++ b/data/maps/ScorchedSlab/events.inc
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index 16e45546e..43b6b24b5 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,9 +1,9 @@
 ScorchedSlab:: @ 830756C
-	.4byte ScorchedSlab_MapAttributes
+	.4byte ScorchedSlab_Layout
 	.4byte ScorchedSlab_MapEvents
 	.4byte ScorchedSlab_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 312
 	.byte 80
 	.byte 0
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc
index f0ed9c005..f0ed9c005 100644
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc
index 4f6fa0c07..4f6fa0c07 100644
--- a/data/maps/events/SeafloorCavern_Entrance.inc
+++ b/data/maps/SeafloorCavern_Entrance/events.inc
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
index d768c1099..4f48878a8 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Entrance:: @ 8307064
-	.4byte SeafloorCavern_Entrance_MapAttributes
+	.4byte SeafloorCavern_Entrance_Layout
 	.4byte SeafloorCavern_Entrance_MapEvents
 	.4byte SeafloorCavern_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 148
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 9d59279ea..9d59279ea 100644
--- a/data/scripts/maps/SeafloorCavern_Entrance.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc
index cb6442135..cb6442135 100644
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/events.inc
diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
index affbaf21c..411e65b1b 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room1:: @ 8307080
-	.4byte SeafloorCavern_Room1_MapAttributes
+	.4byte SeafloorCavern_Room1_Layout
 	.4byte SeafloorCavern_Room1_MapEvents
 	.4byte SeafloorCavern_Room1_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 149
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index 6478efac1..6478efac1 100644
--- a/data/scripts/maps/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
diff --git a/data/text/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/text.inc
index da6e207ae..da6e207ae 100644
--- a/data/text/maps/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/text.inc
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc
index eefcffd2e..eefcffd2e 100644
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ b/data/maps/SeafloorCavern_Room2/events.inc
diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
index 6e0e7455d..a8e6ce80e 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room2:: @ 830709C
-	.4byte SeafloorCavern_Room2_MapAttributes
+	.4byte SeafloorCavern_Room2_Layout
 	.4byte SeafloorCavern_Room2_MapEvents
 	.4byte SeafloorCavern_Room2_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 150
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc
index b4507c8b9..b4507c8b9 100644
--- a/data/scripts/maps/SeafloorCavern_Room2.inc
+++ b/data/maps/SeafloorCavern_Room2/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc
index 5f8f769d3..5f8f769d3 100644
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/events.inc
diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
index e2a432cd9..b062079b7 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room3:: @ 83070B8
-	.4byte SeafloorCavern_Room3_MapAttributes
+	.4byte SeafloorCavern_Room3_Layout
 	.4byte SeafloorCavern_Room3_MapEvents
 	.4byte SeafloorCavern_Room3_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 151
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index 2ff8c4b26..2ff8c4b26 100644
--- a/data/scripts/maps/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
diff --git a/data/text/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/text.inc
index 07187b142..07187b142 100644
--- a/data/text/maps/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/text.inc
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc
index a31f0f5d8..a31f0f5d8 100644
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/events.inc
diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
index 0416091d4..bee900fed 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room4:: @ 83070D4
-	.4byte SeafloorCavern_Room4_MapAttributes
+	.4byte SeafloorCavern_Room4_Layout
 	.4byte SeafloorCavern_Room4_MapEvents
 	.4byte SeafloorCavern_Room4_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 152
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index cbed797c0..cbed797c0 100644
--- a/data/scripts/maps/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
diff --git a/data/text/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/text.inc
index ca0600450..ca0600450 100644
--- a/data/text/maps/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/text.inc
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc
index 767fa6dc1..767fa6dc1 100644
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ b/data/maps/SeafloorCavern_Room5/events.inc
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index 3272c7021..9e7560fe2 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room5:: @ 83070F0
-	.4byte SeafloorCavern_Room5_MapAttributes
+	.4byte SeafloorCavern_Room5_Layout
 	.4byte SeafloorCavern_Room5_MapEvents
 	.4byte SeafloorCavern_Room5_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 153
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc
index 79b65c2e6..79b65c2e6 100644
--- a/data/scripts/maps/SeafloorCavern_Room5.inc
+++ b/data/maps/SeafloorCavern_Room5/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc
index adf36455a..adf36455a 100644
--- a/data/maps/events/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/events.inc
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
index 18fab912d..0b9fdb9d1 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room6:: @ 830710C
-	.4byte SeafloorCavern_Room6_MapAttributes
+	.4byte SeafloorCavern_Room6_Layout
 	.4byte SeafloorCavern_Room6_MapEvents
 	.4byte SeafloorCavern_Room6_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 154
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc
index 3ebeae07f..3ebeae07f 100644
--- a/data/scripts/maps/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc
index 616376e32..616376e32 100644
--- a/data/maps/events/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/events.inc
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index ff7579206..ee640a183 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room7:: @ 8307128
-	.4byte SeafloorCavern_Room7_MapAttributes
+	.4byte SeafloorCavern_Room7_Layout
 	.4byte SeafloorCavern_Room7_MapEvents
 	.4byte SeafloorCavern_Room7_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 155
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc
index acad96ad0..acad96ad0 100644
--- a/data/scripts/maps/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc
index 450eb894a..450eb894a 100644
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ b/data/maps/SeafloorCavern_Room8/events.inc
diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
index f443c8530..43ff7baa4 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room8:: @ 8307144
-	.4byte SeafloorCavern_Room8_MapAttributes
+	.4byte SeafloorCavern_Room8_Layout
 	.4byte SeafloorCavern_Room8_MapEvents
 	.4byte SeafloorCavern_Room8_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 156
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc
index 117f9e6b5..117f9e6b5 100644
--- a/data/scripts/maps/SeafloorCavern_Room8.inc
+++ b/data/maps/SeafloorCavern_Room8/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc
index f4efdbcc0..f4efdbcc0 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/SeafloorCavern_Room9/events.inc
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
index 10303ec46..c45181c89 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room9:: @ 8307160
-	.4byte SeafloorCavern_Room9_MapAttributes
+	.4byte SeafloorCavern_Room9_Layout
 	.4byte SeafloorCavern_Room9_MapEvents
 	.4byte SeafloorCavern_Room9_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 157
 	.byte 68
 	.byte 0
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
new file mode 100644
index 000000000..74d624141
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -0,0 +1,291 @@
+SeafloorCavern_Room9_MapScripts:: @ 815DAE6
+	map_script 3, SeafloorCavern_Room9_MapScript1_15DAEC
+	.byte 0
+
+SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
+	call SeafloorCavern_Room9_EventScript_1A0196
+	call SeafloorCavern_Room9_EventScript_1A01B5
+	.ifdef SAPPHIRE
+	setmaplayoutindex 157
+	.else
+	setmaplayoutindex 327
+	.endif
+	end
+
+SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
+	lockall
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 3
+	setvar VAR_SPECIAL_6, 4
+	setvar VAR_SPECIAL_7, 5
+	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
+	waitmovement 0
+	applymovement 255, SeafloorCavern_Room9_Movement_15DD68
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B41B8, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4850, 4
+	.endif
+	closemessage
+	addobject VAR_SPECIAL_4
+	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
+	waitmovement 0
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B41D5, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B486C, 4
+	.endif
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4201, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4897, 4
+	.endif
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4289, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B491F, 4
+	.endif
+	.ifdef SAPPHIRE
+	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
+	.else
+	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
+	.endif
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B432C, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B49C1, 4
+	.endif
+	setweather WEATHER_NONE
+	doweather
+	special sub_8081924
+	waitstate
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B43C4, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
+	.endif
+	special WaitWeather
+	waitstate
+	.ifdef SAPPHIRE
+	setvar RESULT, 1
+	.else
+	setvar RESULT, 0
+	.endif
+	playse SE_W197
+	setfieldeffectargument 0, 16
+	setfieldeffectargument 1, 42
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
+	.ifdef SAPPHIRE
+	setvar RESULT, 0
+	.else
+	setvar RESULT, 1
+	.endif
+	playfanfare MUS_ME_TAMA
+	playse SE_TAMA
+	special sub_80818A4
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
+	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
+	waitmovement 0
+	delay 150
+	removeobject 7
+	addobject 1
+	waitstate
+	delay 60
+	applymovement 1, SeafloorCavern_Room9_Movement_15DD4C
+	waitmovement 0
+	special sub_80818FC
+	waitstate
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 1
+	special sub_810F758
+	waitstate
+	applymovement 1, SeafloorCavern_Room9_Movement_15DD57
+	waitmovement 0
+	removeobject 1
+	delay 4
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 2
+	special sub_810F758
+	waitstate
+	delay 30
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 3
+	setvar VAR_SPECIAL_6, 4
+	setvar VAR_SPECIAL_7, 5
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B43F2, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4A89, 4
+	.endif
+	playse SE_PC_LOGON
+	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4443, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
+	.endif
+	closemessage
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B447A, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4B11, 4
+	.endif
+	closemessage
+	playse SE_PC_OFF
+	delay 20
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B45C6, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4C79, 4
+	.endif
+	closemessage
+	addobject VAR_SPECIAL_5
+	addobject VAR_SPECIAL_6
+	addobject VAR_SPECIAL_7
+	applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63
+	applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63
+	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A
+	waitmovement 0
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B464D, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4D02, 4
+	.endif
+	playse SE_PIN
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833
+	waitmovement 0
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4723, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4DD3, 4
+	.endif
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4786, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4E37, 4
+	.endif
+	closemessage
+	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4818, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
+	.endif
+	setvar VAR_ROUTE128_STATE, 1
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
+	setvar VAR_SOOTOPOLIS_STATE, 1
+	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_SYS_WEATHER_CTRL
+	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE
+	setvar VAR_STEVENS_HOUSE_STATE, 1
+	setvar VAR_SEAFLOOR_CAVERN_STATE, 1
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	warp MAP_ROUTE128, 255, 38, 22
+	waitstate
+	releaseall
+	end
+
+SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+@ 815DD3E
+	walk_left
+	walk_left
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41
+	walk_left
+	delay_16
+	end_movement
+
+@ 815DD44
+	walk_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
+	face_up
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	walk_in_place_fastest_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57
+	slide_up
+	slide_up
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60
+	walk_right
+	walk_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68
+	delay_16
+	delay_16
+	end_movement
diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc
index a457a4e03..a457a4e03 100644
--- a/data/maps/events/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/events.inc
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
index 6ae714a1f..d919de498 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -1,9 +1,9 @@
 SealedChamber_InnerRoom:: @ 8307550
-	.4byte SealedChamber_InnerRoom_MapAttributes
+	.4byte SealedChamber_InnerRoom_Layout
 	.4byte SealedChamber_InnerRoom_MapEvents
 	.4byte SealedChamber_InnerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 305
 	.byte 78
 	.byte 0
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index 11aba3ac8..11aba3ac8 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc
index 634f41f60..634f41f60 100644
--- a/data/maps/events/SealedChamber_OuterRoom.inc
+++ b/data/maps/SealedChamber_OuterRoom/events.inc
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
index fe35a8210..f40159b44 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -1,9 +1,9 @@
 SealedChamber_OuterRoom:: @ 8307534
-	.4byte SealedChamber_OuterRoom_MapAttributes
+	.4byte SealedChamber_OuterRoom_Layout
 	.4byte SealedChamber_OuterRoom_MapEvents
 	.4byte SealedChamber_OuterRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 285
 	.byte 78
 	.byte 0
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 1f2159010..1f2159010 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc
index 7f883e7e9..7f883e7e9 100644
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ b/data/maps/SecretBase_BlueCave1/events.inc
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
index 24641e4e6..08ab9ab97 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave1:: @ 8307710
-	.4byte SecretBase_BlueCave1_MapAttributes
+	.4byte SecretBase_BlueCave1_Layout
 	.4byte SecretBase_BlueCave1_MapEvents
 	.4byte SecretBase_BlueCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 200
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc
index bca6bee55..bca6bee55 100644
--- a/data/scripts/maps/SecretBase_BlueCave1.inc
+++ b/data/maps/SecretBase_BlueCave1/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc
index 93e7b67f8..93e7b67f8 100644
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ b/data/maps/SecretBase_BlueCave2/events.inc
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
index 599abd34a..89546ddaf 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave2:: @ 83077B8
-	.4byte SecretBase_BlueCave2_MapAttributes
+	.4byte SecretBase_BlueCave2_Layout
 	.4byte SecretBase_BlueCave2_MapEvents
 	.4byte SecretBase_BlueCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 206
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc
index 4fc579fb9..4fc579fb9 100644
--- a/data/scripts/maps/SecretBase_BlueCave2.inc
+++ b/data/maps/SecretBase_BlueCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc
index bb761d2e8..bb761d2e8 100644
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ b/data/maps/SecretBase_BlueCave3/events.inc
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
index 2adbdb4e5..67df8c009 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave3:: @ 8307860
-	.4byte SecretBase_BlueCave3_MapAttributes
+	.4byte SecretBase_BlueCave3_Layout
 	.4byte SecretBase_BlueCave3_MapEvents
 	.4byte SecretBase_BlueCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 212
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc
index 0a8199f19..0a8199f19 100644
--- a/data/scripts/maps/SecretBase_BlueCave3.inc
+++ b/data/maps/SecretBase_BlueCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc
index 082600bec..082600bec 100644
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ b/data/maps/SecretBase_BlueCave4/events.inc
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
index 269a276ef..7cf1ed137 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave4:: @ 8307908
-	.4byte SecretBase_BlueCave4_MapAttributes
+	.4byte SecretBase_BlueCave4_Layout
 	.4byte SecretBase_BlueCave4_MapEvents
 	.4byte SecretBase_BlueCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 218
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc
index 72c1e9612..72c1e9612 100644
--- a/data/scripts/maps/SecretBase_BlueCave4.inc
+++ b/data/maps/SecretBase_BlueCave4/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc
index c3219bf43..c3219bf43 100644
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ b/data/maps/SecretBase_BrownCave1/events.inc
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
index b54737d93..b6d298eb9 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave1:: @ 83076F4
-	.4byte SecretBase_BrownCave1_MapAttributes
+	.4byte SecretBase_BrownCave1_Layout
 	.4byte SecretBase_BrownCave1_MapEvents
 	.4byte SecretBase_BrownCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 199
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc
index ddbf182e4..ddbf182e4 100644
--- a/data/scripts/maps/SecretBase_BrownCave1.inc
+++ b/data/maps/SecretBase_BrownCave1/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc
index e57348a00..e57348a00 100644
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ b/data/maps/SecretBase_BrownCave2/events.inc
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
index e84bfd2eb..3a50de1fa 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave2:: @ 830779C
-	.4byte SecretBase_BrownCave2_MapAttributes
+	.4byte SecretBase_BrownCave2_Layout
 	.4byte SecretBase_BrownCave2_MapEvents
 	.4byte SecretBase_BrownCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 205
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc
index 06dcb6335..06dcb6335 100644
--- a/data/scripts/maps/SecretBase_BrownCave2.inc
+++ b/data/maps/SecretBase_BrownCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc
index c1003816a..c1003816a 100644
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ b/data/maps/SecretBase_BrownCave3/events.inc
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
index 9e0dc78e0..4da609d11 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave3:: @ 8307844
-	.4byte SecretBase_BrownCave3_MapAttributes
+	.4byte SecretBase_BrownCave3_Layout
 	.4byte SecretBase_BrownCave3_MapEvents
 	.4byte SecretBase_BrownCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 211
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc
index a0a85dc11..a0a85dc11 100644
--- a/data/scripts/maps/SecretBase_BrownCave3.inc
+++ b/data/maps/SecretBase_BrownCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc
index 02afc20c4..02afc20c4 100644
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ b/data/maps/SecretBase_BrownCave4/events.inc
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
index d21c844da..471b29596 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave4:: @ 83078EC
-	.4byte SecretBase_BrownCave4_MapAttributes
+	.4byte SecretBase_BrownCave4_Layout
 	.4byte SecretBase_BrownCave4_MapEvents
 	.4byte SecretBase_BrownCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 217
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc
index 12d931e9e..12d931e9e 100644
--- a/data/scripts/maps/SecretBase_BrownCave4.inc
+++ b/data/maps/SecretBase_BrownCave4/scripts.inc
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc
index 18fea4c40..18fea4c40 100644
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/events.inc
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
index 60df36c7e..6508fe62a 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave1:: @ 83076D8
-	.4byte SecretBase_RedCave1_MapAttributes
+	.4byte SecretBase_RedCave1_Layout
 	.4byte SecretBase_RedCave1_MapEvents
 	.4byte SecretBase_RedCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 198
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc
index 77b99daec..77b99daec 100644
--- a/data/scripts/maps/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/scripts.inc
diff --git a/data/text/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/text.inc
index efb2c8fdb..efb2c8fdb 100644
--- a/data/text/maps/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/text.inc
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc
index 1d9bdde09..1d9bdde09 100644
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ b/data/maps/SecretBase_RedCave2/events.inc
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
index 5325c424e..f4c61d108 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave2:: @ 8307780
-	.4byte SecretBase_RedCave2_MapAttributes
+	.4byte SecretBase_RedCave2_Layout
 	.4byte SecretBase_RedCave2_MapEvents
 	.4byte SecretBase_RedCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 204
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc
index 735d386fc..735d386fc 100644
--- a/data/scripts/maps/SecretBase_RedCave2.inc
+++ b/data/maps/SecretBase_RedCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc
index 923616945..923616945 100644
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ b/data/maps/SecretBase_RedCave3/events.inc
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
index a86997805..681f4c403 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave3:: @ 8307828
-	.4byte SecretBase_RedCave3_MapAttributes
+	.4byte SecretBase_RedCave3_Layout
 	.4byte SecretBase_RedCave3_MapEvents
 	.4byte SecretBase_RedCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 210
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc
index c9b72ca30..c9b72ca30 100644
--- a/data/scripts/maps/SecretBase_RedCave3.inc
+++ b/data/maps/SecretBase_RedCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc
index 25a0f2ec6..25a0f2ec6 100644
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ b/data/maps/SecretBase_RedCave4/events.inc
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index 40e830726..77b6e06a7 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave4:: @ 83078D0
-	.4byte SecretBase_RedCave4_MapAttributes
+	.4byte SecretBase_RedCave4_Layout
 	.4byte SecretBase_RedCave4_MapEvents
 	.4byte SecretBase_RedCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 216
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc
index 6d2402f03..6d2402f03 100644
--- a/data/scripts/maps/SecretBase_RedCave4.inc
+++ b/data/maps/SecretBase_RedCave4/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc
index e1583e86d..e1583e86d 100644
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ b/data/maps/SecretBase_Shrub1/events.inc
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 3b634c729..cc85dea9e 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub1:: @ 8307764
-	.4byte SecretBase_Shrub1_MapAttributes
+	.4byte SecretBase_Shrub1_Layout
 	.4byte SecretBase_Shrub1_MapEvents
 	.4byte SecretBase_Shrub1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 203
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc
index 79116a0cf..79116a0cf 100644
--- a/data/scripts/maps/SecretBase_Shrub1.inc
+++ b/data/maps/SecretBase_Shrub1/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc
index 72bdcc380..72bdcc380 100644
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ b/data/maps/SecretBase_Shrub2/events.inc
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index 1c27f8945..932fcaca5 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub2:: @ 830780C
-	.4byte SecretBase_Shrub2_MapAttributes
+	.4byte SecretBase_Shrub2_Layout
 	.4byte SecretBase_Shrub2_MapEvents
 	.4byte SecretBase_Shrub2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 209
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc
index 49835f7f3..49835f7f3 100644
--- a/data/scripts/maps/SecretBase_Shrub2.inc
+++ b/data/maps/SecretBase_Shrub2/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc
index b09c206e7..b09c206e7 100644
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ b/data/maps/SecretBase_Shrub3/events.inc
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
index e6e85c9ed..a3a660338 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub3:: @ 83078B4
-	.4byte SecretBase_Shrub3_MapAttributes
+	.4byte SecretBase_Shrub3_Layout
 	.4byte SecretBase_Shrub3_MapEvents
 	.4byte SecretBase_Shrub3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 215
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc
index 0aeb7bdf9..0aeb7bdf9 100644
--- a/data/scripts/maps/SecretBase_Shrub3.inc
+++ b/data/maps/SecretBase_Shrub3/scripts.inc
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc
index a9f636e54..a9f636e54 100644
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ b/data/maps/SecretBase_Shrub4/events.inc
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 1e610463f..0966db367 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub4:: @ 830795C
-	.4byte SecretBase_Shrub4_MapAttributes
+	.4byte SecretBase_Shrub4_Layout
 	.4byte SecretBase_Shrub4_MapEvents
 	.4byte SecretBase_Shrub4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 221
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc
index f131b308d..f131b308d 100644
--- a/data/scripts/maps/SecretBase_Shrub4.inc
+++ b/data/maps/SecretBase_Shrub4/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc
index 467789f32..467789f32 100644
--- a/data/maps/events/SecretBase_Tree1.inc
+++ b/data/maps/SecretBase_Tree1/events.inc
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
index 64722268c..1d0ce9509 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree1:: @ 8307748
-	.4byte SecretBase_Tree1_MapAttributes
+	.4byte SecretBase_Tree1_Layout
 	.4byte SecretBase_Tree1_MapEvents
 	.4byte SecretBase_Tree1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 202
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc
index 7345c3bbb..7345c3bbb 100644
--- a/data/scripts/maps/SecretBase_Tree1.inc
+++ b/data/maps/SecretBase_Tree1/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc
index ef2280e01..ef2280e01 100644
--- a/data/maps/events/SecretBase_Tree2.inc
+++ b/data/maps/SecretBase_Tree2/events.inc
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index fefd54e68..7138440cd 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree2:: @ 83077F0
-	.4byte SecretBase_Tree2_MapAttributes
+	.4byte SecretBase_Tree2_Layout
 	.4byte SecretBase_Tree2_MapEvents
 	.4byte SecretBase_Tree2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 208
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc
index 0f2976a8c..0f2976a8c 100644
--- a/data/scripts/maps/SecretBase_Tree2.inc
+++ b/data/maps/SecretBase_Tree2/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc
index 25bc95466..25bc95466 100644
--- a/data/maps/events/SecretBase_Tree3.inc
+++ b/data/maps/SecretBase_Tree3/events.inc
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
index 09e55e66d..d3f49d3e0 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree3:: @ 8307898
-	.4byte SecretBase_Tree3_MapAttributes
+	.4byte SecretBase_Tree3_Layout
 	.4byte SecretBase_Tree3_MapEvents
 	.4byte SecretBase_Tree3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 214
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc
index cb80b0d25..cb80b0d25 100644
--- a/data/scripts/maps/SecretBase_Tree3.inc
+++ b/data/maps/SecretBase_Tree3/scripts.inc
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc
index 6f0e5b3b5..6f0e5b3b5 100644
--- a/data/maps/events/SecretBase_Tree4.inc
+++ b/data/maps/SecretBase_Tree4/events.inc
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
index cfb58242e..53a723432 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree4:: @ 8307940
-	.4byte SecretBase_Tree4_MapAttributes
+	.4byte SecretBase_Tree4_Layout
 	.4byte SecretBase_Tree4_MapEvents
 	.4byte SecretBase_Tree4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 220
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc
index 0a6771740..0a6771740 100644
--- a/data/scripts/maps/SecretBase_Tree4.inc
+++ b/data/maps/SecretBase_Tree4/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc
index 930cbc21d..930cbc21d 100644
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ b/data/maps/SecretBase_YellowCave1/events.inc
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
index 42a63256f..ecf3d4ea2 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave1:: @ 830772C
-	.4byte SecretBase_YellowCave1_MapAttributes
+	.4byte SecretBase_YellowCave1_Layout
 	.4byte SecretBase_YellowCave1_MapEvents
 	.4byte SecretBase_YellowCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 201
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc
index b76a5f44e..b76a5f44e 100644
--- a/data/scripts/maps/SecretBase_YellowCave1.inc
+++ b/data/maps/SecretBase_YellowCave1/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc
index fd3e265e5..fd3e265e5 100644
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ b/data/maps/SecretBase_YellowCave2/events.inc
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
index d57acde5c..cbee83030 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave2:: @ 83077D4
-	.4byte SecretBase_YellowCave2_MapAttributes
+	.4byte SecretBase_YellowCave2_Layout
 	.4byte SecretBase_YellowCave2_MapEvents
 	.4byte SecretBase_YellowCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 207
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc
index 0bc1fc354..0bc1fc354 100644
--- a/data/scripts/maps/SecretBase_YellowCave2.inc
+++ b/data/maps/SecretBase_YellowCave2/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc
index 99f0ae8b4..99f0ae8b4 100644
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ b/data/maps/SecretBase_YellowCave3/events.inc
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
index ecb6b7086..cea1c9175 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave3:: @ 830787C
-	.4byte SecretBase_YellowCave3_MapAttributes
+	.4byte SecretBase_YellowCave3_Layout
 	.4byte SecretBase_YellowCave3_MapEvents
 	.4byte SecretBase_YellowCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 213
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc
index 137f04316..137f04316 100644
--- a/data/scripts/maps/SecretBase_YellowCave3.inc
+++ b/data/maps/SecretBase_YellowCave3/scripts.inc
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc
index af59e0067..af59e0067 100644
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ b/data/maps/SecretBase_YellowCave4/events.inc
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 97de9362b..e744080bd 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave4:: @ 8307924
-	.4byte SecretBase_YellowCave4_MapAttributes
+	.4byte SecretBase_YellowCave4_Layout
 	.4byte SecretBase_YellowCave4_MapEvents
 	.4byte SecretBase_YellowCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 219
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
index bb673b7b6..bb673b7b6 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
index c7225843f..c7225843f 100644
--- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index e012b1a69..16287338d 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_HighTideEntranceRoom:: @ 83072E8
-	.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_HighTideEntranceRoom_Layout
 	.4byte ShoalCave_HighTideEntranceRoom_MapEvents
 	.4byte ShoalCave_HighTideEntranceRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 169
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
index ae1f2c279..ae1f2c279 100644
--- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
index e7951742a..e7951742a 100644
--- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index c3f16869b..63bb3f47e 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_HighTideInnerRoom:: @ 8307304
-	.4byte ShoalCave_HighTideInnerRoom_MapAttributes
+	.4byte ShoalCave_HighTideInnerRoom_Layout
 	.4byte ShoalCave_HighTideInnerRoom_MapEvents
 	.4byte ShoalCave_HighTideInnerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 170
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
index 9b47c97e7..9b47c97e7 100644
--- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
index fe4a2eae9..fe4a2eae9 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index db63a0f9d..05cac9619 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideEntranceRoom:: @ 8307278
-	.4byte ShoalCave_LowTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_LowTideEntranceRoom_Layout
 	.4byte ShoalCave_LowTideEntranceRoom_MapEvents
 	.4byte ShoalCave_LowTideEntranceRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 165
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index 2005cb67b..2005cb67b 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/text.inc
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc
index 87d291c40..87d291c40 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index ba36a090d..3cc9967fb 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideIceRoom:: @ 8307684
-	.4byte ShoalCave_LowTideIceRoom_MapAttributes
+	.4byte ShoalCave_LowTideIceRoom_Layout
 	.4byte ShoalCave_LowTideIceRoom_MapEvents
 	.4byte ShoalCave_LowTideIceRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 329
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
index 311ff2126..311ff2126 100644
--- a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
index 746f36cdc..746f36cdc 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index c038dafcd..be5fb9413 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideInnerRoom:: @ 8307294
-	.4byte ShoalCave_LowTideInnerRoom_MapAttributes
+	.4byte ShoalCave_LowTideInnerRoom_Layout
 	.4byte ShoalCave_LowTideInnerRoom_MapEvents
 	.4byte ShoalCave_LowTideInnerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 166
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 21997d076..21997d076 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/text.inc
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
index 6ff9a44b3..6ff9a44b3 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index 6fe4efb01..5d82ba865 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideLowerRoom:: @ 83072CC
-	.4byte ShoalCave_LowTideLowerRoom_MapAttributes
+	.4byte ShoalCave_LowTideLowerRoom_Layout
 	.4byte ShoalCave_LowTideLowerRoom_MapEvents
 	.4byte ShoalCave_LowTideLowerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 168
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index 19223a499..19223a499 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/text.inc
index c9d4337de..c9d4337de 100644
--- a/data/text/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/text.inc
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
index 65570d256..65570d256 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index d3d904731..976bc6ad9 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideStairsRoom:: @ 83072B0
-	.4byte ShoalCave_LowTideStairsRoom_MapAttributes
+	.4byte ShoalCave_LowTideStairsRoom_Layout
 	.4byte ShoalCave_LowTideStairsRoom_MapEvents
 	.4byte ShoalCave_LowTideStairsRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 167
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index 5f9726038..5f9726038 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/text.inc
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc
index e6da2e027..e6da2e027 100644
--- a/data/maps/events/SingleBattleColosseum.inc
+++ b/data/maps/SingleBattleColosseum/events.inc
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
index f62205a55..99e0b090b 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -1,9 +1,9 @@
 SingleBattleColosseum:: @ 8307978
-	.4byte SingleBattleColosseum_MapAttributes
+	.4byte SingleBattleColosseum_Layout
 	.4byte SingleBattleColosseum_MapEvents
 	.4byte SingleBattleColosseum_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 222
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc
index d3f2bdcaf..d3f2bdcaf 100644
--- a/data/scripts/maps/SingleBattleColosseum.inc
+++ b/data/maps/SingleBattleColosseum/scripts.inc
diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc
index 2af7aaa76..2af7aaa76 100644
--- a/data/maps/events/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/events.inc
diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
index 4ccc410da..c530fde86 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_1F:: @ 8307614
-	.4byte SkyPillar_1F_MapAttributes
+	.4byte SkyPillar_1F_Layout
 	.4byte SkyPillar_1F_MapEvents
 	.4byte SkyPillar_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 323
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc
index aa6c117da..aa6c117da 100644
--- a/data/scripts/maps/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc
index 48fcb9fec..48fcb9fec 100644
--- a/data/maps/events/SkyPillar_2F.inc
+++ b/data/maps/SkyPillar_2F/events.inc
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
index 1e3b0393d..ce61cf5b8 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_2F:: @ 8307630
-	.4byte SkyPillar_2F_MapAttributes
+	.4byte SkyPillar_2F_Layout
 	.4byte SkyPillar_2F_MapEvents
 	.4byte SkyPillar_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 324
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/scripts.inc
index bd87e8562..bd87e8562 100644
--- a/data/scripts/maps/SkyPillar_2F.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc
index 4aeda3339..4aeda3339 100644
--- a/data/maps/events/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/events.inc
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
index bd6d9cb86..eaed10d93 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_3F:: @ 830764C
-	.4byte SkyPillar_3F_MapAttributes
+	.4byte SkyPillar_3F_Layout
 	.4byte SkyPillar_3F_MapEvents
 	.4byte SkyPillar_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 325
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc
index 2dc97fc9c..2dc97fc9c 100644
--- a/data/scripts/maps/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc
index 3e908ed74..3e908ed74 100644
--- a/data/maps/events/SkyPillar_4F.inc
+++ b/data/maps/SkyPillar_4F/events.inc
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
index 50869e629..f14e016c8 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_4F:: @ 8307668
-	.4byte SkyPillar_4F_MapAttributes
+	.4byte SkyPillar_4F_Layout
 	.4byte SkyPillar_4F_MapEvents
 	.4byte SkyPillar_4F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 326
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/scripts.inc
index 860f35b48..860f35b48 100644
--- a/data/scripts/maps/SkyPillar_4F.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc
index badae77af..badae77af 100644
--- a/data/maps/events/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/events.inc
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
index 16da8bcf4..e4ff00b1a 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_5F:: @ 83076A0
-	.4byte SkyPillar_5F_MapAttributes
+	.4byte SkyPillar_5F_Layout
 	.4byte SkyPillar_5F_MapEvents
 	.4byte SkyPillar_5F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 331
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc
index 64e6d0f38..64e6d0f38 100644
--- a/data/scripts/maps/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc
index 904b3b9ae..904b3b9ae 100644
--- a/data/maps/events/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/events.inc
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
index 89d9becd9..84dfe9b5c 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_Entrance:: @ 83075DC
-	.4byte SkyPillar_Entrance_MapAttributes
+	.4byte SkyPillar_Entrance_Layout
 	.4byte SkyPillar_Entrance_MapEvents
 	.4byte SkyPillar_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 321
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index ab991d845..ab991d845 100644
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc
index 120cd982b..120cd982b 100644
--- a/data/maps/events/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/events.inc
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
index 44e9a5991..71aa1ad84 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_Outside:: @ 83075F8
-	.4byte SkyPillar_Outside_MapAttributes
+	.4byte SkyPillar_Outside_Layout
 	.4byte SkyPillar_Outside_MapEvents
 	.4byte SkyPillar_Outside_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 322
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 51e6a4e83..51e6a4e83 100644
--- a/data/scripts/maps/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc
index 9fc989c78..9fc989c78 100644
--- a/data/maps/events/SkyPillar_Top.inc
+++ b/data/maps/SkyPillar_Top/events.inc
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index 0c241fe27..aaaf40fc4 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_Top:: @ 83076BC
-	.4byte SkyPillar_Top_MapAttributes
+	.4byte SkyPillar_Top_Layout
 	.4byte SkyPillar_Top_MapEvents
 	.4byte SkyPillar_Top_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 332
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc
index 82149a4bc..82149a4bc 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc
index 685bc7359..685bc7359 100644
--- a/data/maps/events/SlateportCity.inc
+++ b/data/maps/SlateportCity/events.inc
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
index 6575e0de5..738a383e7 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -1,9 +1,9 @@
 SlateportCity:: @ 8305464
-	.4byte SlateportCity_MapAttributes
+	.4byte SlateportCity_Layout
 	.4byte SlateportCity_MapEvents
 	.4byte SlateportCity_MapScripts
 	.4byte SlateportCity_MapConnections
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 2
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
new file mode 100644
index 000000000..5583762d3
--- /dev/null
+++ b/data/maps/SlateportCity/scripts.inc
@@ -0,0 +1,641 @@
+SlateportCity_MapScripts:: @ 814BA36
+	map_script 3, SlateportCity_MapScript1_14BA3C
+	.byte 0
+
+SlateportCity_MapScript1_14BA3C:: @ 814BA3C
+	.ifdef SAPPHIRE
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	.else
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	.endif
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
+	call SlateportCity_EventScript_14BA5C
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BA68
+	end
+
+SlateportCity_EventScript_14BA5C:: @ 814BA5C
+	setflag FLAG_VISITED_SLATEPORT_CITY
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	return
+
+SlateportCity_EventScript_14BA68:: @ 814BA68
+	setobjectxyperm 11, 28, 13
+	setobjectxyperm 7, 25, 13
+	setobjectxyperm 3, 25, 14
+	setobjectxyperm 6, 27, 16
+	setobjectxyperm 8, 28, 16
+	setobjectxyperm 1, 29, 16
+	setobjectxyperm 2, 31, 14
+	setobjectmovementtype 11, 8
+	setobjectmovementtype 7, 18
+	setobjectmovementtype 3, 16
+	setobjectmovementtype 6, 7
+	setobjectmovementtype 8, 7
+	setobjectmovementtype 1, 7
+	setobjectmovementtype 2, 9
+	return
+
+SlateportCity_EventScript_14BAB6:: @ 814BAB6
+	lock
+	faceplayer
+	message SlateportCity_Text_164642
+	waitmessage
+	pokemart SlateportCity_Items1
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Items1:: @ 814BAD0
+	.2byte ITEM_PROTEIN
+	.2byte ITEM_IRON
+	.2byte ITEM_CARBOS
+	.2byte ITEM_ZINC
+	.2byte ITEM_CALCIUM
+	.2byte ITEM_HP_UP
+	.2byte ITEM_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BAE0:: @ 814BAE0
+	lock
+	faceplayer
+	bufferleadmonspeciesname 0
+	msgbox SlateportCity_Text_164682, 4
+	specialvar RESULT, LeadMonHasEffortRibbon
+	compare RESULT, 1
+	call_if_eq SlateportCity_EventScript_14BB35
+	specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
+	compare RESULT, 0
+	call_if_eq SlateportCity_EventScript_14BB2B
+	msgbox SlateportCity_Text_164691, 4
+	playfanfare MUS_FANFA4
+	message SlateportCity_Text_1646DD
+	waitfanfare
+	waitmessage
+	msgbox SlateportCity_Text_1646FC, 4
+	special GivLeadMonEffortRibbon
+	release
+	end
+
+SlateportCity_EventScript_14BB2B:: @ 814BB2B
+	msgbox SlateportCity_Text_16471C, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB35:: @ 814BB35
+	msgbox SlateportCity_Text_164775, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB3F:: @ 814BB3F
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BB56
+	msgbox SlateportCity_Text_164814, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB56:: @ 814BB56
+	msgbox SlateportCity_Text_165376, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB60:: @ 814BB60
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BB77
+	msgbox SlateportCity_Text_1648A0, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB77:: @ 814BB77
+	msgbox SlateportCity_Text_165222, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB81:: @ 814BB81
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BBA1
+	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB
+	msgbox SlateportCity_Text_164937, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBA1:: @ 814BBA1
+	msgbox SlateportCity_Text_1652A0, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBAB:: @ 814BBAB
+	msgbox SlateportCity_Text_164995, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBB5:: @ 814BBB5
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BBCC
+	msgbox SlateportCity_Text_164A30, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBCC:: @ 814BBCC
+	msgbox SlateportCity_Text_16530A, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBD6:: @ 814BBD6
+	compare VAR_SLATEPORT_STATE, 1
+	goto_if_eq SlateportCity_EventScript_14BBEA
+	msgbox SlateportCity_Text_164AA9, 2
+	end
+
+SlateportCity_EventScript_14BBEA:: @ 814BBEA
+	msgbox SlateportCity_Text_1653D1, 3
+	end
+
+SlateportCity_EventScript_14BBF3:: @ 814BBF3
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BC0A
+	msgbox SlateportCity_Text_164B34, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC0A:: @ 814BC0A
+	msgbox SlateportCity_Text_1653F4, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC14:: @ 814BC14
+	lock
+	faceplayer
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29
+	msgbox SlateportCity_Text_164BBF, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC29:: @ 814BC29
+	msgbox SlateportCity_Text_164BEA, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC33:: @ 814BC33
+	msgbox SlateportCity_Text_165856, 3
+	end
+
+SlateportCity_EventScript_14BC3C:: @ 814BC3C
+	lockall
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59
+	msgbox SlateportCity_Text_1658A0, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BC59:: @ 814BC59
+	msgbox SlateportCity_Text_1658E8, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BC63:: @ 814BC63
+	msgbox SlateportCity_Text_165952, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BC6D:: @ 814BC6D
+	msgbox SlateportCity_Text_1659B3, 3
+	end
+
+SlateportCity_EventScript_14BC76:: @ 814BC76
+	msgbox SlateportCity_Text_1659E3, 3
+	end
+
+SlateportCity_EventScript_14BC7F:: @ 814BC7F
+	msgbox SlateportCity_Text_165A17, 3
+	end
+
+SlateportCity_EventScript_14BC88:: @ 814BC88
+	msgbox SlateportCity_Text_165A57, 3
+	end
+
+SlateportCity_EventScript_14BC91:: @ 814BC91
+	lockall
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5
+	msgbox SlateportCity_Text_165A8B, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BCA5:: @ 814BCA5
+	msgbox SlateportCity_Text_165B02, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BCAF:: @ 814BCAF
+	msgbox SlateportCity_Text_165B48, 3
+	end
+
+SlateportCity_EventScript_14BCB8:: @ 814BCB8
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BCCF
+	msgbox SlateportCity_Text_164F9E, 4
+	release
+	end
+
+SlateportCity_EventScript_14BCCF:: @ 814BCCF
+	msgbox SlateportCity_Text_164F9E, 4
+	release
+	end
+
+SlateportCity_EventScript_14BCD9:: @ 814BCD9
+	msgbox SlateportCity_Text_164FFC, 2
+	end
+
+SlateportCity_EventScript_14BCE2:: @ 814BCE2
+	msgbox SlateportCity_Text_164E85, 2
+	end
+
+SlateportCity_EventScript_14BCEB:: @ 814BCEB
+	msgbox SlateportCity_Text_164EDB, 2
+	end
+
+SlateportCity_EventScript_14BCF4:: @ 814BCF4
+	msgbox SlateportCity_Text_164F62, 2
+	end
+
+SlateportCity_EventScript_14BCFD:: @ 814BCFD
+	msgbox SlateportCity_Text_16507C, 2
+	end
+
+SlateportCity_EventScript_14BD06:: @ 814BD06
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq SlateportCity_EventScript_14BD28
+	compare RESULT, NO
+	call_if_eq SlateportCity_EventScript_14BD31
+	release
+	end
+
+SlateportCity_EventScript_14BD28:: @ 814BD28
+	msgbox SlateportCity_Text_16511E, 4
+	return
+
+SlateportCity_EventScript_14BD31:: @ 814BD31
+	msgbox SlateportCity_Text_1651A1, 4
+	return
+
+SlateportCity_EventScript_14BD3A:: @ 814BD3A
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164C64, 4
+	closemessage
+	applymovement 5, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD51:: @ 814BD51
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164C9F, 4
+	closemessage
+	applymovement 19, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD68:: @ 814BD68
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164CE8, 4
+	closemessage
+	applymovement 20, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD7F:: @ 814BD7F
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164D2B, 4
+	closemessage
+	applymovement 27, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD96:: @ 814BD96
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164D92, 4
+	closemessage
+	applymovement 28, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDAD:: @ 814BDAD
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164DD5, 4
+	closemessage
+	applymovement 29, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDC4:: @ 814BDC4
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164DF4, 4
+	closemessage
+	applymovement 30, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDDB:: @ 814BDDB
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164E46, 4
+	closemessage
+	applymovement 31, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDF2:: @ 814BDF2
+	lock
+	faceplayer
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemartdecoration SlateportCity_Decorations1
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Decorations1:: @ 814BE0C
+	.2byte DECOR_AZURILL_DOLL
+	.2byte DECOR_MARILL_DOLL
+	.2byte DECOR_SKITTY_DOLL
+	.2byte DECOR_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BE16:: @ 814BE16
+	msgbox SlateportCity_Text_1A116E, 4
+	release
+	end
+
+SlateportCity_EventScript_14BE20:: @ 814BE20
+	lock
+	faceplayer
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemartdecoration SlateportCity_Decorations2
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Decorations2:: @ 814BE40
+	.2byte DECOR_RED_BRICK
+	.2byte DECOR_BLUE_BRICK
+	.2byte DECOR_YELLOW_BRICK
+	.2byte DECOR_RED_BALLOON
+	.2byte DECOR_BLUE_BALLOON
+	.2byte DECOR_YELLOW_BALLOON
+	.2byte DECOR_C_LOW_NOTE_MAT
+	.2byte DECOR_D_NOTE_MAT
+	.2byte DECOR_E_NOTE_MAT
+	.2byte DECOR_F_NOTE_MAT
+	.2byte DECOR_G_NOTE_MAT
+	.2byte DECOR_A_NOTE_MAT
+	.2byte DECOR_B_NOTE_MAT
+	.2byte DECOR_C_HIGH_NOTE_MAT
+	.2byte DECOR_NONE
+	release
+	end
+
+@ 814BE60
+	lock
+	faceplayer
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemartdecoration SlateportCity_Decorations3
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Decorations3:: @ 814BE80
+	.2byte DECOR_MUD_BALL
+	.2byte DECOR_SLIDE
+	.2byte DECOR_FENCE_LENGTH
+	.2byte DECOR_FENCE_WIDTH
+	.2byte DECOR_TIRE
+	.2byte DECOR_BREAKABLE_DOOR
+	.2byte DECOR_SOLID_BOARD
+	.2byte DECOR_STAND
+	.2byte DECOR_TV
+	.2byte DECOR_ROUND_TV
+	.2byte DECOR_CUTE_TV
+	.2byte DECOR_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BE9A:: @ 814BE9A
+	lock
+	faceplayer
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemart SlateportCity_Items2
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Items2:: @ 814BEB4
+	.2byte ITEM_TM10_HIDDEN_POWER
+	.2byte ITEM_TM43_SECRET_POWER
+	.2byte ITEM_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BEBC:: @ 814BEBC
+	lockall
+	msgbox SlateportCity_Text_165498, 4
+	msgbox SlateportCity_Text_1654E0, 4
+	closemessage
+	applymovement 10, SlateportCity_Movement_1A0843
+	waitmovement 0
+	delay 10
+	applymovement 9, SlateportCity_Movement_1A0845
+	waitmovement 0
+	delay 25
+	applymovement 11, SlateportCity_Movement_14C000
+	applymovement 255, SlateportCity_Movement_14C00E
+	applymovement 10, SlateportCity_Movement_14BFDD
+	applymovement 9, SlateportCity_Movement_14BFEA
+	waitmovement 0
+	removeobject 10
+	removeobject 9
+	msgbox SlateportCity_Text_16558D, 4
+	applymovement 11, SlateportCity_Movement_1A0841
+	waitmovement 0
+	msgbox SlateportCity_Text_1655E7, 4
+	playbgm MUS_EVIL_TEAM, FALSE
+	msgbox SlateportCity_Text_1656BC, 4
+	applymovement 6, SlateportCity_Movement_1A083F
+	applymovement 1, SlateportCity_Movement_1A083F
+	applymovement 7, SlateportCity_Movement_14BFCD
+	applymovement 3, SlateportCity_Movement_1A0831
+	applymovement 2, SlateportCity_Movement_14BFD5
+	waitmovement 0
+	applymovement 11, SlateportCity_Movement_1A0845
+	waitmovement 0
+	msgbox SlateportCity_Text_16578F, 4
+	playse SE_PIN
+	applymovement 11, SlateportCity_Movement_1A0833
+	waitmovement 0
+	applymovement 11, SlateportCity_Movement_1A0835
+	waitmovement 0
+	msgbox SlateportCity_Text_1657FA, 4
+	applymovement 11, SlateportCity_Movement_1A0839
+	waitmovement 0
+	msgbox SlateportCity_Text_16583A, 4
+	closemessage
+	applymovement 11, SlateportCity_Movement_14BFFB
+	applymovement 255, SlateportCity_Movement_14C008
+	waitmovement 0
+	removeobject 11
+	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	setvar VAR_SLATEPORT_STATE, 2
+	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
+	waitstate
+	releaseall
+	end
+
+SlateportCity_Movement_14BFCD:: @ 814BFCD
+	delay_16
+	delay_16
+	emote_question_mark
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_Movement_14BFD5:: @ 814BFD5
+	emote_question_mark
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_Movement_14BFDD:: @ 814BFDD
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+SlateportCity_Movement_14BFEA:: @ 814BFEA
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+@ 814BFF8
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+SlateportCity_Movement_14BFFB:: @ 814BFFB
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
+	end_movement
+
+SlateportCity_Movement_14C000:: @ 814C000
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_left
+	end_movement
+
+SlateportCity_Movement_14C008:: @ 814C008
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_right
+	walk_up
+	end_movement
+
+SlateportCity_Movement_14C00E:: @ 814C00E
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
+
+SlateportCity_EventScript_14C017:: @ 814C017
+	msgbox SlateportCity_Text_165425, 3
+	end
+
+SlateportCity_EventScript_14C020:: @ 814C020
+	msgbox SlateportCity_Text_165458, 3
+	end
+
+SlateportCity_EventScript_14C029:: @ 814C029
+	msgbox SlateportCity_Text_1647A7, 2
+	end
diff --git a/data/text/maps/SlateportCity.inc b/data/maps/SlateportCity/text.inc
index 3ff5d51bf..3ff5d51bf 100644
--- a/data/text/maps/SlateportCity.inc
+++ b/data/maps/SlateportCity/text.inc
diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/events.inc
index b2a57ccc9..b2a57ccc9 100644
--- a/data/maps/events/SlateportCity_ContestHall.inc
+++ b/data/maps/SlateportCity_ContestHall/events.inc
diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc
index 64cc06565..d327e87c7 100644
--- a/data/maps/SlateportCity_ContestHall/header.inc
+++ b/data/maps/SlateportCity_ContestHall/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_ContestHall:: @ 8306034
-	.4byte SlateportCity_ContestHall_MapAttributes
+	.4byte ContestHall_Layout
 	.4byte SlateportCity_ContestHall_MapEvents
 	.4byte SlateportCity_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 73
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/scripts.inc
index 5f6a3c15d..5f6a3c15d 100644
--- a/data/scripts/maps/SlateportCity_ContestHall.inc
+++ b/data/maps/SlateportCity_ContestHall/scripts.inc
diff --git a/data/text/maps/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/text.inc
index 6199157fb..6199157fb 100644
--- a/data/text/maps/SlateportCity_ContestHall.inc
+++ b/data/maps/SlateportCity_ContestHall/text.inc
diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/events.inc
index 8981bf455..8981bf455 100644
--- a/data/maps/events/SlateportCity_ContestLobby.inc
+++ b/data/maps/SlateportCity_ContestLobby/events.inc
diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc
index 440139e64..0531ef226 100644
--- a/data/maps/SlateportCity_ContestLobby/header.inc
+++ b/data/maps/SlateportCity_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_ContestLobby:: @ 8306018
-	.4byte SlateportCity_ContestLobby_MapAttributes
+	.4byte ContestLobby_Layout
 	.4byte SlateportCity_ContestLobby_MapEvents
 	.4byte SlateportCity_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 72
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc
index fd26671dd..fd26671dd 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/maps/SlateportCity_ContestLobby/scripts.inc
diff --git a/data/text/maps/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/text.inc
index 7c32cd8ac..7c32cd8ac 100644
--- a/data/text/maps/SlateportCity_ContestLobby.inc
+++ b/data/maps/SlateportCity_ContestLobby/text.inc
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc
index a7581ab2a..a7581ab2a 100644
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ b/data/maps/SlateportCity_Harbor/events.inc
diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc
index d7da07b49..5de5d2e5f 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_Harbor:: @ 83060C0
-	.4byte SlateportCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte SlateportCity_Harbor_MapEvents
 	.4byte SlateportCity_Harbor_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 88
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
new file mode 100644
index 000000000..872c70352
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -0,0 +1,369 @@
+SlateportCity_Harbor_MapScripts:: @ 8155F5D
+	map_script 3, SlateportCity_Harbor_MapScript1_155F63
+	.byte 0
+
+SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
+	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
+	setvar VAR_TEMP_1, 0
+	compare VAR_SLATEPORT_HARBOR_STATE, 1
+	call_if_eq SlateportCity_Harbor_EventScript_155F89
+	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85
+	end
+
+SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	return
+
+SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
+	savebgm MUS_EVIL_TEAM
+	setobjectxyperm 4, 12, 13
+	setobjectmovementtype 4, 9
+	setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
+	return
+
+SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF
+	lockall
+	setvar VAR_SPECIAL_8, 3
+	applymovement 255, SlateportCity_Harbor_Movement_1560C2
+	waitmovement 0
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
+	applymovement 7, SlateportCity_Harbor_Movement_1A0845
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0841
+	waitmovement 0
+	msgbox SlateportCity_Harbor_Text_17FD7D, 4
+	closemessage
+	applymovement 6, SlateportCity_Harbor_Movement_15609B
+	applymovement 7, SlateportCity_Harbor_Movement_15609B
+	applymovement 8, SlateportCity_Harbor_Movement_1560A5
+	waitmovement 0
+	removeobject 6
+	removeobject 7
+	removeobject 8
+	setvar VAR_SLATEPORT_HARBOR_STATE, 2
+	compare VAR_SPECIAL_8, 0
+	call_if_eq SlateportCity_Harbor_EventScript_15605C
+	compare VAR_SPECIAL_8, 1
+	call_if_eq SlateportCity_Harbor_EventScript_156071
+	compare VAR_SPECIAL_8, 2
+	call_if_eq SlateportCity_Harbor_EventScript_156086
+	compare VAR_SPECIAL_8, 3
+	call_if_eq SlateportCity_Harbor_EventScript_156086
+	msgbox SlateportCity_Harbor_Text_17FE60, 4
+	closemessage
+	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
+	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
+	moveobjectoffscreen 4
+	setobjectmovementtype 4, 10
+	releaseall
+	end
+
+SlateportCity_Harbor_EventScript_15605C:: @ 815605C
+	applymovement 4, SlateportCity_Harbor_Movement_1560B3
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0845
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_156071:: @ 8156071
+	applymovement 4, SlateportCity_Harbor_Movement_1560B9
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0843
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_156086:: @ 8156086
+	applymovement 4, SlateportCity_Harbor_Movement_1560BE
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0843
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_Movement_15609B:: @ 815609B
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	end_movement
+
+@ 81560A0
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	end_movement
+
+SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+SlateportCity_Harbor_Movement_1560B3:: @ 81560B3
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	end_movement
+
+SlateportCity_Harbor_Movement_1560B9:: @ 81560B9
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	end_movement
+
+SlateportCity_Harbor_Movement_1560BE:: @ 81560BE
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
+	walk_up
+	end_movement
+
+SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
+	lock
+	faceplayer
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9
+	msgbox SlateportCity_Harbor_Text_17FA0A, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9
+	msgbox SlateportCity_Harbor_Text_17FA73, 4
+	checkitem ITEM_SS_TICKET, 1
+	compare RESULT, 0
+	goto_if_eq SlateportCity_Harbor_EventScript_156135
+	message SlateportCity_Harbor_Text_17FB0A
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1560FD
+	end
+
+SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD
+	multichoicedefault 18, 6, 52, 2, 0
+	switch RESULT
+	case 0, SlateportCity_Harbor_EventScript_15613F
+	case 1, SlateportCity_Harbor_EventScript_156167
+	case 2, SlateportCity_Harbor_EventScript_1561DA
+	case 127, SlateportCity_Harbor_EventScript_1561DA
+	end
+
+SlateportCity_Harbor_EventScript_156135:: @ 8156135
+	msgbox SlateportCity_Harbor_Text_17FAAD, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15613F:: @ 815613F
+	msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_15618A
+	setvar VAR_PORTHOLE_STATE, 1
+	call SlateportCity_Harbor_EventScript_156196
+	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	waitstate
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156167:: @ 8156167
+	msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_15618A
+	call SlateportCity_Harbor_EventScript_156196
+	warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23
+	waitstate
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15618A:: @ 815618A
+	message SlateportCity_Harbor_Text_17FBE5
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1560FD
+	end
+
+SlateportCity_Harbor_EventScript_156196:: @ 8156196
+	msgbox SlateportCity_Harbor_Text_17FBB6, 4
+	closemessage
+	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841
+	waitmovement 0
+	delay 30
+	hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
+	compare FACING, 2
+	call_if_eq SlateportCity_Harbor_EventScript_1561EF
+	compare FACING, 4
+	call_if_eq SlateportCity_Harbor_EventScript_1561E4
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
+	setvar VAR_SPECIAL_4, 5
+	call SlateportCity_Harbor_EventScript_1A040E
+	return
+
+SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA
+	msgbox SlateportCity_Harbor_Text_17FB5F, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4
+	applymovement 255, SlateportCity_Harbor_Movement_1561FA
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF
+	applymovement 255, SlateportCity_Harbor_Movement_1561FD
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_Movement_1561FA:: @ 81561FA
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+SlateportCity_Harbor_Movement_1561FD:: @ 81561FD
+	walk_up
+	end_movement
+
+SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF
+	msgbox SlateportCity_Harbor_Text_17FC07, 2
+	end
+
+SlateportCity_Harbor_EventScript_156208:: @ 8156208
+	msgbox SlateportCity_Harbor_Text_17FC7C, 2
+	end
+
+SlateportCity_Harbor_EventScript_156211:: @ 8156211
+	lock
+	faceplayer
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258
+	compare VAR_SLATEPORT_HARBOR_STATE, 2
+	goto_if_eq SlateportCity_Harbor_EventScript_15624E
+	msgbox SlateportCity_Harbor_Text_17FD1C, 4
+	closemessage
+	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15624E:: @ 815624E
+	msgbox SlateportCity_Harbor_Text_17FE60, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156258:: @ 8156258
+	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
+	msgbox SlateportCity_Harbor_Text_17FF35, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156265:: @ 8156265
+	msgbox SlateportCity_Harbor_Text_1800A0, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15626F:: @ 815626F
+	compare VAR_TEMP_1, 1
+	goto_if_eq SlateportCity_Harbor_EventScript_156380
+	checkitem ITEM_SCANNER, 1
+	compare RESULT, 1
+	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D
+	msgbox SlateportCity_Harbor_Text_18017B, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15629D:: @ 815629D
+	msgbox SlateportCity_Harbor_Text_1801EA, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7
+	message SlateportCity_Harbor_Text_18028B
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1562B3
+	end
+
+SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3
+	multichoice 0, 0, 46, 0
+	switch RESULT
+	case 0, SlateportCity_Harbor_EventScript_1562EA
+	case 1, SlateportCity_Harbor_EventScript_15632A
+	case 2, SlateportCity_Harbor_EventScript_15636A
+	case 127, SlateportCity_Harbor_EventScript_15636A
+	end
+
+SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
+	msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_156374
+	giveitem_std ITEM_DEEP_SEA_TOOTH
+	compare RESULT, 0
+	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
+	takeitem ITEM_SCANNER, 1
+	msgbox SlateportCity_Harbor_Text_18046B, 4
+	setflag FLAG_EXCHANGED_SCANNER
+	goto SlateportCity_Harbor_EventScript_156380
+	end
+
+SlateportCity_Harbor_EventScript_15632A:: @ 815632A
+	msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_156374
+	giveitem_std ITEM_DEEP_SEA_SCALE
+	compare RESULT, 0
+	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
+	takeitem ITEM_SCANNER, 1
+	msgbox SlateportCity_Harbor_Text_18046B, 4
+	setflag FLAG_EXCHANGED_SCANNER
+	goto SlateportCity_Harbor_EventScript_156380
+	end
+
+SlateportCity_Harbor_EventScript_15636A:: @ 815636A
+	msgbox SlateportCity_Harbor_Text_180360, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156374:: @ 8156374
+	message SlateportCity_Harbor_Text_180447
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1562B3
+	end
+
+SlateportCity_Harbor_EventScript_156380:: @ 8156380
+	setvar VAR_TEMP_1, 1
+	msgbox SlateportCity_Harbor_Text_180491, 4
+	release
+	end
diff --git a/data/text/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/text.inc
index 187dfe07c..187dfe07c 100644
--- a/data/text/maps/SlateportCity_Harbor.inc
+++ b/data/maps/SlateportCity_Harbor/text.inc
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc
index bc83e91ce..bc83e91ce 100644
--- a/data/maps/events/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/events.inc
diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc
index 75a5cdb72..548424b49 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_House1:: @ 8306050
-	.4byte SlateportCity_House1_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte SlateportCity_House1_MapEvents
 	.4byte SlateportCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 80
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc
index be2955937..be2955937 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
diff --git a/data/text/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/text.inc
index c711aec2f..c711aec2f 100644
--- a/data/text/maps/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/text.inc
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc
index d115e8225..d115e8225 100644
--- a/data/maps/events/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/events.inc
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
index 00b9399a3..d731c0542 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_House2:: @ 83060DC
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte SlateportCity_House2_MapEvents
 	.4byte SlateportCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 60
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc
index 934fae153..934fae153 100644
--- a/data/scripts/maps/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/scripts.inc
diff --git a/data/text/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/text.inc
index c3d8346bc..c3d8346bc 100644
--- a/data/text/maps/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/text.inc
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc
index abf6ebdce..abf6ebdce 100644
--- a/data/maps/events/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/events.inc
diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc
index 12f2172be..d66d2452e 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_Mart:: @ 8306130
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte SlateportCity_Mart_MapEvents
 	.4byte SlateportCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc
index 39a1d5ba2..39a1d5ba2 100644
--- a/data/scripts/maps/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
diff --git a/data/text/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/text.inc
index b5243d406..b5243d406 100644
--- a/data/text/maps/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/text.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
index 825c589de..825c589de 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
index 7aaa2ff91..60fe69e70 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_OceanicMuseum_1F:: @ 8306088
-	.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
+	.4byte SlateportCity_OceanicMuseum_1F_Layout
 	.4byte SlateportCity_OceanicMuseum_1F_MapEvents
 	.4byte SlateportCity_OceanicMuseum_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FUNE_KAN
+	.2byte MUS_FUNE_KAN
 	.2byte 86
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index cb65f1be5..cb65f1be5 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
diff --git a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc
index 0d3d1eec6..0d3d1eec6 100644
--- a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
index bb52f2403..bb52f2403 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
index 3d9153f56..8baa101fa 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_OceanicMuseum_2F:: @ 83060A4
-	.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
+	.4byte SlateportCity_OceanicMuseum_2F_Layout
 	.4byte SlateportCity_OceanicMuseum_2F_MapEvents
 	.4byte SlateportCity_OceanicMuseum_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FUNE_KAN
+	.2byte MUS_FUNE_KAN
 	.2byte 87
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
new file mode 100644
index 000000000..ce0bc855f
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -0,0 +1,272 @@
+SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA
+	map_script 3, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0
+	.byte 0
+
+SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0
+	call SlateportCity_OceanicMuseum_2F_EventScript_1A0196
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
+	lock
+	faceplayer
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4
+	closemessage
+	playbgm MUS_EVIL_TEAM, TRUE
+	addobject 3
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4
+	waitmovement 0
+	addobject 4
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5
+	waitmovement 0
+	compare FACING, 1
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
+	compare FACING, 4
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4
+	compare FACING, 4
+	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4
+	closemessage
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2
+	waitmovement 0
+	compare FACING, 1
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78
+	compare FACING, 3
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83
+	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
+	closemessage
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4
+	savebgm 0
+	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4
+	closemessage
+	delay 35
+	addobject 2
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4
+	.else
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4
+	.endif
+	closemessage
+	fadescreen 1
+	removeobject 2
+	removeobject 3
+	removeobject 4
+	fadescreen 0
+	delay 30
+	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4
+	setvar VAR_SPECIAL_4, 269
+	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4
+	closemessage
+	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98
+	waitmovement 0
+	playse SE_KAIDAN
+	removeobject 1
+	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110
+	setflag FLAG_DELIVERED_DEVON_GOODS
+	clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
+	release
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D
+	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92
+	walk_up
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3
+	walk_down
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EE3:: @ 8155EE3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EEC:: @ 8155EEC
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EF5:: @ 8155EF5
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EFE:: @ 8155EFE
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F07:: @ 8155F07
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F10:: @ 8155F10
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F19:: @ 8155F19
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F22:: @ 8155F22
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F2B:: @ 8155F2B
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F34:: @ 8155F34
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, 2
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F3D:: @ 8155F3D
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, 2
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46
+	lock
+	faceplayer
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4
+	closemessage
+	applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D
+	waitmovement 0
+	release
+	end
diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc
index a3c624f0c..a3c624f0c 100644
--- a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
index d4d9ab405..d4d9ab405 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
index d668f0efc..35d90cdc2 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_PokemonCenter_1F:: @ 83060F8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte SlateportCity_PokemonCenter_1F_MapEvents
 	.4byte SlateportCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index 37b2b95ab..37b2b95ab 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/text.inc
index 2a87ffa93..2a87ffa93 100644
--- a/data/text/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
index df2da68bb..df2da68bb 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
index 36c726d7f..738074ba1 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_PokemonCenter_2F:: @ 8306114
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte SlateportCity_PokemonCenter_2F_MapEvents
 	.4byte SlateportCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index 98782b24d..98782b24d 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc
index 55b0a693d..55b0a693d 100644
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/events.inc
diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc
index 1672d21b1..8094f192f 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_PokemonFanClub:: @ 830606C
-	.4byte SlateportCity_PokemonFanClub_MapAttributes
+	.4byte SlateportCity_PokemonFanClub_Layout
 	.4byte SlateportCity_PokemonFanClub_MapEvents
 	.4byte SlateportCity_PokemonFanClub_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 85
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 6a8c88e1e..6a8c88e1e 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
diff --git a/data/text/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/text.inc
index eab516c2b..eab516c2b 100644
--- a/data/text/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/text.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
index cd5c7c25b..cd5c7c25b 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
index c3516151e..2d98ef5b8 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_SternsShipyard_1F:: @ 8305FE0
-	.4byte SlateportCity_SternsShipyard_1F_MapAttributes
+	.4byte SlateportCity_SternsShipyard_1F_Layout
 	.4byte SlateportCity_SternsShipyard_1F_MapEvents
 	.4byte SlateportCity_SternsShipyard_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 81
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index dd31e8e26..dd31e8e26 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
diff --git a/data/text/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/text.inc
index 8a08a15ae..8a08a15ae 100644
--- a/data/text/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/text.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
index aa5c02e40..aa5c02e40 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
index 242e061aa..e7f1b74b8 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_SternsShipyard_2F:: @ 8305FFC
-	.4byte SlateportCity_SternsShipyard_2F_MapAttributes
+	.4byte SlateportCity_SternsShipyard_2F_Layout
 	.4byte SlateportCity_SternsShipyard_2F_MapEvents
 	.4byte SlateportCity_SternsShipyard_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 82
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index df9227dd3..df9227dd3 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
diff --git a/data/text/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/text.inc
index 0bf4e27e0..0bf4e27e0 100644
--- a/data/text/maps/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/text.inc
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc
index cb793ea47..cb793ea47 100644
--- a/data/maps/events/SootopolisCity.inc
+++ b/data/maps/SootopolisCity/events.inc
diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc
index d5cbae0be..bd41a5c2b 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity:: @ 830550C
-	.4byte SootopolisCity_MapAttributes
+	.4byte SootopolisCity_Layout
 	.4byte SootopolisCity_MapEvents
 	.4byte SootopolisCity_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 8
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/maps/SootopolisCity/scripts.inc
index e18eca17c..e18eca17c 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/maps/SootopolisCity/scripts.inc
diff --git a/data/text/maps/SootopolisCity.inc b/data/maps/SootopolisCity/text.inc
index cfe3fd2e2..cfe3fd2e2 100644
--- a/data/text/maps/SootopolisCity.inc
+++ b/data/maps/SootopolisCity/text.inc
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc
index 43cd0fe75..43cd0fe75 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ b/data/maps/SootopolisCity_Gym_1F/events.inc
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index 185bdc970..0583679dc 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_Gym_1F:: @ 830692C
-	.4byte SootopolisCity_Gym_1F_MapAttributes
+	.4byte SootopolisCity_Gym_1F_Layout
 	.4byte SootopolisCity_Gym_1F_MapEvents
 	.4byte SootopolisCity_Gym_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 110
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index a404013e0..a404013e0 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
diff --git a/data/text/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/text.inc
index 1047a5326..1047a5326 100644
--- a/data/text/maps/SootopolisCity_Gym_1F.inc
+++ b/data/maps/SootopolisCity_Gym_1F/text.inc
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc
index 9ccf07ef6..9ccf07ef6 100644
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/events.inc
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 104ee8215..ea131c587 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_Gym_B1F:: @ 8306948
-	.4byte SootopolisCity_Gym_B1F_MapAttributes
+	.4byte SootopolisCity_Gym_B1F_Layout
 	.4byte SootopolisCity_Gym_B1F_MapEvents
 	.4byte SootopolisCity_Gym_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 111
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
index e54970701..e54970701 100644
--- a/data/scripts/maps/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
diff --git a/data/text/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/text.inc
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc
index a4b4c7932..a4b4c7932 100644
--- a/data/maps/events/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/events.inc
diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc
index 5ff1eb351..924b6a382 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House1:: @ 83069B8
-	.4byte SootopolisCity_House1_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House1_MapEvents
 	.4byte SootopolisCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 308
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc
index d1b842f7b..d1b842f7b 100644
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/text.inc
index 78e8454e5..78e8454e5 100644
--- a/data/text/maps/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/text.inc
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc
index 146a1d871..146a1d871 100644
--- a/data/maps/events/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/events.inc
diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc
index 1ff5a7df1..6360bcf03 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House2:: @ 83069D4
-	.4byte SootopolisCity_House2_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House2_MapEvents
 	.4byte SootopolisCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 309
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc
index d714993d4..d714993d4 100644
--- a/data/scripts/maps/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/text.inc
index e132b20f7..e132b20f7 100644
--- a/data/text/maps/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/text.inc
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc
index d813189e8..d813189e8 100644
--- a/data/maps/events/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/events.inc
diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc
index 3c6075fe7..f7d724e5f 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House3:: @ 83069F0
-	.4byte SootopolisCity_House3_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House3_MapEvents
 	.4byte SootopolisCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 310
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc
index 6ffa30d3d..6ffa30d3d 100644
--- a/data/scripts/maps/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/text.inc
index b67e0a4dc..b67e0a4dc 100644
--- a/data/text/maps/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/text.inc
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc
index 128d0ff99..128d0ff99 100644
--- a/data/maps/events/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/events.inc
diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc
index f155d1980..d18dc2edc 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House4:: @ 8306A0C
-	.4byte SootopolisCity_House4_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House4_MapEvents
 	.4byte SootopolisCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 308
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc
index b552cc6d6..b552cc6d6 100644
--- a/data/scripts/maps/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/text.inc
index 277e2e060..277e2e060 100644
--- a/data/text/maps/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/text.inc
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc
index 2217f3e0f..2217f3e0f 100644
--- a/data/maps/events/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/events.inc
diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc
index 7cfe101ac..f34f45f53 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House5:: @ 8306A28
-	.4byte SootopolisCity_House5_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House5_MapEvents
 	.4byte SootopolisCity_House5_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 309
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 26e5c7d5c..26e5c7d5c 100644
--- a/data/scripts/maps/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/text.inc
index c5887ffe2..c5887ffe2 100644
--- a/data/text/maps/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/text.inc
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc
index a189b98ba..a189b98ba 100644
--- a/data/maps/events/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/events.inc
diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc
index 536872e88..639ea99ba 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House6:: @ 8306A44
-	.4byte SootopolisCity_House6_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House6_MapEvents
 	.4byte SootopolisCity_House6_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 310
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc
index 24c59500a..24c59500a 100644
--- a/data/scripts/maps/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/text.inc
index c8547b412..c8547b412 100644
--- a/data/text/maps/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/text.inc
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc
index 39bc71e79..39bc71e79 100644
--- a/data/maps/events/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/events.inc
diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc
index 598a84316..1d785ec47 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House7:: @ 8306A60
-	.4byte SootopolisCity_House7_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House7_MapEvents
 	.4byte SootopolisCity_House7_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 308
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc
index a9b06b176..a9b06b176 100644
--- a/data/scripts/maps/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/text.inc
index 756a96a1b..756a96a1b 100644
--- a/data/text/maps/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/text.inc
diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/events.inc
index d6b139f34..d6b139f34 100644
--- a/data/maps/events/SootopolisCity_House8.inc
+++ b/data/maps/SootopolisCity_House8/events.inc
diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc
index 4d6619797..58432de80 100644
--- a/data/maps/SootopolisCity_House8/header.inc
+++ b/data/maps/SootopolisCity_House8/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House8:: @ 8306A7C
-	.4byte SootopolisCity_House8_MapAttributes
+	.4byte SootopolisCity_House8_Layout
 	.4byte SootopolisCity_House8_MapEvents
 	.4byte SootopolisCity_House8_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 298
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/scripts.inc
index 91dd3490b..91dd3490b 100644
--- a/data/scripts/maps/SootopolisCity_House8.inc
+++ b/data/maps/SootopolisCity_House8/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/text.inc
index 4efc111cc..4efc111cc 100644
--- a/data/text/maps/SootopolisCity_House8.inc
+++ b/data/maps/SootopolisCity_House8/text.inc
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc
index 38d3f30f0..38d3f30f0 100644
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/events.inc
diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc
index 47505e04d..ecf6040c4 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_Mart:: @ 830699C
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte SootopolisCity_Mart_MapEvents
 	.4byte SootopolisCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 1687bd91e..1687bd91e 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
diff --git a/data/text/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/text.inc
index 858d1530d..858d1530d 100644
--- a/data/text/maps/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/text.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
index 8852ba87c..8852ba87c 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index d0cef1039..496a40444 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_PokemonCenter_1F:: @ 8306964
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte SootopolisCity_PokemonCenter_1F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index 820dd4858..820dd4858 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc
index fd078ad0c..fd078ad0c 100644
--- a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
index 2b6b7a022..2b6b7a022 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
index 4bdb48a7d..78a1a486d 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_PokemonCenter_2F:: @ 8306980
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte SootopolisCity_PokemonCenter_2F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 0547e666f..0547e666f 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc
index 38ff07de5..38ff07de5 100644
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ b/data/maps/SouthernIsland_Exterior/events.inc
diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc
index 0579c81bc..e70d1a97a 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -1,9 +1,9 @@
 SouthernIsland_Exterior:: @ 8307CA4
-	.4byte SouthernIsland_Exterior_MapAttributes
+	.4byte SouthernIsland_Exterior_Layout
 	.4byte SouthernIsland_Exterior_MapEvents
 	.4byte SouthernIsland_Exterior_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 291
 	.byte 73
 	.byte 0
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
index 13e4774e2..13e4774e2 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
diff --git a/data/text/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SouthernIsland_Exterior.inc
+++ b/data/maps/SouthernIsland_Exterior/text.inc
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc
index cba468ef7..cba468ef7 100644
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/events.inc
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
index 42cf6db66..2dbee0b85 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -1,9 +1,9 @@
 SouthernIsland_Interior:: @ 8307CC0
-	.4byte SouthernIsland_Interior_MapAttributes
+	.4byte SouthernIsland_Interior_Layout
 	.4byte SouthernIsland_Interior_MapEvents
 	.4byte SouthernIsland_Interior_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 292
 	.byte 73
 	.byte 0
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 7094ebed8..7094ebed8 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
diff --git a/data/text/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/text.inc
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc
index bb69d402e..bb69d402e 100644
--- a/data/maps/events/TradeCenter.inc
+++ b/data/maps/TradeCenter/events.inc
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
index 62bac5400..dc60b2dd1 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -1,9 +1,9 @@
 TradeCenter:: @ 8307994
-	.4byte TradeCenter_MapAttributes
+	.4byte TradeCenter_Layout
 	.4byte TradeCenter_MapEvents
 	.4byte TradeCenter_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 223
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc
index dadb3e875..dadb3e875 100644
--- a/data/scripts/maps/TradeCenter.inc
+++ b/data/maps/TradeCenter/scripts.inc
diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc
index 12b3cf72b..12b3cf72b 100644
--- a/data/maps/events/Underwater1.inc
+++ b/data/maps/Underwater1/events.inc
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index cfd06e4ce..87e3260c9 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -1,9 +1,9 @@
 Underwater1:: @ 83059C0
-	.4byte Underwater1_MapAttributes
+	.4byte Underwater1_Layout
 	.4byte Underwater1_MapEvents
 	.4byte Underwater1_MapScripts
 	.4byte Underwater1_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 275
 	.byte 50
 	.byte 0
diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc
index ab2e910fe..ab2e910fe 100644
--- a/data/scripts/maps/Underwater1.inc
+++ b/data/maps/Underwater1/scripts.inc
diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc
index a628cf972..a628cf972 100644
--- a/data/maps/events/Underwater2.inc
+++ b/data/maps/Underwater2/events.inc
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
index 38446fecc..244cab761 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -1,9 +1,9 @@
 Underwater2:: @ 83059DC
-	.4byte Underwater2_MapAttributes
+	.4byte Underwater2_Layout
 	.4byte Underwater2_MapEvents
 	.4byte Underwater2_MapScripts
 	.4byte Underwater2_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 51
 	.byte 51
 	.byte 0
diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc
index cf60a2b34..cf60a2b34 100644
--- a/data/scripts/maps/Underwater2.inc
+++ b/data/maps/Underwater2/scripts.inc
diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc
index 62518bafa..62518bafa 100644
--- a/data/maps/events/Underwater3.inc
+++ b/data/maps/Underwater3/events.inc
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
index 3cc773730..965109718 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -1,9 +1,9 @@
 Underwater3:: @ 83059F8
-	.4byte Underwater3_MapAttributes
+	.4byte Underwater3_Layout
 	.4byte Underwater3_MapEvents
 	.4byte Underwater3_MapScripts
 	.4byte Underwater3_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 52
 	.byte 52
 	.byte 0
diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc
index c34b07b1c..c34b07b1c 100644
--- a/data/scripts/maps/Underwater3.inc
+++ b/data/maps/Underwater3/scripts.inc
diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc
index fad99382b..fad99382b 100644
--- a/data/maps/events/Underwater4.inc
+++ b/data/maps/Underwater4/events.inc
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
index 8fb1e6faa..6433cde8e 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -1,9 +1,9 @@
 Underwater4:: @ 8305A14
-	.4byte Underwater4_MapAttributes
+	.4byte Underwater4_Layout
 	.4byte Underwater4_MapEvents
 	.4byte Underwater4_MapScripts
 	.4byte Underwater4_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 53
 	.byte 53
 	.byte 0
diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc
index 0d2256e07..0d2256e07 100644
--- a/data/scripts/maps/Underwater4.inc
+++ b/data/maps/Underwater4/scripts.inc
diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc
index 6dc462c80..6dc462c80 100644
--- a/data/maps/events/Underwater_Route134.inc
+++ b/data/maps/Underwater_Route134/events.inc
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
index fbc90290c..94328b851 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -1,9 +1,9 @@
 Underwater_Route134:: @ 83074FC
-	.4byte Underwater_Route134_MapAttributes
+	.4byte Underwater_Route134_Layout
 	.4byte Underwater_Route134_MapEvents
 	.4byte Underwater_Route134_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 283
 	.byte 79
 	.byte 0
diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/maps/Underwater_Route134/scripts.inc
index 464731b10..464731b10 100644
--- a/data/scripts/maps/Underwater_Route134.inc
+++ b/data/maps/Underwater_Route134/scripts.inc
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc
index 3b1798716..3b1798716 100644
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/events.inc
diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
index 09f36c16f..e4a84f835 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -1,9 +1,9 @@
 Underwater_SeafloorCavern:: @ 8307048
-	.4byte Underwater_SeafloorCavern_MapAttributes
+	.4byte Underwater_SeafloorCavern_Layout
 	.4byte Underwater_SeafloorCavern_MapEvents
 	.4byte Underwater_SeafloorCavern_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 147
 	.byte 69
 	.byte 0
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index d34558e40..d34558e40 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
diff --git a/data/text/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/text.inc
index 8df6cb492..8df6cb492 100644
--- a/data/text/maps/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/text.inc
diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc
index ede501142..ede501142 100644
--- a/data/maps/events/Underwater_SealedChamber.inc
+++ b/data/maps/Underwater_SealedChamber/events.inc
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
index 86ff3384d..f11030bd8 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -1,9 +1,9 @@
 Underwater_SealedChamber:: @ 8307518
-	.4byte Underwater_SealedChamber_MapAttributes
+	.4byte Underwater_SealedChamber_Layout
 	.4byte Underwater_SealedChamber_MapEvents
 	.4byte Underwater_SealedChamber_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 284
 	.byte 79
 	.byte 0
diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index 3151c4575..3151c4575 100644
--- a/data/scripts/maps/Underwater_SealedChamber.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc
index f745dc557..f745dc557 100644
--- a/data/maps/events/Underwater_SootopolisCity.inc
+++ b/data/maps/Underwater_SootopolisCity/events.inc
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
index 8aa8bb316..f7626d966 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -1,9 +1,9 @@
 Underwater_SootopolisCity:: @ 8306DFC
-	.4byte Underwater_SootopolisCity_MapAttributes
+	.4byte Underwater_SootopolisCity_Layout
 	.4byte Underwater_SootopolisCity_MapEvents
 	.4byte Underwater_SootopolisCity_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 131
 	.byte 54
 	.byte 0
diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
index bba04eec8..bba04eec8 100644
--- a/data/scripts/maps/Underwater_SootopolisCity.inc
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc
index 5f3412382..5f3412382 100644
--- a/data/maps/events/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/events.inc
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index 93d3ab03f..0a2845319 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_29:: @ 8307A04
-	.4byte UnknownMap_25_29_MapAttributes
+	.4byte UnknownMap_25_29_Layout
 	.4byte UnknownMap_25_29_MapEvents
 	.4byte UnknownMap_25_29_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 227
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc
index a62e0c9f3..a62e0c9f3 100644
--- a/data/scripts/maps/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc
index 8ce359a0b..8ce359a0b 100644
--- a/data/maps/events/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/events.inc
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
index 96f2e3de2..699998409 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_30:: @ 8307A20
-	.4byte UnknownMap_25_30_MapAttributes
+	.4byte UnknownMap_25_30_Layout
 	.4byte UnknownMap_25_30_MapEvents
 	.4byte UnknownMap_25_30_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 228
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc
index 70a1f0ac2..70a1f0ac2 100644
--- a/data/scripts/maps/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc
index f2eabe57f..f2eabe57f 100644
--- a/data/maps/events/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/events.inc
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
index 135e1c4b1..704562ea1 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_31:: @ 8307A3C
-	.4byte UnknownMap_25_31_MapAttributes
+	.4byte UnknownMap_25_31_Layout
 	.4byte UnknownMap_25_31_MapEvents
 	.4byte UnknownMap_25_31_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 229
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc
index 44c67cab5..44c67cab5 100644
--- a/data/scripts/maps/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc
index aa0435850..aa0435850 100644
--- a/data/maps/events/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/events.inc
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
index 4aaae9710..ef1d675de 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_32:: @ 8307A58
-	.4byte UnknownMap_25_32_MapAttributes
+	.4byte UnknownMap_25_32_Layout
 	.4byte UnknownMap_25_32_MapEvents
 	.4byte UnknownMap_25_32_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 230
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc
index 485a626e6..485a626e6 100644
--- a/data/scripts/maps/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc
index db91b6ef5..db91b6ef5 100644
--- a/data/maps/events/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/events.inc
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
index e0bebe753..ba13111f1 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_33:: @ 8307A74
-	.4byte UnknownMap_25_33_MapAttributes
+	.4byte UnknownMap_25_33_Layout
 	.4byte UnknownMap_25_33_MapEvents
 	.4byte UnknownMap_25_33_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 231
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc
index 68feb9cc6..68feb9cc6 100644
--- a/data/scripts/maps/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc
index 7cca882bc..7cca882bc 100644
--- a/data/maps/events/UnknownMap_25_34.inc
+++ b/data/maps/UnknownMap_25_34/events.inc
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
index b2c174c06..f082e3c09 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_34:: @ 8307A90
-	.4byte UnknownMap_25_34_MapAttributes
+	.4byte UnknownMap_25_34_Layout
 	.4byte UnknownMap_25_34_MapEvents
 	.4byte UnknownMap_25_34_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 232
 	.byte 87
 	.byte 0
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc
new file mode 100644
index 000000000..47599d41b
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/scripts.inc
@@ -0,0 +1,429 @@
+UnknownMap_25_34_MapScripts:: @ 815F580
+	map_script 4, LinkContestRoom1_MapScript2_15F610
+	map_script 2, LinkContestRoom1_MapScript2_15F606
+	map_script 3, LinkContestRoom1_MapScript1_15F595
+	map_script 5, LinkContestRoom1_MapScript1_15F5F4
+	.byte 0
+
+LinkContestRoom1_MapScript1_15F595:: @ 815F595
+	call LinkContestRoom1_EventScript_15F5A5
+	setvar VAR_TEMP_0, 1
+	call LinkContestRoom1_EventScript_15F630
+	end
+
+LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5
+	special ScriptGetMultiplayerId
+	compare RESULT, 0
+	call_if_eq LinkContestRoom1_EventScript_15F5E0
+	compare RESULT, 1
+	call_if_eq LinkContestRoom1_EventScript_15F5E4
+	compare RESULT, 2
+	call_if_eq LinkContestRoom1_EventScript_15F5E8
+	compare RESULT, 3
+	call_if_eq LinkContestRoom1_EventScript_15F5EC
+	compare RESULT, 4
+	call_if_eq LinkContestRoom1_EventScript_15F5F0
+	return
+
+LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0
+	savebgm MUS_TEST1
+	return
+
+LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4
+	savebgm MUS_TEST2
+	return
+
+LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8
+	savebgm MUS_TEST3
+	return
+
+LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC
+	savebgm MUS_TEST4
+	return
+
+LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0
+	savebgm MUS_CONTEST0
+	return
+
+LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4
+	compare VAR_TEMP_9, 1
+	call_if_eq LinkContestRoom1_EventScript_15F600
+	end
+
+LinkContestRoom1_EventScript_15F600:: @ 815F600
+	call LinkContestRoom1_EventScript_15F919
+	return
+
+LinkContestRoom1_MapScript2_15F606:: @ 815F606
+	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A
+	.2byte 0
+
+LinkContestRoom1_MapScript2_15F610:: @ 815F610
+	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625
+	.2byte 0
+
+LinkContestRoom1_EventScript_15F61A:: @ 815F61A
+	call LinkContestRoom1_EventScript_1A514D
+	call LinkContestRoom1_EventScript_15FB64
+	end
+
+LinkContestRoom1_EventScript_15F625:: @ 815F625
+	hideobjectat 255, MAP_LITTLEROOT_TOWN
+	call LinkContestRoom1_EventScript_15F919
+	end
+
+LinkContestRoom1_EventScript_15F630:: @ 815F630
+	call LinkContestRoom1_EventScript_15F6E6
+	call LinkContestRoom1_EventScript_15F646
+	compare VAR_TEMP_0, 8
+	goto_if_lt LinkContestRoom1_EventScript_15F630
+	return
+
+LinkContestRoom1_EventScript_15F646:: @ 815F646
+	switch VAR_TEMP_0
+	case 1, LinkContestRoom1_EventScript_15F699
+	case 2, LinkContestRoom1_EventScript_15F6A4
+	case 3, LinkContestRoom1_EventScript_15F6AF
+	case 4, LinkContestRoom1_EventScript_15F6BA
+	case 5, LinkContestRoom1_EventScript_15F6C5
+	case 6, LinkContestRoom1_EventScript_15F6D0
+	case 7, LinkContestRoom1_EventScript_15F6DB
+	end
+
+LinkContestRoom1_EventScript_15F699:: @ 815F699
+	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4
+	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF
+	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA
+	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5
+	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0
+	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB
+	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6
+	setvar RESULT, 32
+	special ScriptRandom
+	addvar RESULT, 1
+	switch RESULT
+	case 1, LinkContestRoom1_EventScript_15F859
+	case 2, LinkContestRoom1_EventScript_15F85F
+	case 3, LinkContestRoom1_EventScript_15F865
+	case 4, LinkContestRoom1_EventScript_15F86B
+	case 5, LinkContestRoom1_EventScript_15F871
+	case 6, LinkContestRoom1_EventScript_15F877
+	case 7, LinkContestRoom1_EventScript_15F87D
+	case 8, LinkContestRoom1_EventScript_15F883
+	case 9, LinkContestRoom1_EventScript_15F889
+	case 10, LinkContestRoom1_EventScript_15F88F
+	case 11, LinkContestRoom1_EventScript_15F895
+	case 12, LinkContestRoom1_EventScript_15F89B
+	case 13, LinkContestRoom1_EventScript_15F8A1
+	case 14, LinkContestRoom1_EventScript_15F8A7
+	case 15, LinkContestRoom1_EventScript_15F8AD
+	case 16, LinkContestRoom1_EventScript_15F8B3
+	case 17, LinkContestRoom1_EventScript_15F8B9
+	case 18, LinkContestRoom1_EventScript_15F8BF
+	case 19, LinkContestRoom1_EventScript_15F8C5
+	case 20, LinkContestRoom1_EventScript_15F8CB
+	case 21, LinkContestRoom1_EventScript_15F8D1
+	case 22, LinkContestRoom1_EventScript_15F8D7
+	case 23, LinkContestRoom1_EventScript_15F8DD
+	case 24, LinkContestRoom1_EventScript_15F8E3
+	case 25, LinkContestRoom1_EventScript_15F8E9
+	case 26, LinkContestRoom1_EventScript_15F8EF
+	case 27, LinkContestRoom1_EventScript_15F8F5
+	case 28, LinkContestRoom1_EventScript_15F8FB
+	case 29, LinkContestRoom1_EventScript_15F901
+	case 30, LinkContestRoom1_EventScript_15F907
+	case 31, LinkContestRoom1_EventScript_15F90D
+	case 32, LinkContestRoom1_EventScript_15F913
+	end
+
+LinkContestRoom1_EventScript_15F859:: @ 815F859
+	setvar VAR_TEMP_1, 5
+	return
+
+LinkContestRoom1_EventScript_15F85F:: @ 815F85F
+	setvar VAR_TEMP_1, 6
+	return
+
+LinkContestRoom1_EventScript_15F865:: @ 815F865
+	setvar VAR_TEMP_1, 7
+	return
+
+LinkContestRoom1_EventScript_15F86B:: @ 815F86B
+	setvar VAR_TEMP_1, 8
+	return
+
+LinkContestRoom1_EventScript_15F871:: @ 815F871
+	setvar VAR_TEMP_1, 10
+	return
+
+LinkContestRoom1_EventScript_15F877:: @ 815F877
+	setvar VAR_TEMP_1, 11
+	return
+
+LinkContestRoom1_EventScript_15F87D:: @ 815F87D
+	setvar VAR_TEMP_1, 12
+	return
+
+LinkContestRoom1_EventScript_15F883:: @ 815F883
+	setvar VAR_TEMP_1, 13
+	return
+
+LinkContestRoom1_EventScript_15F889:: @ 815F889
+	setvar VAR_TEMP_1, 14
+	return
+
+LinkContestRoom1_EventScript_15F88F:: @ 815F88F
+	setvar VAR_TEMP_1, 15
+	return
+
+LinkContestRoom1_EventScript_15F895:: @ 815F895
+	setvar VAR_TEMP_1, 17
+	return
+
+LinkContestRoom1_EventScript_15F89B:: @ 815F89B
+	setvar VAR_TEMP_1, 18
+	return
+
+LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1
+	setvar VAR_TEMP_1, 19
+	return
+
+LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7
+	setvar VAR_TEMP_1, 20
+	return
+
+LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD
+	setvar VAR_TEMP_1, 21
+	return
+
+LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3
+	setvar VAR_TEMP_1, 22
+	return
+
+LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9
+	setvar VAR_TEMP_1, 25
+	return
+
+LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF
+	setvar VAR_TEMP_1, 26
+	return
+
+LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5
+	setvar VAR_TEMP_1, 27
+	return
+
+LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB
+	setvar VAR_TEMP_1, 47
+	return
+
+LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1
+	setvar VAR_TEMP_1, 30
+	return
+
+LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7
+	setvar VAR_TEMP_1, 31
+	return
+
+LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD
+	setvar VAR_TEMP_1, 32
+	return
+
+LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3
+	setvar VAR_TEMP_1, 33
+	return
+
+LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9
+	setvar VAR_TEMP_1, 34
+	return
+
+LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF
+	setvar VAR_TEMP_1, 35
+	return
+
+LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5
+	setvar VAR_TEMP_1, 36
+	return
+
+LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB
+	setvar VAR_TEMP_1, 37
+	return
+
+LinkContestRoom1_EventScript_15F901:: @ 815F901
+	setvar VAR_TEMP_1, 38
+	return
+
+LinkContestRoom1_EventScript_15F907:: @ 815F907
+	setvar VAR_TEMP_1, 44
+	return
+
+LinkContestRoom1_EventScript_15F90D:: @ 815F90D
+	setvar VAR_TEMP_1, 45
+	return
+
+LinkContestRoom1_EventScript_15F913:: @ 815F913
+	setvar VAR_TEMP_1, 46
+	return
+
+LinkContestRoom1_EventScript_15F919:: @ 815F919
+	switch VAR_CONTEST_LOCATION
+	case 1, LinkContestRoom1_EventScript_15F956
+	case 2, LinkContestRoom1_EventScript_15F969
+	case 3, LinkContestRoom1_EventScript_15F9C4
+	case 4, LinkContestRoom1_EventScript_15FA70
+	case 5, LinkContestRoom1_EventScript_15FA70
+	return
+
+LinkContestRoom1_EventScript_15F956:: @ 815F956
+	createvobject 5, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_15F969:: @ 815F969
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 46, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 12, 13, 12, 8, 3, 3
+	createvobject 47, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 48, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 22, 20, 3, 2, 3, 1
+	createvobject 23, 20, 6, 2, 3, 1
+	createvobject 34, 20, 7, 2, 3, 1
+	createvobject 46, 24, 8, 2, 3, 1
+	createvobject 48, 24, 11, 2, 3, 1
+	createvobject 11, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 17, 27, 5, 9, 3, 2
+	createvobject 41, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_15FA70:: @ 815FA70
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 12, 3, 2, 8, 3, 4
+	createvobject 39, 4, 1, 3, 3, 4
+	createvobject 34, 6, 1, 5, 3, 4
+	createvobject 26, 7, 1, 6, 3, 4
+	createvobject 48, 9, 1, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 50, 14, 13, 3, 3, 3
+	createvobject 52, 15, 13, 4, 3, 3
+	createvobject 65, 17, 13, 6, 3, 3
+	createvobject 83, 18, 13, 7, 3, 3
+	createvobject 116, 19, 13, 8, 3, 3
+	createvobject 25, 20, 3, 2, 3, 1
+	createvobject 31, 21, 6, 2, 3, 1
+	createvobject 33, 22, 7, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	createvobject 49, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 48, 27, 5, 9, 3, 2
+	createvobject 41, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_15FB64:: @ 815FB64
+	switch VAR_CONTEST_LOCATION
+	case 1, LinkContestRoom1_EventScript_15FBA1
+	case 2, LinkContestRoom1_EventScript_15FBAD
+	case 3, LinkContestRoom1_EventScript_15FBB9
+	case 4, LinkContestRoom1_EventScript_15FBC5
+	case 5, LinkContestRoom1_EventScript_15FBD1
+	return
+
+LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4
+	waitstate
+	end
+
+FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3
+	compare RESULT, 1
+	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9
+	return
+
+FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc
index 920703b72..920703b72 100644
--- a/data/maps/events/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/events.inc
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
index ee41c767f..cbba95897 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown:: @ 83055D0
-	.4byte VerdanturfTown_MapAttributes
+	.4byte VerdanturfTown_Layout
 	.4byte VerdanturfTown_MapEvents
 	.4byte VerdanturfTown_MapScripts
 	.4byte VerdanturfTown_MapConnections
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 15
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc
index c8adf85c3..c8adf85c3 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
diff --git a/data/text/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/text.inc
index a3ccdd34e..a3ccdd34e 100644
--- a/data/text/maps/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/text.inc
diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/events.inc
index 78224364f..78224364f 100644
--- a/data/maps/events/VerdanturfTown_ContestHall.inc
+++ b/data/maps/VerdanturfTown_ContestHall/events.inc
diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc
index 1c0179afb..de3e6848e 100644
--- a/data/maps/VerdanturfTown_ContestHall/header.inc
+++ b/data/maps/VerdanturfTown_ContestHall/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_ContestHall:: @ 8305D94
-	.4byte VerdanturfTown_ContestHall_MapAttributes
+	.4byte ContestHall_Layout
 	.4byte VerdanturfTown_ContestHall_MapEvents
 	.4byte VerdanturfTown_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 73
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/scripts.inc
index 380385a88..380385a88 100644
--- a/data/scripts/maps/VerdanturfTown_ContestHall.inc
+++ b/data/maps/VerdanturfTown_ContestHall/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/text.inc
index 2bf97f1de..2bf97f1de 100644
--- a/data/text/maps/VerdanturfTown_ContestHall.inc
+++ b/data/maps/VerdanturfTown_ContestHall/text.inc
diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc
index 3ab316792..3ab316792 100644
--- a/data/maps/events/VerdanturfTown_ContestLobby.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/events.inc
diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc
index 31274e19f..60849fb0a 100644
--- a/data/maps/VerdanturfTown_ContestLobby/header.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_ContestLobby:: @ 8305D78
-	.4byte VerdanturfTown_ContestLobby_MapAttributes
+	.4byte ContestLobby_Layout
 	.4byte VerdanturfTown_ContestLobby_MapEvents
 	.4byte VerdanturfTown_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 72
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc
index 32661485d..32661485d 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/text.inc
index 2f9121c52..2f9121c52 100644
--- a/data/text/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/text.inc
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
index c03706d90..c03706d90 100644
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index f1aae5a19..4152aef1b 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_FriendshipRatersHouse:: @ 8305E20
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 60
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index ed60ec1c7..ed60ec1c7 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc
index e6e7f9730..e6e7f9730 100644
--- a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc
index ca7d2a4dd..ca7d2a4dd 100644
--- a/data/maps/events/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/events.inc
diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc
index e81adee1b..838905374 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_House:: @ 8305E3C
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte VerdanturfTown_House_MapEvents
 	.4byte VerdanturfTown_House_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 59
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc
index 45a22ae93..45a22ae93 100644
--- a/data/scripts/maps/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/text.inc
index 8db1656ee..8db1656ee 100644
--- a/data/text/maps/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/text.inc
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc
index f4ca8b8f3..f4ca8b8f3 100644
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/events.inc
diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc
index db037960c..7d34f77a7 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_Mart:: @ 8305DB0
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte VerdanturfTown_Mart_MapEvents
 	.4byte VerdanturfTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index db72de227..db72de227 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/text.inc
index fbd655f08..fbd655f08 100644
--- a/data/text/maps/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/text.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
index 8cf8b1dab..8cf8b1dab 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
index 384c8719e..7e1269720 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_PokemonCenter_1F:: @ 8305DCC
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte VerdanturfTown_PokemonCenter_1F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 956a28ac5..956a28ac5 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc
index e79898ead..e79898ead 100644
--- a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
index 51fe22275..51fe22275 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
index 518c11352..c29f42e15 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_PokemonCenter_2F:: @ 8305DE8
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte VerdanturfTown_PokemonCenter_2F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index ec52d45a7..ec52d45a7 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
index 709c5aeb6..709c5aeb6 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/events.inc
diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc
index bc31f5457..57e835308 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_WandasHouse:: @ 8305E04
-	.4byte VerdanturfTown_WandasHouse_MapAttributes
+	.4byte VerdanturfTown_WandasHouse_Layout
 	.4byte VerdanturfTown_WandasHouse_MapEvents
 	.4byte VerdanturfTown_WandasHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 76
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index 4410beaba..4410beaba 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/text.inc
index d8aae2958..d8aae2958 100644
--- a/data/text/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/text.inc
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc
index 916e9bfc2..916e9bfc2 100644
--- a/data/maps/events/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/events.inc
diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc
index 21937891e..61c47f001 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -1,9 +1,9 @@
 VictoryRoad_1F:: @ 8307224
-	.4byte VictoryRoad_1F_MapAttributes
+	.4byte VictoryRoad_1F_Layout
 	.4byte VictoryRoad_1F_MapEvents
 	.4byte VictoryRoad_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 164
 	.byte 70
 	.byte 0
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 045189759..045189759 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
diff --git a/data/text/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/text.inc
index 2f52e5cd4..2f52e5cd4 100644
--- a/data/text/maps/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/text.inc
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc
index af5c86254..af5c86254 100644
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/events.inc
diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc
index ebaa67358..b705dc527 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -1,9 +1,9 @@
 VictoryRoad_B1F:: @ 8307240
-	.4byte VictoryRoad_B1F_MapAttributes
+	.4byte VictoryRoad_B1F_Layout
 	.4byte VictoryRoad_B1F_MapEvents
 	.4byte VictoryRoad_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 286
 	.byte 70
 	.byte 1
diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc
index e07cd4286..e07cd4286 100644
--- a/data/scripts/maps/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
diff --git a/data/text/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/text.inc
index d820a5c31..d820a5c31 100644
--- a/data/text/maps/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/text.inc
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc
index b482e6f04..b482e6f04 100644
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/events.inc
diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc
index 4690acbb7..7eb649cfb 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -1,9 +1,9 @@
 VictoryRoad_B2F:: @ 830725C
-	.4byte VictoryRoad_B2F_MapAttributes
+	.4byte VictoryRoad_B2F_Layout
 	.4byte VictoryRoad_B2F_MapEvents
 	.4byte VictoryRoad_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 287
 	.byte 70
 	.byte 1
diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc
index 6b8fe2569..6b8fe2569 100644
--- a/data/scripts/maps/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc
diff --git a/data/text/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/text.inc
index 760a732ff..760a732ff 100644
--- a/data/text/maps/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/text.inc
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
deleted file mode 100644
index a9cc15869..000000000
--- a/data/maps/_assets.inc
+++ /dev/null
@@ -1,5006 +0,0 @@
-PetalburgCity_MapBorder:: @ 8287264
-	.incbin "data/maps/PetalburgCity/border.bin"
-
-PetalburgCity_MapBlockdata:: @ 828726C
-	.incbin "data/maps/PetalburgCity/map.bin"
-
-	.align 2
-PetalburgCity_MapAttributes:: @ 8287974
-	.4byte 0x1e
-	.4byte 0x1e
-	.4byte PetalburgCity_MapBorder
-	.4byte PetalburgCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-SlateportCity_MapBorder:: @ 828798C
-	.incbin "data/maps/SlateportCity/border.bin"
-
-SlateportCity_MapBlockdata:: @ 8287994
-	.incbin "data/maps/SlateportCity/map.bin"
-
-	.align 2
-SlateportCity_MapAttributes:: @ 8288C54
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte SlateportCity_MapBorder
-	.4byte SlateportCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-MauvilleCity_MapBorder:: @ 8288C6C
-	.incbin "data/maps/MauvilleCity/border.bin"
-
-MauvilleCity_MapBlockdata:: @ 8288C74
-	.incbin "data/maps/MauvilleCity/map.bin"
-
-	.align 2
-MauvilleCity_MapAttributes:: @ 82892B4
-	.4byte 0x28
-	.4byte 0x14
-	.4byte MauvilleCity_MapBorder
-	.4byte MauvilleCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-RustboroCity_MapBorder:: @ 82892CC
-	.incbin "data/maps/RustboroCity/border.bin"
-
-RustboroCity_MapBlockdata:: @ 82892D4
-	.incbin "data/maps/RustboroCity/map.bin"
-
-	.align 2
-RustboroCity_MapAttributes:: @ 828A594
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte RustboroCity_MapBorder
-	.4byte RustboroCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-FortreeCity_MapBorder:: @ 828A5AC
-	.incbin "data/maps/FortreeCity/border.bin"
-
-FortreeCity_MapBlockdata:: @ 828A5B4
-	.incbin "data/maps/FortreeCity/map.bin"
-
-	.align 2
-FortreeCity_MapAttributes:: @ 828ABF4
-	.4byte 0x28
-	.4byte 0x14
-	.4byte FortreeCity_MapBorder
-	.4byte FortreeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-LilycoveCity_MapBorder:: @ 828AC0C
-	.incbin "data/maps/LilycoveCity/border.bin"
-
-LilycoveCity_MapBlockdata:: @ 828AC14
-	.incbin "data/maps/LilycoveCity/map.bin"
-
-	.align 2
-LilycoveCity_MapAttributes:: @ 828C514
-	.4byte 0x50
-	.4byte 0x28
-	.4byte LilycoveCity_MapBorder
-	.4byte LilycoveCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-MossdeepCity_MapBorder:: @ 828C52C
-	.incbin "data/maps/MossdeepCity/border.bin"
-
-MossdeepCity_MapBlockdata:: @ 828C534
-	.incbin "data/maps/MossdeepCity/map.bin"
-
-	.align 2
-MossdeepCity_MapAttributes:: @ 828DE34
-	.4byte 0x50
-	.4byte 0x28
-	.4byte MossdeepCity_MapBorder
-	.4byte MossdeepCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-SootopolisCity_MapBorder:: @ 828DE4C
-	.incbin "data/maps/SootopolisCity/border.bin"
-
-SootopolisCity_MapBlockdata:: @ 828DE54
-	.incbin "data/maps/SootopolisCity/map.bin"
-
-	.align 2
-SootopolisCity_MapAttributes:: @ 828FA74
-	.4byte 0x3c
-	.4byte 0x3c
-	.4byte SootopolisCity_MapBorder
-	.4byte SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Sootopolis
-
-EverGrandeCity_MapBorder:: @ 828FA8C
-	.incbin "data/maps/EverGrandeCity/border.bin"
-
-EverGrandeCity_MapBlockdata:: @ 828FA94
-	.incbin "data/maps/EverGrandeCity/map.bin"
-
-	.align 2
-EverGrandeCity_MapAttributes:: @ 8291394
-	.4byte 0x28
-	.4byte 0x50
-	.4byte EverGrandeCity_MapBorder
-	.4byte EverGrandeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_EverGrande
-
-LittlerootTown_MapBorder:: @ 82913AC
-	.incbin "data/maps/LittlerootTown/border.bin"
-
-LittlerootTown_MapBlockdata:: @ 82913B4
-	.incbin "data/maps/LittlerootTown/map.bin"
-
-	.align 2
-LittlerootTown_MapAttributes:: @ 82916D4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LittlerootTown_MapBorder
-	.4byte LittlerootTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-OldaleTown_MapBorder:: @ 82916EC
-	.incbin "data/maps/OldaleTown/border.bin"
-
-OldaleTown_MapBlockdata:: @ 82916F4
-	.incbin "data/maps/OldaleTown/map.bin"
-
-	.align 2
-OldaleTown_MapAttributes:: @ 8291A14
-	.4byte 0x14
-	.4byte 0x14
-	.4byte OldaleTown_MapBorder
-	.4byte OldaleTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-DewfordTown_MapBorder:: @ 8291A2C
-	.incbin "data/maps/DewfordTown/border.bin"
-
-DewfordTown_MapBlockdata:: @ 8291A34
-	.incbin "data/maps/DewfordTown/map.bin"
-
-	.align 2
-DewfordTown_MapAttributes:: @ 8291D54
-	.4byte 0x14
-	.4byte 0x14
-	.4byte DewfordTown_MapBorder
-	.4byte DewfordTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-LavaridgeTown_MapBorder:: @ 8291D6C
-	.incbin "data/maps/LavaridgeTown/border.bin"
-
-LavaridgeTown_MapBlockdata:: @ 8291D74
-	.incbin "data/maps/LavaridgeTown/map.bin"
-
-	.align 2
-LavaridgeTown_MapAttributes:: @ 8292094
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LavaridgeTown_MapBorder
-	.4byte LavaridgeTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-FallarborTown_MapBorder:: @ 82920AC
-	.incbin "data/maps/FallarborTown/border.bin"
-
-FallarborTown_MapBlockdata:: @ 82920B4
-	.incbin "data/maps/FallarborTown/map.bin"
-
-	.align 2
-FallarborTown_MapAttributes:: @ 82923D4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte FallarborTown_MapBorder
-	.4byte FallarborTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-VerdanturfTown_MapBorder:: @ 82923EC
-	.incbin "data/maps/VerdanturfTown/border.bin"
-
-VerdanturfTown_MapBlockdata:: @ 82923F4
-	.incbin "data/maps/VerdanturfTown/map.bin"
-
-	.align 2
-VerdanturfTown_MapAttributes:: @ 8292714
-	.4byte 0x14
-	.4byte 0x14
-	.4byte VerdanturfTown_MapBorder
-	.4byte VerdanturfTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-PacifidlogTown_MapBorder:: @ 829272C
-	.incbin "data/maps/PacifidlogTown/border.bin"
-
-PacifidlogTown_MapBlockdata:: @ 8292734
-	.incbin "data/maps/PacifidlogTown/map.bin"
-
-	.align 2
-PacifidlogTown_MapAttributes:: @ 8292D74
-	.4byte 0x14
-	.4byte 0x28
-	.4byte PacifidlogTown_MapBorder
-	.4byte PacifidlogTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route101_MapBorder:: @ 8292D8C
-	.incbin "data/maps/Route101/border.bin"
-
-Route101_MapBlockdata:: @ 8292D94
-	.incbin "data/maps/Route101/map.bin"
-
-	.align 2
-Route101_MapAttributes:: @ 82930B4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte Route101_MapBorder
-	.4byte Route101_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-Route102_MapBorder:: @ 82930CC
-	.incbin "data/maps/Route102/border.bin"
-
-Route102_MapBlockdata:: @ 82930D4
-	.incbin "data/maps/Route102/map.bin"
-
-	.align 2
-Route102_MapAttributes:: @ 82938A4
-	.4byte 0x32
-	.4byte 0x14
-	.4byte Route102_MapBorder
-	.4byte Route102_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-Route103_MapBorder:: @ 82938BC
-	.incbin "data/maps/Route103/border.bin"
-
-Route103_MapBlockdata:: @ 82938C4
-	.incbin "data/maps/Route103/map.bin"
-
-	.align 2
-Route103_MapAttributes:: @ 8294544
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route103_MapBorder
-	.4byte Route103_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-Route104_MapBorder:: @ 829455C
-	.incbin "data/maps/Route104/border.bin"
-
-Route104_MapBlockdata:: @ 8294564
-	.incbin "data/maps/Route104/map.bin"
-
-	.align 2
-Route104_MapAttributes:: @ 8295E64
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route104_MapBorder
-	.4byte Route104_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-Route105_MapBorder:: @ 8295E7C
-	.incbin "data/maps/Route105/border.bin"
-
-Route105_MapBlockdata:: @ 8295E84
-	.incbin "data/maps/Route105/map.bin"
-
-	.align 2
-Route105_MapAttributes:: @ 8297784
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route105_MapBorder
-	.4byte Route105_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-Route106_MapBorder:: @ 829779C
-	.incbin "data/maps/Route106/border.bin"
-
-Route106_MapBlockdata:: @ 82977A4
-	.incbin "data/maps/Route106/map.bin"
-
-	.align 2
-Route106_MapAttributes:: @ 8298424
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route106_MapBorder
-	.4byte Route106_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-Route107_MapBorder:: @ 829843C
-	.incbin "data/maps/Route107/border.bin"
-
-Route107_MapBlockdata:: @ 8298444
-	.incbin "data/maps/Route107/map.bin"
-
-	.align 2
-Route107_MapAttributes:: @ 8298DA4
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route107_MapBorder
-	.4byte Route107_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-Route108_MapBorder:: @ 8298DBC
-	.incbin "data/maps/Route108/border.bin"
-
-Route108_MapBlockdata:: @ 8298DC4
-	.incbin "data/maps/Route108/map.bin"
-
-	.align 2
-Route108_MapAttributes:: @ 8299724
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route108_MapBorder
-	.4byte Route108_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-Route109_MapBorder:: @ 829973C
-	.incbin "data/maps/Route109/border.bin"
-
-Route109_MapBlockdata:: @ 8299744
-	.incbin "data/maps/Route109/map.bin"
-
-	.align 2
-Route109_MapAttributes:: @ 829AA04
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte Route109_MapBorder
-	.4byte Route109_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-Route110_MapBorder:: @ 829AA1C
-	.incbin "data/maps/Route110/border.bin"
-
-Route110_MapBlockdata:: @ 829AA24
-	.incbin "data/maps/Route110/map.bin"
-
-	.align 2
-Route110_MapAttributes:: @ 829C964
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route110_MapBorder
-	.4byte Route110_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route111_MapBorder:: @ 829C97C
-	.incbin "data/maps/Route111/border.bin"
-
-Route111_MapBlockdata:: @ 829C984
-	.incbin "data/maps/Route111/map.bin"
-
-	.align 2
-Route111_MapAttributes:: @ 829F544
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route111_MapBorder
-	.4byte Route111_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route112_MapBorder:: @ 829F55C
-	.incbin "data/maps/Route112/border.bin"
-
-Route112_MapBlockdata:: @ 829F564
-	.incbin "data/maps/Route112/map.bin"
-
-	.align 2
-Route112_MapAttributes:: @ 82A0824
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte Route112_MapBorder
-	.4byte Route112_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-Route113_MapBorder:: @ 82A083C
-	.incbin "data/maps/Route113/border.bin"
-
-Route113_MapBlockdata:: @ 82A0844
-	.incbin "data/maps/Route113/map.bin"
-
-	.align 2
-Route113_MapAttributes:: @ 82A17E4
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route113_MapBorder
-	.4byte Route113_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route114_MapBorder:: @ 82A17FC
-	.incbin "data/maps/Route114/border.bin"
-
-Route114_MapBlockdata:: @ 82A1804
-	.incbin "data/maps/Route114/map.bin"
-
-	.align 2
-Route114_MapAttributes:: @ 82A3104
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route114_MapBorder
-	.4byte Route114_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route115_MapBorder:: @ 82A311C
-	.incbin "data/maps/Route115/border.bin"
-
-Route115_MapBlockdata:: @ 82A3124
-	.incbin "data/maps/Route115/map.bin"
-
-	.align 2
-Route115_MapAttributes:: @ 82A4A24
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route115_MapBorder
-	.4byte Route115_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route116_MapBorder:: @ 82A4A3C
-	.incbin "data/maps/Route116/border.bin"
-
-Route116_MapBlockdata:: @ 82A4A44
-	.incbin "data/maps/Route116/map.bin"
-
-	.align 2
-Route116_MapAttributes:: @ 82A59E4
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route116_MapBorder
-	.4byte Route116_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-Route117_MapBorder:: @ 82A59FC
-	.incbin "data/maps/Route117/border.bin"
-
-Route117_MapBlockdata:: @ 82A5A04
-	.incbin "data/maps/Route117/map.bin"
-
-	.align 2
-Route117_MapAttributes:: @ 82A6364
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route117_MapBorder
-	.4byte Route117_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route118_MapBorder:: @ 82A637C
-	.incbin "data/maps/Route118/border.bin"
-
-Route118_MapBlockdata:: @ 82A6384
-	.incbin "data/maps/Route118/map.bin"
-
-	.align 2
-Route118_MapAttributes:: @ 82A7004
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route118_MapBorder
-	.4byte Route118_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route119_MapBorder:: @ 82A701C
-	.incbin "data/maps/Route119/border.bin"
-
-Route119_MapBlockdata:: @ 82A7024
-	.incbin "data/maps/Route119/map.bin"
-
-	.align 2
-Route119_MapAttributes:: @ 82A9BE4
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route119_MapBorder
-	.4byte Route119_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-Route120_MapBorder:: @ 82A9BFC
-	.incbin "data/maps/Route120/border.bin"
-
-Route120_MapBlockdata:: @ 82A9C04
-	.incbin "data/maps/Route120/map.bin"
-
-	.align 2
-Route120_MapAttributes:: @ 82ABB44
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route120_MapBorder
-	.4byte Route120_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-Route121_MapBorder:: @ 82ABB5C
-	.incbin "data/maps/Route121/border.bin"
-
-Route121_MapBlockdata:: @ 82ABB64
-	.incbin "data/maps/Route121/map.bin"
-
-	.align 2
-Route121_MapAttributes:: @ 82AC7E4
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route121_MapBorder
-	.4byte Route121_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-Route122_MapBorder:: @ 82AC7FC
-	.incbin "data/maps/Route122/border.bin"
-
-Route122_MapBlockdata:: @ 82AC804
-	.incbin "data/maps/Route122/map.bin"
-
-	.align 2
-Route122_MapAttributes:: @ 82AD484
-	.4byte 0x28
-	.4byte 0x28
-	.4byte Route122_MapBorder
-	.4byte Route122_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-Route123_MapBorder:: @ 82AD49C
-	.incbin "data/maps/Route123/border.bin"
-
-Route123_MapBlockdata:: @ 82AD4A4
-	.incbin "data/maps/Route123/map.bin"
-
-	.align 2
-Route123_MapAttributes:: @ 82AEA84
-	.4byte 0x8c
-	.4byte 0x14
-	.4byte Route123_MapBorder
-	.4byte Route123_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-Route124_MapBorder:: @ 82AEA9C
-	.incbin "data/maps/Route124/border.bin"
-
-Route124_MapBlockdata:: @ 82AEAA4
-	.incbin "data/maps/Route124/map.bin"
-
-	.align 2
-Route124_MapAttributes:: @ 82B1CA4
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route124_MapBorder
-	.4byte Route124_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route125_MapBorder:: @ 82B1CBC
-	.incbin "data/maps/Route125/border.bin"
-
-Route125_MapBlockdata:: @ 82B1CC4
-	.incbin "data/maps/Route125/map.bin"
-
-	.align 2
-Route125_MapAttributes:: @ 82B35C4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route125_MapBorder
-	.4byte Route125_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route126_MapBorder:: @ 82B35DC
-	.incbin "data/maps/Route126/border.bin"
-
-Route126_MapBlockdata:: @ 82B35E4
-	.incbin "data/maps/Route126/map.bin"
-
-	.align 2
-Route126_MapAttributes:: @ 82B67E4
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route126_MapBorder
-	.4byte Route126_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route127_MapBorder:: @ 82B67FC
-	.incbin "data/maps/Route127/border.bin"
-
-Route127_MapBlockdata:: @ 82B6804
-	.incbin "data/maps/Route127/map.bin"
-
-	.align 2
-Route127_MapAttributes:: @ 82B9A04
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route127_MapBorder
-	.4byte Route127_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route128_MapBorder:: @ 82B9A1C
-	.incbin "data/maps/Route128/border.bin"
-
-Route128_MapBlockdata:: @ 82B9A24
-	.incbin "data/maps/Route128/map.bin"
-
-	.align 2
-Route128_MapAttributes:: @ 82BBFA4
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Route128_MapBorder
-	.4byte Route128_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route129_MapBorder:: @ 82BBFBC
-	.incbin "data/maps/Route129/border.bin"
-
-Route129_MapBlockdata:: @ 82BBFC4
-	.incbin "data/maps/Route129/map.bin"
-
-	.align 2
-Route129_MapAttributes:: @ 82BD8C4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route129_MapBorder
-	.4byte Route129_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-UnreferencedMap_MapBorder: @ 82BD8DC
-	.incbin "data/maps/UnreferencedMap/border.bin"
-
-UnreferencedMap_MapBlockdata: @ 82BD8E4
-	.incbin "data/maps/UnreferencedMap/map.bin"
-
-	.align 2
-UnreferencedMap_MapAttributes:: @ 82BF1E4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte UnreferencedMap_MapBorder
-	.4byte UnreferencedMap_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-Route131_MapBorder:: @ 82BF1FC
-	.incbin "data/maps/Route131/border.bin"
-
-Route131_MapBlockdata:: @ 82BF204
-	.incbin "data/maps/Route131/map.bin"
-
-	.align 2
-Route131_MapAttributes:: @ 82C04C4
-	.4byte 0x3c
-	.4byte 0x28
-	.4byte Route131_MapBorder
-	.4byte Route131_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route132_MapBorder:: @ 82C04DC
-	.incbin "data/maps/Route132/border.bin"
-
-Route132_MapBlockdata:: @ 82C04E4
-	.incbin "data/maps/Route132/map.bin"
-
-	.align 2
-Route132_MapAttributes:: @ 82C1DE4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route132_MapBorder
-	.4byte Route132_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route133_MapBorder:: @ 82C1DFC
-	.incbin "data/maps/Route133/border.bin"
-
-Route133_MapBlockdata:: @ 82C1E04
-	.incbin "data/maps/Route133/map.bin"
-
-	.align 2
-Route133_MapAttributes:: @ 82C3704
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route133_MapBorder
-	.4byte Route133_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route134_MapBorder:: @ 82C371C
-	.incbin "data/maps/Route134/border.bin"
-
-Route134_MapBlockdata:: @ 82C3724
-	.incbin "data/maps/Route134/map.bin"
-
-	.align 2
-Route134_MapAttributes:: @ 82C5024
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route134_MapBorder
-	.4byte Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Underwater2_MapBorder:: @ 82C503C
-	.incbin "data/maps/Underwater2/border.bin"
-
-Underwater2_MapBlockdata:: @ 82C5044
-	.incbin "data/maps/Underwater2/map.bin"
-
-	.align 2
-Underwater2_MapAttributes:: @ 82C8244
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater2_MapBorder
-	.4byte Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-Underwater3_MapBorder:: @ 82C825C
-	.incbin "data/maps/Underwater3/border.bin"
-
-Underwater3_MapBlockdata:: @ 82C8264
-	.incbin "data/maps/Underwater3/map.bin"
-
-	.align 2
-Underwater3_MapAttributes:: @ 82CB464
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater3_MapBorder
-	.4byte Underwater3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-Underwater4_MapBorder:: @ 82CB47C
-	.incbin "data/maps/Underwater4/border.bin"
-
-Underwater4_MapBlockdata:: @ 82CB484
-	.incbin "data/maps/Underwater4/map.bin"
-
-	.align 2
-Underwater4_MapAttributes:: @ 82CDA04
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Underwater4_MapBorder
-	.4byte Underwater4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
-	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin"
-
-LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24
-	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_1F_MapAttributes:: @ 82CDAEC
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
-	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin"
-
-LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C
-	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_2F_MapAttributes:: @ 82CDB9C
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
-	.incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin"
-
-LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC
-	.incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_1F_MapAttributes:: @ 82CDC84
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_MaysHouse_1F_MapBorder
-	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
-	.incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin"
-
-LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4
-	.incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_2F_MapAttributes:: @ 82CDD34
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_MaysHouse_2F_MapBorder
-	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
-	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin"
-
-LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54
-	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin"
-
-	.align 2
-LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8
-	.4byte 0xd
-	.4byte 0xd
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-House1_MapBorder:: @ 82CDEC0
-	.incbin "data/maps/House1/border.bin"
-
-House1_MapBlockdata:: @ 82CDEC8
-	.incbin "data/maps/House1/map.bin"
-
-	.align 2
-House1_MapAttributes:: @ 82CDF7C
-	.4byte 0xa
-	.4byte 0x9
-	.4byte House1_MapBorder
-	.4byte House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-House2_MapBorder:: @ 82CDF94
-	.incbin "data/maps/House2/border.bin"
-
-House2_MapBlockdata:: @ 82CDF9C
-	.incbin "data/maps/House2/map.bin"
-
-	.align 2
-House2_MapAttributes:: @ 82CE04C
-	.4byte 0xb
-	.4byte 0x8
-	.4byte House2_MapBorder
-	.4byte House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PokemonCenter_1F_MapBorder:: @ 82CE064
-	.incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin"
-
-PokemonCenter_1F_MapBlockdata:: @ 82CE06C
-	.incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin"
-
-	.align 2
-PokemonCenter_1F_MapAttributes:: @ 82CE168
-	.4byte 0xe
-	.4byte 0x9
-	.4byte PokemonCenter_1F_MapBorder
-	.4byte PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-PokemonCenter_2F_MapBorder:: @ 82CE180
-	.incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin"
-
-PokemonCenter_2F_MapBlockdata:: @ 82CE188
-	.incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin"
-
-	.align 2
-PokemonCenter_2F_MapAttributes:: @ 82CE284
-	.4byte 0xe
-	.4byte 0x9
-	.4byte PokemonCenter_2F_MapBorder
-	.4byte PokemonCenter_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-PokeMart_MapBorder:: @ 82CE29C
-	.incbin "data/maps/OldaleTown_Mart/border.bin"
-
-PokeMart_MapBlockdata:: @ 82CE2A4
-	.incbin "data/maps/OldaleTown_Mart/map.bin"
-
-	.align 2
-PokeMart_MapAttributes:: @ 82CE354
-	.4byte 0xb
-	.4byte 0x8
-	.4byte PokeMart_MapBorder
-	.4byte PokeMart_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-DewfordTown_House1_MapBorder:: @ 82CE36C
-	.incbin "data/maps/DewfordTown_House1/border.bin"
-
-DewfordTown_House1_MapBlockdata:: @ 82CE374
-	.incbin "data/maps/DewfordTown_House1/map.bin"
-
-	.align 2
-DewfordTown_House1_MapAttributes:: @ 82CE414
-LavaridgeTown_House_MapAttributes:: @ 82CE414
-Route111_OldLadysRestStop_MapAttributes:: @ 82CE414
-	.4byte 0xa
-	.4byte 0x8
-	.4byte DewfordTown_House1_MapBorder
-	.4byte DewfordTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-DewfordTown_Gym_MapBorder:: @ 82CE42C
-	.incbin "data/maps/DewfordTown_Gym/border.bin"
-
-DewfordTown_Gym_MapBlockdata:: @ 82CE434
-	.incbin "data/maps/DewfordTown_Gym/map.bin"
-
-	.align 2
-DewfordTown_Gym_MapAttributes:: @ 82CE824
-	.4byte 0x12
-	.4byte 0x1c
-	.4byte DewfordTown_Gym_MapBorder
-	.4byte DewfordTown_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_DewfordGym
-
-DewfordTown_Hall_MapBorder:: @ 82CE83C
-	.incbin "data/maps/DewfordTown_Hall/border.bin"
-
-DewfordTown_Hall_MapBlockdata:: @ 82CE844
-	.incbin "data/maps/DewfordTown_Hall/map.bin"
-
-	.align 2
-DewfordTown_Hall_MapAttributes:: @ 82CE978
-	.4byte 0x11
-	.4byte 0x9
-	.4byte DewfordTown_Hall_MapBorder
-	.4byte DewfordTown_Hall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-DewfordTown_House2_MapBorder:: @ 82CE990
-	.incbin "data/maps/DewfordTown_House2/border.bin"
-
-DewfordTown_House2_MapBlockdata:: @ 82CE998
-	.incbin "data/maps/DewfordTown_House2/map.bin"
-
-	.align 2
-DewfordTown_House2_MapAttributes:: @ 82CEA4C
-Route113_GlassWorkshop_MapAttributes:: @ 82CEA4C
-	.4byte 0xa
-	.4byte 0x9
-	.4byte DewfordTown_House2_MapBorder
-	.4byte DewfordTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
-	.incbin "data/maps/LavaridgeTown_HerbShop/border.bin"
-
-LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C
-	.incbin "data/maps/LavaridgeTown_HerbShop/map.bin"
-
-	.align 2
-LavaridgeTown_HerbShop_MapAttributes:: @ 82CEB1C
-	.4byte 0xb
-	.4byte 0x8
-	.4byte LavaridgeTown_HerbShop_MapBorder
-	.4byte LavaridgeTown_HerbShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
-	.incbin "data/maps/LavaridgeTown_Gym_1F/border.bin"
-
-LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C
-	.incbin "data/maps/LavaridgeTown_Gym_1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_1F_MapAttributes:: @ 82CED4C
-	.4byte 0xb
-	.4byte 0x18
-	.4byte LavaridgeTown_Gym_1F_MapBorder
-	.4byte LavaridgeTown_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
-LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
-	.incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin"
-
-LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C
-	.incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_B1F_MapAttributes:: @ 82CEF7C
-	.4byte 0xb
-	.4byte 0x18
-	.4byte LavaridgeTown_Gym_B1F_MapBorder
-	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
-LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
-	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin"
-
-LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C
-	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin"
-
-	.align 2
-LavaridgeTown_PokemonCenter_1F_MapAttributes:: @ 82CF098
-	.4byte 0xe
-	.4byte 0x9
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0
-	.incbin "data/maps/FallarborTown_ContestLobby/border.bin"
-
-FallarborTown_ContestLobby_MapBlockdata:: @ 82CF0B8
-	.incbin "data/maps/FallarborTown_ContestLobby/map.bin"
-
-	.align 2
-FallarborTown_ContestLobby_MapAttributes:: @ 82CF18C
-SlateportCity_ContestLobby_MapAttributes:: @ 82CF18C
-VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C
-	.4byte 0xf
-	.4byte 0x7
-	.4byte FallarborTown_ContestLobby_MapBorder
-	.4byte FallarborTown_ContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-FallarborTown_ContestHall_MapBorder:: @ 82CF1A4
-	.incbin "data/maps/FallarborTown_ContestHall/border.bin"
-
-FallarborTown_ContestHall_MapBlockdata:: @ 82CF1AC
-	.incbin "data/maps/FallarborTown_ContestHall/map.bin"
-
-	.align 2
-FallarborTown_ContestHall_MapAttributes:: @ 82CF4A0
-SlateportCity_ContestHall_MapAttributes:: @ 82CF4A0
-VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0
-	.4byte 0x15
-	.4byte 0x12
-	.4byte FallarborTown_ContestHall_MapBorder
-	.4byte FallarborTown_ContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LilycoveCity_House2_MapBorder:: @ 82CF4B8
-	.incbin "data/maps/LilycoveCity_House2/border.bin"
-
-LilycoveCity_House2_MapBlockdata:: @ 82CF4C0
-	.incbin "data/maps/LilycoveCity_House2/map.bin"
-
-	.align 2
-LilycoveCity_House2_MapAttributes:: @ 82CF540
-	.4byte 0x8
-	.4byte 0x8
-	.4byte LilycoveCity_House2_MapBorder
-	.4byte LilycoveCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-UnknownMapBorder_082CF564:
-	.incbin "data/maps/UnknownMap_082CF564/border.bin"
-
-UnknownMapBlockdata_082CF564:
-	.incbin "data/maps/UnknownMap_082CF564/map.bin"
-
-	.align 2
-UnknownMapAttributes_082CF564::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082CF564
-	.4byte UnknownMapBlockdata_082CF564
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
-	.incbin "data/maps/VerdanturfTown_WandasHouse/border.bin"
-
-VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584
-	.incbin "data/maps/VerdanturfTown_WandasHouse/map.bin"
-
-	.align 2
-VerdanturfTown_WandasHouse_MapAttributes:: @ 82CF694
-	.4byte 0x11
-	.4byte 0x8
-	.4byte VerdanturfTown_WandasHouse_MapBorder
-	.4byte VerdanturfTown_WandasHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PacifidlogTown_House1_MapBorder:: @ 82CF6AC
-	.incbin "data/maps/PacifidlogTown_House1/border.bin"
-
-PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4
-	.incbin "data/maps/PacifidlogTown_House1/map.bin"
-
-	.align 2
-PacifidlogTown_House1_MapAttributes:: @ 82CF768
-PacifidlogTown_House3_MapAttributes:: @ 82CF768
-PacifidlogTown_House5_MapAttributes:: @ 82CF768
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House1_MapBorder
-	.4byte PacifidlogTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PacifidlogTown_House2_MapBorder:: @ 82CF780
-	.incbin "data/maps/PacifidlogTown_House2/border.bin"
-
-PacifidlogTown_House2_MapBlockdata:: @ 82CF788
-	.incbin "data/maps/PacifidlogTown_House2/map.bin"
-
-	.align 2
-PacifidlogTown_House2_MapAttributes:: @ 82CF83C
-PacifidlogTown_House4_MapAttributes:: @ 82CF83C
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House2_MapBorder
-	.4byte PacifidlogTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PetalburgCity_Gym_MapBorder:: @ 82CF854
-	.incbin "data/maps/PetalburgCity_Gym/border.bin"
-
-PetalburgCity_Gym_MapBlockdata:: @ 82CF85C
-	.incbin "data/maps/PetalburgCity_Gym/map.bin"
-
-	.align 2
-PetalburgCity_Gym_MapAttributes:: @ 82D003C
-	.4byte 0x9
-	.4byte 0x70
-	.4byte PetalburgCity_Gym_MapBorder
-	.4byte PetalburgCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PetalburgGym
-
-PetalburgCity_House2_MapBorder:: @ 82D0054
-	.incbin "data/maps/PetalburgCity_House2/border.bin"
-
-PetalburgCity_House2_MapBlockdata:: @ 82D005C
-	.incbin "data/maps/PetalburgCity_House2/map.bin"
-
-	.align 2
-MossdeepCity_House4_MapAttributes:: @ 82D00FC
-PetalburgCity_House2_MapAttributes:: @ 82D00FC
-SlateportCity_House1_MapAttributes:: @ 82D00FC
-	.4byte 0xa
-	.4byte 0x8
-	.4byte PetalburgCity_House2_MapBorder
-	.4byte PetalburgCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
-	.incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin"
-
-SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C
-	.incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_1F_MapAttributes:: @ 82D0394
-	.4byte 0x15
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_1F_MapBorder
-	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
-	.incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin"
-
-SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4
-	.incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4
-	.4byte 0x11
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_2F_MapBorder
-	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-UnknownMapBorder_082D05D8::
-	.incbin "data/maps/UnknownMap_082D05D8/border.bin"
-
-UnknownMapBlockdata_082D05D8::
-	.incbin "data/maps/UnknownMap_082D05D8/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082D05D8::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082D05D8
-	.4byte UnknownMapBlockdata_082D05D8
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-	
-UnknownMapBorder_082D05FC::
-	.incbin "data/maps/UnknownMap_082D05FC/border.bin"
-
-UnknownMapBlockdata_082D05FC::
-	.incbin "data/maps/UnknownMap_082D05FC/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082D05FC::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082D05FC
-	.4byte UnknownMapBlockdata_082D05FC
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
-	.incbin "data/maps/SlateportCity_PokemonFanClub/border.bin"
-
-SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C
-	.incbin "data/maps/SlateportCity_PokemonFanClub/map.bin"
-
-	.align 2
-SlateportCity_PokemonFanClub_MapAttributes:: @ 82D0750
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SlateportCity_PokemonFanClub_MapBorder
-	.4byte SlateportCity_PokemonFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonFanClub
-
-SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
-	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin"
-
-SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770
-	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_1F_MapAttributes:: @ 82D08D8
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
-SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
-	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin"
-
-SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8
-	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_2F_MapAttributes:: @ 82D0A60
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
-SlateportCity_Harbor_MapBorder:: @ 82D0A78
-	.incbin "data/maps/SlateportCity_Harbor/border.bin"
-
-SlateportCity_Harbor_MapBlockdata:: @ 82D0A80
-	.incbin "data/maps/SlateportCity_Harbor/map.bin"
-
-	.align 2
-LilycoveCity_Harbor_MapAttributes:: @ 82D0D50
-SlateportCity_Harbor_MapAttributes:: @ 82D0D50
-	.4byte 0x18
-	.4byte 0xf
-	.4byte SlateportCity_Harbor_MapBorder
-	.4byte SlateportCity_Harbor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MauvilleCity_Gym_MapBorder:: @ 82D0D68
-	.incbin "data/maps/MauvilleCity_Gym/border.bin"
-
-MauvilleCity_Gym_MapBlockdata:: @ 82D0D70
-	.incbin "data/maps/MauvilleCity_Gym/map.bin"
-
-	.align 2
-MauvilleCity_Gym_MapAttributes:: @ 82D0F14
-	.4byte 0xa
-	.4byte 0x15
-	.4byte MauvilleCity_Gym_MapBorder
-	.4byte MauvilleCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGym
-
-MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
-	.incbin "data/maps/MauvilleCity_BikeShop/border.bin"
-
-MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34
-	.incbin "data/maps/MauvilleCity_BikeShop/map.bin"
-
-	.align 2
-MauvilleCity_BikeShop_MapAttributes:: @ 82D100C
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MauvilleCity_BikeShop_MapBorder
-	.4byte MauvilleCity_BikeShop_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
-MauvilleCity_GameCorner_MapBorder:: @ 82D1024
-	.incbin "data/maps/MauvilleCity_GameCorner/border.bin"
-
-MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C
-	.incbin "data/maps/MauvilleCity_GameCorner/map.bin"
-
-	.align 2
-MauvilleCity_GameCorner_MapAttributes:: @ 82D1210
-	.4byte 0x16
-	.4byte 0xb
-	.4byte MauvilleCity_GameCorner_MapBorder
-	.4byte MauvilleCity_GameCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGameCorner
-
-RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
-	.incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin"
-
-RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230
-	.incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_1F_MapAttributes:: @ 82D1388
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_1F_MapBorder
-	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
-	.incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin"
-
-RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8
-	.incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_2F_MapAttributes:: @ 82D1500
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_2F_MapBorder
-	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-RustboroCity_Gym_MapBorder:: @ 82D1518
-	.incbin "data/maps/RustboroCity_Gym/border.bin"
-
-RustboroCity_Gym_MapBlockdata:: @ 82D1520
-	.incbin "data/maps/RustboroCity_Gym/map.bin"
-
-	.align 2
-RustboroCity_Gym_MapAttributes:: @ 82D16C4
-	.4byte 0xb
-	.4byte 0x13
-	.4byte RustboroCity_Gym_MapBorder
-	.4byte RustboroCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_RustboroGym
-
-RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
-	.incbin "data/maps/RustboroCity_PokemonSchool/border.bin"
-
-RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4
-	.incbin "data/maps/RustboroCity_PokemonSchool/map.bin"
-
-	.align 2
-RustboroCity_PokemonSchool_MapAttributes:: @ 82D17EC
-	.4byte 0xc
-	.4byte 0xb
-	.4byte RustboroCity_PokemonSchool_MapBorder
-	.4byte RustboroCity_PokemonSchool_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonSchool
-
-RustboroCity_House2_MapBorder:: @ 82D1804
-	.incbin "data/maps/RustboroCity_House2/border.bin"
-
-RustboroCity_House2_MapBlockdata:: @ 82D180C
-	.incbin "data/maps/RustboroCity_House2/map.bin"
-
-	.align 2
-RustboroCity_House2_MapAttributes:: @ 82D18E4
-RustboroCity_House3_MapAttributes:: @ 82D18E4
-	.4byte 0xc
-	.4byte 0x9
-	.4byte RustboroCity_House2_MapBorder
-	.4byte RustboroCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_House1_MapBorder:: @ 82D18FC
-	.incbin "data/maps/RustboroCity_House1/border.bin"
-
-RustboroCity_House1_MapBlockdata:: @ 82D1904
-	.incbin "data/maps/RustboroCity_House1/map.bin"
-
-	.align 2
-RustboroCity_House1_MapAttributes:: @ 82D19D4
-	.4byte 0xd
-	.4byte 0x8
-	.4byte RustboroCity_House1_MapBorder
-	.4byte RustboroCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
-	.incbin "data/maps/RustboroCity_CuttersHouse/border.bin"
-
-RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4
-	.incbin "data/maps/RustboroCity_CuttersHouse/map.bin"
-
-	.align 2
-RustboroCity_CuttersHouse_MapAttributes:: @ 82D1ABC
-	.4byte 0xb
-	.4byte 0x9
-	.4byte RustboroCity_CuttersHouse_MapBorder
-	.4byte RustboroCity_CuttersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-FortreeCity_House1_MapBorder:: @ 82D1AD4
-	.incbin "data/maps/FortreeCity_House1/border.bin"
-
-FortreeCity_House1_MapBlockdata:: @ 82D1ADC
-	.incbin "data/maps/FortreeCity_House1/map.bin"
-
-	.align 2
-FortreeCity_House1_MapAttributes:: @ 82D1B3C
-FortreeCity_House3_MapAttributes:: @ 82D1B3C
-FortreeCity_House5_MapAttributes:: @ 82D1B3C
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House1_MapBorder
-	.4byte FortreeCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-FortreeCity_Gym_MapBorder:: @ 82D1B54
-	.incbin "data/maps/FortreeCity_Gym/border.bin"
-
-FortreeCity_Gym_MapBlockdata:: @ 82D1B5C
-	.incbin "data/maps/FortreeCity_Gym/map.bin"
-
-	.align 2
-FortreeCity_Gym_MapAttributes:: @ 82D1F44
-	.4byte 0x14
-	.4byte 0x19
-	.4byte FortreeCity_Gym_MapBorder
-	.4byte FortreeCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_FortreeGym
-
-FortreeCity_House2_MapBorder:: @ 82D1F5C
-	.incbin "data/maps/FortreeCity_House2/border.bin"
-
-FortreeCity_House2_MapBlockdata:: @ 82D1F64
-	.incbin "data/maps/FortreeCity_House2/map.bin"
-
-	.align 2
-FortreeCity_House2_MapAttributes:: @ 82D1FC4
-FortreeCity_House4_MapAttributes:: @ 82D1FC4
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House2_MapBorder
-	.4byte FortreeCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
-	.incbin "data/maps/Route104_MrBrineysHouse/border.bin"
-
-Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4
-	.incbin "data/maps/Route104_MrBrineysHouse/map.bin"
-
-	.align 2
-Route104_MrBrineysHouse_MapAttributes:: @ 82D20BC
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route104_MrBrineysHouse_MapBorder
-	.4byte Route104_MrBrineysHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin"
-
-LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_1F_MapAttributes:: @ 82D2328
-	.4byte 0x15
-	.4byte 0xe
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
-LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin"
-
-LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_2F_MapAttributes:: @ 82D2584
-	.4byte 0x16
-	.4byte 0xd
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
-LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
-	.incbin "data/maps/LilycoveCity_ContestLobby/border.bin"
-
-LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4
-	.incbin "data/maps/LilycoveCity_ContestLobby/map.bin"
-
-	.align 2
-LilycoveCity_ContestLobby_MapAttributes:: @ 82D27CC
-	.4byte 0x17
-	.4byte 0xc
-	.4byte LilycoveCity_ContestLobby_MapBorder
-	.4byte LilycoveCity_ContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
-	.incbin "data/maps/LilycoveCity_ContestHall/border.bin"
-
-LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC
-	.incbin "data/maps/LilycoveCity_ContestHall/map.bin"
-
-	.align 2
-LilycoveCity_ContestHall_MapAttributes:: @ 82D3514
-	.4byte 0x33
-	.4byte 0x21
-	.4byte LilycoveCity_ContestHall_MapBorder
-	.4byte LilycoveCity_ContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
-	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin"
-
-LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534
-	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin"
-
-	.align 2
-LilycoveCity_PokemonTrainerFanClub_MapAttributes:: @ 82D3684
-	.4byte 0xc
-	.4byte 0xe
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
-	.incbin "data/maps/LilycoveCity_EmptyMap/border.bin"
-
-LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4
-	.incbin "data/maps/LilycoveCity_EmptyMap/map.bin"
-
-	.align 2
-LilycoveCity_EmptyMap_MapAttributes:: @ 82D36A8
-	.4byte 0x1
-	.4byte 0x1
-	.4byte LilycoveCity_EmptyMap_MapBorder
-	.4byte LilycoveCity_EmptyMap_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MossdeepCity_Gym_MapBorder:: @ 82D36C0
-	.incbin "data/maps/MossdeepCity_Gym/border.bin"
-
-MossdeepCity_Gym_MapBlockdata:: @ 82D36C8
-	.incbin "data/maps/MossdeepCity_Gym/map.bin"
-
-	.align 2
-MossdeepCity_Gym_MapAttributes:: @ 82D3B78
-	.4byte 0x14
-	.4byte 0x1e
-	.4byte MossdeepCity_Gym_MapBorder
-	.4byte MossdeepCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MossdeepGym
-
-SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
-	.incbin "data/maps/SootopolisCity_Gym_1F/border.bin"
-
-SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98
-	.incbin "data/maps/SootopolisCity_Gym_1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_1F_MapAttributes:: @ 82D3F0C
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_1F_MapBorder
-	.4byte SootopolisCity_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
-SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
-	.incbin "data/maps/SootopolisCity_Gym_B1F/border.bin"
-
-SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C
-	.incbin "data/maps/SootopolisCity_Gym_B1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_B1F_MapAttributes:: @ 82D42A0
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_B1F_MapBorder
-	.4byte SootopolisCity_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
-EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
-	.incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin"
-
-EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0
-	.incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin"
-
-	.align 2
-EverGrandeCity_SidneysRoom_MapAttributes:: @ 82D442C
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_SidneysRoom_MapBorder
-	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
-	.incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin"
-
-EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C
-	.incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_PhoebesRoom_MapAttributes:: @ 82D45B8
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_PhoebesRoom_MapBorder
-	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
-	.incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin"
-
-EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8
-	.incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin"
-
-	.align 2
-EverGrandeCity_GlaciasRoom_MapAttributes:: @ 82D4744
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_GlaciasRoom_MapBorder
-	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
-	.incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin"
-
-EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764
-	.incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_DrakesRoom_MapAttributes:: @ 82D48D0
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_DrakesRoom_MapBorder
-	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
-	.incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin"
-
-EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0
-	.incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin"
-
-	.align 2
-EverGrandeCity_ChampionsRoom_MapAttributes:: @ 82D4A44
-	.4byte 0xd
-	.4byte 0xd
-	.4byte EverGrandeCity_ChampionsRoom_MapBorder
-	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C
-	.incbin "data/maps/EverGrandeCity_Corridor1/border.bin"
-
-EverGrandeCity_Corridor1_MapBlockdata:: @ 82D4A64
-	.incbin "data/maps/EverGrandeCity_Corridor1/map.bin"
-
-	.align 2
-EverGrandeCity_Corridor1_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor2_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor3_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor5_MapAttributes:: @ 82D4B84
-	.4byte 0xb
-	.4byte 0xd
-	.4byte EverGrandeCity_Corridor1_MapBorder
-	.4byte EverGrandeCity_Corridor1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
-	.incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin"
-
-Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4
-	.incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin"
-
-	.align 2
-Route104_PrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
-Route104_PrototypePrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
-	.4byte 0xf
-	.4byte 0x9
-	.4byte Route104_PrettyPetalFlowerShop_MapBorder
-	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PrettyPetalFlowerShop
-
-Route112_CableCarStation_MapBorder:: @ 82D4CCC
-	.incbin "data/maps/Route112_CableCarStation/border.bin"
-
-Route112_CableCarStation_MapBlockdata:: @ 82D4CD4
-	.incbin "data/maps/Route112_CableCarStation/map.bin"
-
-	.align 2
-MtChimney_CableCarStation_MapAttributes:: @ 82D4E0C
-Route112_CableCarStation_MapAttributes:: @ 82D4E0C
-	.4byte 0xd
-	.4byte 0xc
-	.4byte Route112_CableCarStation_MapBorder
-	.4byte Route112_CableCarStation_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
-	.incbin "data/maps/Route114_FossilManiacsHouse/border.bin"
-
-Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C
-	.incbin "data/maps/Route114_FossilManiacsHouse/map.bin"
-
-	.align 2
-Route114_FossilManiacsHouse_MapAttributes:: @ 82D4ECC
-	.4byte 0xa
-	.4byte 0x8
-	.4byte Route114_FossilManiacsHouse_MapBorder
-	.4byte Route114_FossilManiacsHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
-	.incbin "data/maps/Route114_FossilManiacsTunnel/border.bin"
-
-Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC
-	.incbin "data/maps/Route114_FossilManiacsTunnel/map.bin"
-
-	.align 2
-Route114_FossilManiacsTunnel_MapAttributes:: @ 82D5190
-	.4byte 0xd
-	.4byte 0x1a
-	.4byte Route114_FossilManiacsTunnel_MapBorder
-	.4byte Route114_FossilManiacsTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route114_LanettesHouse_MapBorder:: @ 82D51A8
-	.incbin "data/maps/Route114_LanettesHouse/border.bin"
-
-Route114_LanettesHouse_MapBlockdata:: @ 82D51B0
-	.incbin "data/maps/Route114_LanettesHouse/map.bin"
-
-	.align 2
-Route114_LanettesHouse_MapAttributes:: @ 82D5260
-	.4byte 0xb
-	.4byte 0x8
-	.4byte Route114_LanettesHouse_MapBorder
-	.4byte Route114_LanettesHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
-	.incbin "data/maps/Route116_TunnelersRestHouse/border.bin"
-
-Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280
-	.incbin "data/maps/Route116_TunnelersRestHouse/map.bin"
-
-	.align 2
-Route116_TunnelersRestHouse_MapAttributes:: @ 82D5334
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route116_TunnelersRestHouse_MapBorder
-	.4byte Route116_TunnelersRestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route117_PokemonDayCare_MapBorder:: @ 82D534C
-	.incbin "data/maps/Route117_PokemonDayCare/border.bin"
-
-Route117_PokemonDayCare_MapBlockdata:: @ 82D5354
-	.incbin "data/maps/Route117_PokemonDayCare/map.bin"
-
-	.align 2
-Route117_PokemonDayCare_MapAttributes:: @ 82D542C
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route117_PokemonDayCare_MapBorder
-	.4byte Route117_PokemonDayCare_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonDayCare
-
-Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
-	.incbin "data/maps/Route121_SafariZoneEntrance/border.bin"
-
-Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C
-	.incbin "data/maps/Route121_SafariZoneEntrance/map.bin"
-
-	.align 2
-Route121_SafariZoneEntrance_MapAttributes:: @ 82D5644
-	.4byte 0x12
-	.4byte 0xe
-	.4byte Route121_SafariZoneEntrance_MapBorder
-	.4byte Route121_SafariZoneEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-MeteorFalls_1F_1R_MapBorder:: @ 82D565C
-	.incbin "data/maps/MeteorFalls_1F_1R/border.bin"
-
-MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664
-	.incbin "data/maps/MeteorFalls_1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_1F_1R_MapAttributes:: @ 82D603C
-	.4byte 0x1e
-	.4byte 0x2a
-	.4byte MeteorFalls_1F_1R_MapBorder
-	.4byte MeteorFalls_1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-MeteorFalls_1F_2R_MapBorder:: @ 82D6054
-	.incbin "data/maps/MeteorFalls_1F_2R/border.bin"
-
-MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C
-	.incbin "data/maps/MeteorFalls_1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_1F_2R_MapAttributes:: @ 82D67DC
-	.4byte 0x1e
-	.4byte 0x20
-	.4byte MeteorFalls_1F_2R_MapBorder
-	.4byte MeteorFalls_1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
-	.incbin "data/maps/MeteorFalls_B1F_1R/border.bin"
-
-MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC
-	.incbin "data/maps/MeteorFalls_B1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_1R_MapAttributes:: @ 82D7098
-	.4byte 0x1d
-	.4byte 0x26
-	.4byte MeteorFalls_B1F_1R_MapBorder
-	.4byte MeteorFalls_B1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
-	.incbin "data/maps/MeteorFalls_B1F_2R/border.bin"
-
-MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8
-	.incbin "data/maps/MeteorFalls_B1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_2R_MapAttributes:: @ 82D7244
-	.4byte 0xb
-	.4byte 0x12
-	.4byte MeteorFalls_B1F_2R_MapBorder
-	.4byte MeteorFalls_B1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-RusturfTunnel_MapBorder:: @ 82D725C
-	.incbin "data/maps/RusturfTunnel/border.bin"
-
-RusturfTunnel_MapBlockdata:: @ 82D7264
-	.incbin "data/maps/RusturfTunnel/map.bin"
-
-	.align 2
-RusturfTunnel_MapAttributes:: @ 82D7924
-	.4byte 0x24
-	.4byte 0x18
-	.4byte RusturfTunnel_MapBorder
-	.4byte RusturfTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_RusturfTunnel
-
-Underwater_SootopolisCity_MapBorder:: @ 82D793C
-	.incbin "data/maps/Underwater_SootopolisCity/border.bin"
-
-Underwater_SootopolisCity_MapBlockdata:: @ 82D7944
-	.incbin "data/maps/Underwater_SootopolisCity/map.bin"
-
-	.align 2
-Underwater_SootopolisCity_MapAttributes:: @ 82D7AD4
-	.4byte 0x14
-	.4byte 0xa
-	.4byte Underwater_SootopolisCity_MapBorder
-	.4byte Underwater_SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-DesertRuins_MapBorder:: @ 82D7AEC
-	.incbin "data/maps/DesertRuins/border.bin"
-
-DesertRuins_MapBlockdata:: @ 82D7AF4
-	.incbin "data/maps/DesertRuins/map.bin"
-
-	.align 2
-DesertRuins_MapAttributes:: @ 82D7F58
-	.4byte 0x11
-	.4byte 0x21
-	.4byte DesertRuins_MapBorder
-	.4byte DesertRuins_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-GraniteCave_1F_MapBorder:: @ 82D7F70
-	.incbin "data/maps/GraniteCave_1F/border.bin"
-
-GraniteCave_1F_MapBlockdata:: @ 82D7F78
-	.incbin "data/maps/GraniteCave_1F/map.bin"
-
-	.align 2
-GraniteCave_1F_MapAttributes:: @ 82D8464
-	.4byte 0x2a
-	.4byte 0xf
-	.4byte GraniteCave_1F_MapBorder
-	.4byte GraniteCave_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-GraniteCave_B1F_MapBorder:: @ 82D847C
-	.incbin "data/maps/GraniteCave_B1F/border.bin"
-
-GraniteCave_B1F_MapBlockdata:: @ 82D8484
-	.incbin "data/maps/GraniteCave_B1F/map.bin"
-
-	.align 2
-GraniteCave_B1F_MapAttributes:: @ 82D8B04
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B1F_MapBorder
-	.4byte GraniteCave_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-GraniteCave_B2F_MapBorder:: @ 82D8B1C
-	.incbin "data/maps/GraniteCave_B2F/border.bin"
-
-GraniteCave_B2F_MapBlockdata:: @ 82D8B24
-	.incbin "data/maps/GraniteCave_B2F/map.bin"
-
-	.align 2
-GraniteCave_B2F_MapAttributes:: @ 82D91A4
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B2F_MapBorder
-	.4byte GraniteCave_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-PetalburgWoods_MapBorder:: @ 82D91BC
-	.incbin "data/maps/PetalburgWoods/border.bin"
-
-PetalburgWoods_MapBlockdata:: @ 82D91C4
-	.incbin "data/maps/PetalburgWoods/map.bin"
-
-	.align 2
-PetalburgWoods_MapAttributes:: @ 82DA244
-	.4byte 0x30
-	.4byte 0x2c
-	.4byte PetalburgWoods_MapBorder
-	.4byte PetalburgWoods_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-MtChimney_MapBorder:: @ 82DA25C
-	.incbin "data/maps/MtChimney/border.bin"
-
-MtChimney_MapBlockdata:: @ 82DA264
-	.incbin "data/maps/MtChimney/map.bin"
-
-	.align 2
-MtChimney_MapAttributes:: @ 82DB114
-	.4byte 0x28
-	.4byte 0x2f
-	.4byte MtChimney_MapBorder
-	.4byte MtChimney_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-MtPyre_1F_MapBorder:: @ 82DB12C
-	.incbin "data/maps/MtPyre_1F/border.bin"
-
-MtPyre_1F_MapBlockdata:: @ 82DB134
-	.incbin "data/maps/MtPyre_1F/map.bin"
-
-	.align 2
-MtPyre_1F_MapAttributes:: @ 82DB478
-	.4byte 0x16
-	.4byte 0x13
-	.4byte MtPyre_1F_MapBorder
-	.4byte MtPyre_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_2F_MapBorder:: @ 82DB490
-	.incbin "data/maps/MtPyre_2F/border.bin"
-
-MtPyre_2F_MapBlockdata:: @ 82DB498
-	.incbin "data/maps/MtPyre_2F/map.bin"
-
-	.align 2
-MtPyre_2F_MapAttributes:: @ 82DB5EC
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_2F_MapBorder
-	.4byte MtPyre_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_3F_MapBorder:: @ 82DB604
-	.incbin "data/maps/MtPyre_3F/border.bin"
-
-MtPyre_3F_MapBlockdata:: @ 82DB60C
-	.incbin "data/maps/MtPyre_3F/map.bin"
-
-	.align 2
-MtPyre_3F_MapAttributes:: @ 82DB760
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_3F_MapBorder
-	.4byte MtPyre_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_4F_MapBorder:: @ 82DB778
-	.incbin "data/maps/MtPyre_4F/border.bin"
-
-MtPyre_4F_MapBlockdata:: @ 82DB780
-	.incbin "data/maps/MtPyre_4F/map.bin"
-
-	.align 2
-MtPyre_4F_MapAttributes:: @ 82DB8D4
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_4F_MapBorder
-	.4byte MtPyre_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_5F_MapBorder:: @ 82DB8EC
-	.incbin "data/maps/MtPyre_5F/border.bin"
-
-MtPyre_5F_MapBlockdata:: @ 82DB8F4
-	.incbin "data/maps/MtPyre_5F/map.bin"
-
-	.align 2
-MtPyre_5F_MapAttributes:: @ 82DBA48
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_5F_MapBorder
-	.4byte MtPyre_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_6F_MapBorder:: @ 82DBA60
-	.incbin "data/maps/MtPyre_6F/border.bin"
-
-MtPyre_6F_MapBlockdata:: @ 82DBA68
-	.incbin "data/maps/MtPyre_6F/map.bin"
-
-	.align 2
-MtPyre_6F_MapAttributes:: @ 82DBBBC
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_6F_MapBorder
-	.4byte MtPyre_6F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AquaHideout_1F_MapBorder:: @ 82DBBD4
-	.incbin "data/maps/AquaHideout_1F/border.bin"
-
-AquaHideout_1F_MapBlockdata:: @ 82DBBDC
-	.incbin "data/maps/AquaHideout_1F/map.bin"
-
-	.align 2
-AquaHideout_1F_MapAttributes:: @ 82DC26C
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte AquaHideout_1F_MapBorder
-	.4byte AquaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AquaHideout_B1F_MapBorder:: @ 82DC284
-	.incbin "data/maps/AquaHideout_B1F/border.bin"
-
-AquaHideout_B1F_MapBlockdata:: @ 82DC28C
-	.incbin "data/maps/AquaHideout_B1F/map.bin"
-
-	.align 2
-AquaHideout_B1F_MapAttributes:: @ 82DCC1C
-	.4byte 0x33
-	.4byte 0x18
-	.4byte AquaHideout_B1F_MapBorder
-	.4byte AquaHideout_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AquaHideout_B2F_MapBorder:: @ 82DCC34
-	.incbin "data/maps/AquaHideout_B2F/border.bin"
-
-AquaHideout_B2F_MapBlockdata:: @ 82DCC3C
-	.incbin "data/maps/AquaHideout_B2F/map.bin"
-
-	.align 2
-AquaHideout_B2F_MapAttributes:: @ 82DD29C
-	.4byte 0x22
-	.4byte 0x18
-	.4byte AquaHideout_B2F_MapBorder
-	.4byte AquaHideout_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
-	.incbin "data/maps/Underwater_SeafloorCavern/border.bin"
-
-Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC
-	.incbin "data/maps/Underwater_SeafloorCavern/map.bin"
-
-	.align 2
-Underwater_SeafloorCavern_MapAttributes:: @ 82DD3B8
-	.4byte 0xe
-	.4byte 0x9
-	.4byte Underwater_SeafloorCavern_MapBorder
-	.4byte Underwater_SeafloorCavern_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
-	.incbin "data/maps/SeafloorCavern_Entrance/border.bin"
-
-SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8
-	.incbin "data/maps/SeafloorCavern_Entrance/map.bin"
-
-	.align 2
-SeafloorCavern_Entrance_MapAttributes:: @ 82DD6F8
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Entrance_MapBorder
-	.4byte SeafloorCavern_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room1_MapBorder:: @ 82DD710
-	.incbin "data/maps/SeafloorCavern_Room1/border.bin"
-
-SeafloorCavern_Room1_MapBlockdata:: @ 82DD718
-	.incbin "data/maps/SeafloorCavern_Room1/map.bin"
-
-	.align 2
-SeafloorCavern_Room1_MapAttributes:: @ 82DDA60
-	.4byte 0x14
-	.4byte 0x15
-	.4byte SeafloorCavern_Room1_MapBorder
-	.4byte SeafloorCavern_Room1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room2_MapBorder:: @ 82DDA78
-	.incbin "data/maps/SeafloorCavern_Room2/border.bin"
-
-SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80
-	.incbin "data/maps/SeafloorCavern_Room2/map.bin"
-
-	.align 2
-SeafloorCavern_Room2_MapAttributes:: @ 82DDD74
-	.4byte 0x12
-	.4byte 0x15
-	.4byte SeafloorCavern_Room2_MapBorder
-	.4byte SeafloorCavern_Room2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
-	.incbin "data/maps/SeafloorCavern_Room3/border.bin"
-
-SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94
-	.incbin "data/maps/SeafloorCavern_Room3/map.bin"
-
-	.align 2
-SeafloorCavern_Room3_MapAttributes:: @ 82DDFB4
-	.4byte 0x10
-	.4byte 0x11
-	.4byte SeafloorCavern_Room3_MapBorder
-	.4byte SeafloorCavern_Room3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
-	.incbin "data/maps/SeafloorCavern_Room4/border.bin"
-
-SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4
-	.incbin "data/maps/SeafloorCavern_Room4/map.bin"
-
-	.align 2
-SeafloorCavern_Room4_MapAttributes:: @ 82DE280
-	.4byte 0x12
-	.4byte 0x13
-	.4byte SeafloorCavern_Room4_MapBorder
-	.4byte SeafloorCavern_Room4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room5_MapBorder:: @ 82DE298
-	.incbin "data/maps/SeafloorCavern_Room5/border.bin"
-
-SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0
-	.incbin "data/maps/SeafloorCavern_Room5/map.bin"
-
-	.align 2
-SeafloorCavern_Room5_MapAttributes:: @ 82DE5C0
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Room5_MapBorder
-	.4byte SeafloorCavern_Room5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
-	.incbin "data/maps/SeafloorCavern_Room6/border.bin"
-
-SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0
-	.incbin "data/maps/SeafloorCavern_Room6/map.bin"
-
-	.align 2
-SeafloorCavern_Room6_MapAttributes:: @ 82DEA30
-	.4byte 0x18
-	.4byte 0x17
-	.4byte SeafloorCavern_Room6_MapBorder
-	.4byte SeafloorCavern_Room6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SeafloorCavern_Room7_MapBorder:: @ 82DEA48
-	.incbin "data/maps/SeafloorCavern_Room7/border.bin"
-
-SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50
-	.incbin "data/maps/SeafloorCavern_Room7/map.bin"
-
-	.align 2
-SeafloorCavern_Room7_MapAttributes:: @ 82DEED0
-	.4byte 0x17
-	.4byte 0x19
-	.4byte SeafloorCavern_Room7_MapBorder
-	.4byte SeafloorCavern_Room7_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
-	.incbin "data/maps/SeafloorCavern_Room8/border.bin"
-
-SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0
-	.incbin "data/maps/SeafloorCavern_Room8/map.bin"
-
-	.align 2
-SeafloorCavern_Room8_MapAttributes:: @ 82DF024
-	.4byte 0xb
-	.4byte 0xe
-	.4byte SeafloorCavern_Room8_MapBorder
-	.4byte SeafloorCavern_Room8_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room9_MapBorder:: @ 82DF03C
-	.incbin "data/maps/SeafloorCavern_Room9/border.bin"
-
-SeafloorCavern_Room9_MapBlockdata:: @ 82DF044
-	.incbin "data/maps/SeafloorCavern_Room9/map.bin"
-
-	.align 2
-SeafloorCavern_Room9_MapAttributes:: @ 82DF9F8
-	.4byte 0x1b
-	.4byte 0x2e
-	.4byte SeafloorCavern_Room9_MapBorder
-	.4byte SeafloorCavern_Room9_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
-	.incbin "data/maps/CaveOfOrigin_Entrance/border.bin"
-
-CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18
-	.incbin "data/maps/CaveOfOrigin_Entrance/map.bin"
-
-	.align 2
-CaveOfOrigin_Entrance_MapAttributes:: @ 82DFDF4
-	.4byte 0x13
-	.4byte 0x1a
-	.4byte CaveOfOrigin_Entrance_MapBorder
-	.4byte CaveOfOrigin_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
-	.incbin "data/maps/CaveOfOrigin_1F/border.bin"
-
-CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14
-	.incbin "data/maps/CaveOfOrigin_1F/map.bin"
-
-	.align 2
-CaveOfOrigin_1F_MapAttributes:: @ 82E0238
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_1F_MapBorder
-	.4byte CaveOfOrigin_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B1F_MapBorder:: @ 82E0250
-	.incbin "data/maps/CaveOfOrigin_B1F/border.bin"
-
-CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258
-	.incbin "data/maps/CaveOfOrigin_B1F/map.bin"
-
-	.align 2
-CaveOfOrigin_B1F_MapAttributes:: @ 82E067C
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_B1F_MapBorder
-	.4byte CaveOfOrigin_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B2F_MapBorder:: @ 82E0694
-	.incbin "data/maps/CaveOfOrigin_B2F/border.bin"
-
-CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C
-	.incbin "data/maps/CaveOfOrigin_B2F/map.bin"
-
-	.align 2
-CaveOfOrigin_B2F_MapAttributes:: @ 82E0A10
-	.4byte 0x15
-	.4byte 0x15
-	.4byte CaveOfOrigin_B2F_MapBorder
-	.4byte CaveOfOrigin_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
-	.incbin "data/maps/CaveOfOrigin_B3F/border.bin"
-
-CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30
-	.incbin "data/maps/CaveOfOrigin_B3F/map.bin"
-
-	.align 2
-CaveOfOrigin_B3F_MapAttributes:: @ 82E0D50
-	.4byte 0x13
-	.4byte 0x15
-	.4byte CaveOfOrigin_B3F_MapBorder
-	.4byte CaveOfOrigin_B3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
-	.incbin "data/maps/CaveOfOrigin_B4F/border.bin"
-
-CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70
-	.incbin "data/maps/CaveOfOrigin_B4F/map.bin"
-
-	.align 2
-CaveOfOrigin_B4F_MapAttributes:: @ 82E1044
-	.4byte 0x13
-	.4byte 0x13
-	.4byte CaveOfOrigin_B4F_MapBorder
-	.4byte CaveOfOrigin_B4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-VictoryRoad_1F_MapBorder:: @ 82E105C
-	.incbin "data/maps/VictoryRoad_1F/border.bin"
-
-VictoryRoad_1F_MapBlockdata:: @ 82E1064
-	.incbin "data/maps/VictoryRoad_1F/map.bin"
-
-	.align 2
-VictoryRoad_1F_MapAttributes:: @ 82E2090
-	.4byte 0x2e
-	.4byte 0x2d
-	.4byte VictoryRoad_1F_MapBorder
-	.4byte VictoryRoad_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
-	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin"
-
-ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0
-	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideEntranceRoom_MapAttributes:: @ 82E2A44
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
-	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
-	.incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin"
-
-ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64
-	.incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideInnerRoom_MapAttributes:: @ 82E380C
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_LowTideInnerRoom_MapBorder
-	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
-	.incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin"
-
-ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C
-	.incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideStairsRoom_MapAttributes:: @ 82E3AA4
-	.4byte 0x15
-	.4byte 0xf
-	.4byte ShoalCave_LowTideStairsRoom_MapBorder
-	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
-	.incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin"
-
-ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4
-	.incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideLowerRoom_MapAttributes:: @ 82E3E28
-	.4byte 0x1f
-	.4byte 0xe
-	.4byte ShoalCave_LowTideLowerRoom_MapBorder
-	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
-	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin"
-
-ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48
-	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideEntranceRoom_MapAttributes:: @ 82E47DC
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
-	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
-	.incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin"
-
-ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC
-	.incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_HighTideInnerRoom_MapBorder
-	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E55C8:
-	.incbin "data/maps/UnknownMap_082E55C8/border.bin"
-
-UnknownMapBlockdata_082E55C8:
-	.incbin "data/maps/UnknownMap_082E55C8/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E55C8:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E55C8
-	.4byte UnknownMapBlockdata_082E55C8
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E55EC:
-	.incbin "data/maps/UnknownMap_082E55EC/border.bin"
-
-UnknownMapBlockdata_082E55EC:
-	.incbin "data/maps/UnknownMap_082E55EC/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E55EC:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E55EC
-	.4byte UnknownMapBlockdata_082E55EC
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E5610:
-	.incbin "data/maps/UnknownMap_082E5610/border.bin"
-
-UnknownMapBlockdata_082E5610:
-	.incbin "data/maps/UnknownMap_082E5610/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5610:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5610
-	.4byte UnknownMapBlockdata_082E5610
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E5634:
-	.incbin "data/maps/UnknownMap_082E5634/border.bin"
-
-UnknownMapBlockdata_082E5634:
-	.incbin "data/maps/UnknownMap_082E5634/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5634:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5634
-	.4byte UnknownMapBlockdata_082E5634
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5658:
-	.incbin "data/maps/UnknownMap_082E5658/border.bin"
-	
-UnknownMapBlockdata_082E5658:
-	.incbin "data/maps/UnknownMap_082E5658/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5658:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5658
-	.4byte UnknownMapBlockdata_082E5658
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E567C:
-	.incbin "data/maps/UnknownMap_082E567C/border.bin"
-	
-UnknownMapBlockdata_082E567C:
-	.incbin "data/maps/UnknownMap_082E567C/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E567C:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E567C
-	.4byte UnknownMapBlockdata_082E567C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E56A0:
-	.incbin "data/maps/UnknownMap_082E56A0/border.bin"
-	
-UnknownMapBlockdata_082E56A0:
-	.incbin "data/maps/UnknownMap_082E56A0/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E56A0:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E56A0
-	.4byte UnknownMapBlockdata_082E56A0
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E56C4:
-	.incbin "data/maps/UnknownMap_082E56C4/border.bin"
-
-UnknownMapBlockdata_082E56C4:
-	.incbin "data/maps/UnknownMap_082E56C4/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E56C4:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E56C4
-	.4byte UnknownMapBlockdata_082E56C4
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E56E8:
-	.incbin "data/maps/UnknownMap_082E56E8/border.bin"
-
-UnknownMapBlockdata_082E56E8:
-	.incbin "data/maps/UnknownMap_082E56E8/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E56E8:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E56E8
-	.4byte UnknownMapBlockdata_082E56E8
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E570C:
-	.incbin "data/maps/UnknownMap_082E570C/border.bin"
-
-UnknownMapBlockdata_082E570C:
-	.incbin "data/maps/UnknownMap_082E570C/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E570C:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E570C
-	.4byte UnknownMapBlockdata_082E570C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5730:
-	.incbin "data/maps/UnknownMap_082E5730/border.bin"
-
-UnknownMapBlockdata_082E5730:
-	.incbin "data/maps/UnknownMap_082E5730/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5730:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5730
-	.4byte UnknownMapBlockdata_082E5730
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5754:
-	.incbin "data/maps/UnknownMap_082E5754/border.bin"
-
-UnknownMapBlockdata_082E5754:
-	.incbin "data/maps/UnknownMap_082E5754/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5754:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5754
-	.4byte UnknownMapBlockdata_082E5754
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5778:	
-	.incbin "data/maps/UnknownMap_082E5778/border.bin"
-
-UnknownMapBlockdata_082E5778:
-	.incbin "data/maps/UnknownMap_082E5778/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5778:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5778
-	.4byte UnknownMapBlockdata_082E5778
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E579C:
-	.incbin "data/maps/UnknownMap_082E579C/border.bin"
-
-UnknownMapBlockdata_082E579C:	
-	.incbin "data/maps/UnknownMap_082E579C/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E579C:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E579C
-	.4byte UnknownMapBlockdata_082E579C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-NewMauville_Entrance_MapBorder:: @ 82E57B4
-	.incbin "data/maps/NewMauville_Entrance/border.bin"
-
-NewMauville_Entrance_MapBlockdata:: @ 82E57BC
-	.incbin "data/maps/NewMauville_Entrance/map.bin"
-
-	.align 2
-NewMauville_Entrance_MapAttributes:: @ 82E5860
-	.4byte 0x9
-	.4byte 0x9
-	.4byte NewMauville_Entrance_MapBorder
-	.4byte NewMauville_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-NewMauville_Inside_MapBorder:: @ 82E5878
-	.incbin "data/maps/NewMauville_Inside/border.bin"
-
-NewMauville_Inside_MapBlockdata:: @ 82E5880
-	.incbin "data/maps/NewMauville_Inside/map.bin"
-
-	.align 2
-NewMauville_Inside_MapAttributes:: @ 82E65A4
-	.4byte 0x29
-	.4byte 0x29
-	.4byte NewMauville_Inside_MapBorder
-	.4byte NewMauville_Inside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
-AbandonedShip_Deck_MapBorder:: @ 82E65BC
-	.incbin "data/maps/AbandonedShip_Deck/border.bin"
-
-AbandonedShip_Deck_MapBlockdata:: @ 82E65C4
-	.incbin "data/maps/AbandonedShip_Deck/map.bin"
-
-	.align 2
-AbandonedShip_Deck_MapAttributes:: @ 82E698C
-	.4byte 0x17
-	.4byte 0x15
-	.4byte AbandonedShip_Deck_MapBorder
-	.4byte AbandonedShip_Deck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
-	.incbin "data/maps/AbandonedShip_Corridors_1F/border.bin"
-
-AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC
-	.incbin "data/maps/AbandonedShip_Corridors_1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_1F_MapAttributes:: @ 82E6B5C
-	.4byte 0x12
-	.4byte 0xc
-	.4byte AbandonedShip_Corridors_1F_MapBorder
-	.4byte AbandonedShip_Corridors_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
-	.incbin "data/maps/AbandonedShip_Rooms_1F/border.bin"
-
-AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C
-	.incbin "data/maps/AbandonedShip_Rooms_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_1F_MapAttributes:: @ 82E6DE0
-	.4byte 0x12
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms_1F_MapBorder
-	.4byte AbandonedShip_Rooms_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
-	.incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin"
-
-AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00
-	.incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_B1F_MapAttributes:: @ 82E6F04
-	.4byte 0xd
-	.4byte 0xa
-	.4byte AbandonedShip_Corridors_B1F_MapBorder
-	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
-	.incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin"
-
-AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24
-	.incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_B1F_MapAttributes:: @ 82E70D4
-	.4byte 0x1b
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms_B1F_MapBorder
-	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
-	.incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin"
-
-AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4
-	.incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_B1F_MapAttributes:: @ 82E7214
-	.4byte 0x12
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms2_B1F_MapBorder
-	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Underwater1_MapBorder:: @ 82E722C
-	.incbin "data/maps/AbandonedShip_Underwater1/border.bin"
-
-AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234
-	.incbin "data/maps/AbandonedShip_Underwater1/map.bin"
-
-	.align 2
-AbandonedShip_Underwater1_MapAttributes:: @ 82E72B4
-	.4byte 0x8
-	.4byte 0x8
-	.4byte AbandonedShip_Underwater1_MapBorder
-	.4byte AbandonedShip_Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
-	.incbin "data/maps/AbandonedShip_Room_B1F/border.bin"
-
-AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4
-	.incbin "data/maps/AbandonedShip_Room_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Room_B1F_MapAttributes:: @ 82E7364
-	.4byte 0x9
-	.4byte 0x8
-	.4byte AbandonedShip_Room_B1F_MapBorder
-	.4byte AbandonedShip_Room_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
-	.incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin"
-
-AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384
-	.incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_1F_MapAttributes:: @ 82E74B8
-	.4byte 0x9
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms2_1F_MapBorder
-	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
-	.incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin"
-
-AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8
-	.incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin"
-
-	.align 2
-AbandonedShip_CaptainsOffice_MapAttributes:: @ 82E7558
-	.4byte 0x9
-	.4byte 0x7
-	.4byte AbandonedShip_CaptainsOffice_MapBorder
-	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AbandonedShip_Underwater2_MapBorder:: @ 82E7570
-	.incbin "data/maps/AbandonedShip_Underwater2/border.bin"
-
-AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578
-	.incbin "data/maps/AbandonedShip_Underwater2/map.bin"
-
-	.align 2
-AbandonedShip_Underwater2_MapAttributes:: @ 82E76A0
-	.4byte 0x15
-	.4byte 0x7
-	.4byte AbandonedShip_Underwater2_MapBorder
-	.4byte AbandonedShip_Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SecretBase_RedCave1_MapBorder:: @ 82E76B8
-	.incbin "data/maps/SecretBase_RedCave1/border.bin"
-
-SecretBase_RedCave1_MapBlockdata:: @ 82E76C0
-	.incbin "data/maps/SecretBase_RedCave1/map.bin"
-
-	.align 2
-SecretBase_RedCave1_MapAttributes:: @ 82E7788
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_RedCave1_MapBorder
-	.4byte SecretBase_RedCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave1_MapBorder:: @ 82E77A0
-	.incbin "data/maps/SecretBase_BrownCave1/border.bin"
-
-SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8
-	.incbin "data/maps/SecretBase_BrownCave1/map.bin"
-
-	.align 2
-SecretBase_BrownCave1_MapAttributes:: @ 82E7870
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BrownCave1_MapBorder
-	.4byte SecretBase_BrownCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave1_MapBorder:: @ 82E7888
-	.incbin "data/maps/SecretBase_BlueCave1/border.bin"
-
-SecretBase_BlueCave1_MapBlockdata:: @ 82E7890
-	.incbin "data/maps/SecretBase_BlueCave1/map.bin"
-
-	.align 2
-SecretBase_BlueCave1_MapAttributes:: @ 82E7958
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BlueCave1_MapBorder
-	.4byte SecretBase_BlueCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave1_MapBorder:: @ 82E7970
-	.incbin "data/maps/SecretBase_YellowCave1/border.bin"
-
-SecretBase_YellowCave1_MapBlockdata:: @ 82E7978
-	.incbin "data/maps/SecretBase_YellowCave1/map.bin"
-
-	.align 2
-SecretBase_YellowCave1_MapAttributes:: @ 82E7A40
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_YellowCave1_MapBorder
-	.4byte SecretBase_YellowCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree1_MapBorder:: @ 82E7A58
-	.incbin "data/maps/SecretBase_Tree1/border.bin"
-
-SecretBase_Tree1_MapBlockdata:: @ 82E7A60
-	.incbin "data/maps/SecretBase_Tree1/map.bin"
-
-	.align 2
-SecretBase_Tree1_MapAttributes:: @ 82E7B28
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Tree1_MapBorder
-	.4byte SecretBase_Tree1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub1_MapBorder:: @ 82E7B40
-	.incbin "data/maps/SecretBase_Shrub1/border.bin"
-
-SecretBase_Shrub1_MapBlockdata:: @ 82E7B48
-	.incbin "data/maps/SecretBase_Shrub1/map.bin"
-
-	.align 2
-SecretBase_Shrub1_MapAttributes:: @ 82E7C10
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Shrub1_MapBorder
-	.4byte SecretBase_Shrub1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave2_MapBorder:: @ 82E7C28
-	.incbin "data/maps/SecretBase_RedCave2/border.bin"
-
-SecretBase_RedCave2_MapBlockdata:: @ 82E7C30
-	.incbin "data/maps/SecretBase_RedCave2/map.bin"
-
-	.align 2
-SecretBase_RedCave2_MapAttributes:: @ 82E7D10
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_RedCave2_MapBorder
-	.4byte SecretBase_RedCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave2_MapBorder:: @ 82E7D28
-	.incbin "data/maps/SecretBase_BrownCave2/border.bin"
-
-SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30
-	.incbin "data/maps/SecretBase_BrownCave2/map.bin"
-
-	.align 2
-SecretBase_BrownCave2_MapAttributes:: @ 82E7E2C
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_BrownCave2_MapBorder
-	.4byte SecretBase_BrownCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave2_MapBorder:: @ 82E7E44
-	.incbin "data/maps/SecretBase_BlueCave2/border.bin"
-
-SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C
-	.incbin "data/maps/SecretBase_BlueCave2/map.bin"
-
-	.align 2
-SecretBase_BlueCave2_MapAttributes:: @ 82E7F20
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_BlueCave2_MapBorder
-	.4byte SecretBase_BlueCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave2_MapBorder:: @ 82E7F38
-	.incbin "data/maps/SecretBase_YellowCave2/border.bin"
-
-SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40
-	.incbin "data/maps/SecretBase_YellowCave2/map.bin"
-
-	.align 2
-SecretBase_YellowCave2_MapAttributes:: @ 82E803C
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_YellowCave2_MapBorder
-	.4byte SecretBase_YellowCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree2_MapBorder:: @ 82E8054
-	.incbin "data/maps/SecretBase_Tree2/border.bin"
-
-SecretBase_Tree2_MapBlockdata:: @ 82E805C
-	.incbin "data/maps/SecretBase_Tree2/map.bin"
-
-	.align 2
-SecretBase_Tree2_MapAttributes:: @ 82E813C
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_Tree2_MapBorder
-	.4byte SecretBase_Tree2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub2_MapBorder:: @ 82E8154
-	.incbin "data/maps/SecretBase_Shrub2/border.bin"
-
-SecretBase_Shrub2_MapBlockdata:: @ 82E815C
-	.incbin "data/maps/SecretBase_Shrub2/map.bin"
-
-	.align 2
-SecretBase_Shrub2_MapAttributes:: @ 82E8230
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_Shrub2_MapBorder
-	.4byte SecretBase_Shrub2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave3_MapBorder:: @ 82E8248
-	.incbin "data/maps/SecretBase_RedCave3/border.bin"
-
-SecretBase_RedCave3_MapBlockdata:: @ 82E8250
-	.incbin "data/maps/SecretBase_RedCave3/map.bin"
-
-	.align 2
-SecretBase_RedCave3_MapAttributes:: @ 82E8340
-	.4byte 0xf
-	.4byte 0x8
-	.4byte SecretBase_RedCave3_MapBorder
-	.4byte SecretBase_RedCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave3_MapBorder:: @ 82E8358
-	.incbin "data/maps/SecretBase_BrownCave3/border.bin"
-
-SecretBase_BrownCave3_MapBlockdata:: @ 82E8360
-	.incbin "data/maps/SecretBase_BrownCave3/map.bin"
-
-	.align 2
-SecretBase_BrownCave3_MapAttributes:: @ 82E84AC
-	.4byte 0xf
-	.4byte 0xb
-	.4byte SecretBase_BrownCave3_MapBorder
-	.4byte SecretBase_BrownCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave3_MapBorder:: @ 82E84C4
-	.incbin "data/maps/SecretBase_BlueCave3/border.bin"
-
-SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC
-	.incbin "data/maps/SecretBase_BlueCave3/map.bin"
-
-	.align 2
-SecretBase_BlueCave3_MapAttributes:: @ 82E8620
-	.4byte 0xa
-	.4byte 0x11
-	.4byte SecretBase_BlueCave3_MapBorder
-	.4byte SecretBase_BlueCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave3_MapBorder:: @ 82E8638
-	.incbin "data/maps/SecretBase_YellowCave3/border.bin"
-
-SecretBase_YellowCave3_MapBlockdata:: @ 82E8640
-	.incbin "data/maps/SecretBase_YellowCave3/map.bin"
-
-	.align 2
-SecretBase_YellowCave3_MapAttributes:: @ 82E8748
-	.4byte 0xc
-	.4byte 0xb
-	.4byte SecretBase_YellowCave3_MapBorder
-	.4byte SecretBase_YellowCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree3_MapBorder:: @ 82E8760
-	.incbin "data/maps/SecretBase_Tree3/border.bin"
-
-SecretBase_Tree3_MapBlockdata:: @ 82E8768
-	.incbin "data/maps/SecretBase_Tree3/map.bin"
-
-	.align 2
-SecretBase_Tree3_MapAttributes:: @ 82E8878
-	.4byte 0x11
-	.4byte 0x8
-	.4byte SecretBase_Tree3_MapBorder
-	.4byte SecretBase_Tree3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub3_MapBorder:: @ 82E8890
-	.incbin "data/maps/SecretBase_Shrub3/border.bin"
-
-SecretBase_Shrub3_MapBlockdata:: @ 82E8898
-	.incbin "data/maps/SecretBase_Shrub3/map.bin"
-
-	.align 2
-SecretBase_Shrub3_MapAttributes:: @ 82E89B8
-	.4byte 0xd
-	.4byte 0xb
-	.4byte SecretBase_Shrub3_MapBorder
-	.4byte SecretBase_Shrub3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave4_MapBorder:: @ 82E89D0
-	.incbin "data/maps/SecretBase_RedCave4/border.bin"
-
-SecretBase_RedCave4_MapBlockdata:: @ 82E89D8
-	.incbin "data/maps/SecretBase_RedCave4/map.bin"
-
-	.align 2
-SecretBase_RedCave4_MapAttributes:: @ 82E8AE8
-	.4byte 0x9
-	.4byte 0xf
-	.4byte SecretBase_RedCave4_MapBorder
-	.4byte SecretBase_RedCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave4_MapBorder:: @ 82E8B00
-	.incbin "data/maps/SecretBase_BrownCave4/border.bin"
-
-SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08
-	.incbin "data/maps/SecretBase_BrownCave4/map.bin"
-
-	.align 2
-SecretBase_BrownCave4_MapAttributes:: @ 82E8C58
-	.4byte 0xe
-	.4byte 0xc
-	.4byte SecretBase_BrownCave4_MapBorder
-	.4byte SecretBase_BrownCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave4_MapBorder:: @ 82E8C70
-	.incbin "data/maps/SecretBase_BlueCave4/border.bin"
-
-SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78
-	.incbin "data/maps/SecretBase_BlueCave4/map.bin"
-
-	.align 2
-SecretBase_BlueCave4_MapAttributes:: @ 82E8DAC
-	.4byte 0x9
-	.4byte 0x11
-	.4byte SecretBase_BlueCave4_MapBorder
-	.4byte SecretBase_BlueCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
-	.incbin "data/maps/SecretBase_YellowCave4/border.bin"
-
-SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC
-	.incbin "data/maps/SecretBase_YellowCave4/map.bin"
-
-	.align 2
-SecretBase_YellowCave4_MapAttributes:: @ 82E8F38
-	.4byte 0xd
-	.4byte 0xe
-	.4byte SecretBase_YellowCave4_MapBorder
-	.4byte SecretBase_YellowCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree4_MapBorder:: @ 82E8F50
-	.incbin "data/maps/SecretBase_Tree4/border.bin"
-
-SecretBase_Tree4_MapBlockdata:: @ 82E8F58
-	.incbin "data/maps/SecretBase_Tree4/map.bin"
-
-	.align 2
-SecretBase_Tree4_MapAttributes:: @ 82E90E0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SecretBase_Tree4_MapBorder
-	.4byte SecretBase_Tree4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub4_MapBorder:: @ 82E90F8
-	.incbin "data/maps/SecretBase_Shrub4/border.bin"
-
-SecretBase_Shrub4_MapBlockdata:: @ 82E9100
-	.incbin "data/maps/SecretBase_Shrub4/map.bin"
-
-	.align 2
-SecretBase_Shrub4_MapAttributes:: @ 82E9234
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SecretBase_Shrub4_MapBorder
-	.4byte SecretBase_Shrub4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SingleBattleColosseum_MapBorder:: @ 82E924C
-	.incbin "data/maps/SingleBattleColosseum/border.bin"
-
-SingleBattleColosseum_MapBlockdata:: @ 82E9254
-	.incbin "data/maps/SingleBattleColosseum/map.bin"
-
-	.align 2
-SingleBattleColosseum_MapAttributes:: @ 82E9350
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SingleBattleColosseum_MapBorder
-	.4byte SingleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-TradeCenter_MapBorder:: @ 82E9368
-	.incbin "data/maps/TradeCenter/border.bin"
-
-TradeCenter_MapBlockdata:: @ 82E9370
-	.incbin "data/maps/TradeCenter/map.bin"
-
-	.align 2
-TradeCenter_MapAttributes:: @ 82E9448
-	.4byte 0xc
-	.4byte 0x9
-	.4byte TradeCenter_MapBorder
-	.4byte TradeCenter_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-RecordCorner_MapBorder:: @ 82E9460
-	.incbin "data/maps/RecordCorner/border.bin"
-
-RecordCorner_MapBlockdata:: @ 82E9468
-	.incbin "data/maps/RecordCorner/map.bin"
-
-	.align 2
-RecordCorner_MapAttributes:: @ 82E95F8
-	.4byte 0x14
-	.4byte 0xa
-	.4byte RecordCorner_MapBorder
-	.4byte RecordCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-DoubleBattleColosseum_MapBorder:: @ 82E9610
-	.incbin "data/maps/DoubleBattleColosseum/border.bin"
-
-DoubleBattleColosseum_MapBlockdata:: @ 82E9618
-	.incbin "data/maps/DoubleBattleColosseum/map.bin"
-
-	.align 2
-DoubleBattleColosseum_MapAttributes:: @ 82E9714
-	.4byte 0xe
-	.4byte 0x9
-	.4byte DoubleBattleColosseum_MapBorder
-	.4byte DoubleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-LinkContestRoom1_MapBorder:: @ 82E972C
-	.incbin "data/maps/LinkContestRoom1/border.bin"
-
-LinkContestRoom1_MapBlockdata:: @ 82E9734
-	.incbin "data/maps/LinkContestRoom1/map.bin"
-
-	.align 2
-LinkContestRoom1_MapAttributes:: @ 82E9880
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom1_MapBorder
-	.4byte LinkContestRoom1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-UnknownMap_25_29_MapBorder:: @ 82E9898
-	.incbin "data/maps/UnknownMap_25_29/border.bin"
-
-UnknownMap_25_29_MapBlockdata:: @ 82E98A0
-	.incbin "data/maps/UnknownMap_25_29/map.bin"
-
-	.align 2
-UnknownMap_25_29_MapAttributes:: @ 82E98A4
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_29_MapBorder
-	.4byte UnknownMap_25_29_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_30_MapBorder:: @ 82E98BC
-	.incbin "data/maps/UnknownMap_25_30/border.bin"
-
-UnknownMap_25_30_MapBlockdata:: @ 82E98C4
-	.incbin "data/maps/UnknownMap_25_30/map.bin"
-
-	.align 2
-UnknownMap_25_30_MapAttributes:: @ 82E98C8
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_30_MapBorder
-	.4byte UnknownMap_25_30_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_31_MapBorder:: @ 82E98E0
-	.incbin "data/maps/UnknownMap_25_31/border.bin"
-
-UnknownMap_25_31_MapBlockdata:: @ 82E98E8
-	.incbin "data/maps/UnknownMap_25_31/map.bin"
-
-	.align 2
-UnknownMap_25_31_MapAttributes:: @ 82E98EC
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_31_MapBorder
-	.4byte UnknownMap_25_31_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_32_MapBorder:: @ 82E9904
-	.incbin "data/maps/UnknownMap_25_32/border.bin"
-
-UnknownMap_25_32_MapBlockdata:: @ 82E990C
-	.incbin "data/maps/UnknownMap_25_32/map.bin"
-
-	.align 2
-UnknownMap_25_32_MapAttributes:: @ 82E9910
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_32_MapBorder
-	.4byte UnknownMap_25_32_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_33_MapBorder:: @ 82E9928
-	.incbin "data/maps/UnknownMap_25_33/border.bin"
-
-UnknownMap_25_33_MapBlockdata:: @ 82E9930
-	.incbin "data/maps/UnknownMap_25_33/map.bin"
-
-	.align 2
-UnknownMap_25_33_MapAttributes:: @ 82E9934
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_33_MapBorder
-	.4byte UnknownMap_25_33_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_34_MapBorder:: @ 82E994C
-	.incbin "data/maps/UnknownMap_25_34/border.bin"
-
-UnknownMap_25_34_MapBlockdata:: @ 82E9954
-	.incbin "data/maps/UnknownMap_25_34/map.bin"
-
-	.align 2
-UnknownMap_25_34_MapAttributes:: @ 82E9958
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_34_MapBorder
-	.4byte UnknownMap_25_34_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LinkContestRoom2_MapBorder:: @ 82E9970
-	.incbin "data/maps/LinkContestRoom2/border.bin"
-
-LinkContestRoom2_MapBlockdata:: @ 82E9978
-	.incbin "data/maps/LinkContestRoom2/map.bin"
-
-	.align 2
-LinkContestRoom2_MapAttributes:: @ 82E9AC4
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom2_MapBorder
-	.4byte LinkContestRoom2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom3_MapBorder:: @ 82E9ADC
-	.incbin "data/maps/LinkContestRoom3/border.bin"
-
-LinkContestRoom3_MapBlockdata:: @ 82E9AE4
-	.incbin "data/maps/LinkContestRoom3/map.bin"
-
-	.align 2
-LinkContestRoom3_MapAttributes:: @ 82E9C30
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom3_MapBorder
-	.4byte LinkContestRoom3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom4_MapBorder:: @ 82E9C48
-	.incbin "data/maps/LinkContestRoom4/border.bin"
-
-LinkContestRoom4_MapBlockdata:: @ 82E9C50
-	.incbin "data/maps/LinkContestRoom4/map.bin"
-
-	.align 2
-LinkContestRoom4_MapAttributes:: @ 82E9D9C
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom4_MapBorder
-	.4byte LinkContestRoom4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom5_MapBorder:: @ 82E9DB4
-	.incbin "data/maps/LinkContestRoom5/border.bin"
-
-LinkContestRoom5_MapBlockdata:: @ 82E9DBC
-	.incbin "data/maps/LinkContestRoom5/map.bin"
-
-	.align 2
-LinkContestRoom5_MapAttributes:: @ 82E9F08
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom5_MapBorder
-	.4byte LinkContestRoom5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom6_MapBorder:: @ 82E9F20
-	.incbin "data/maps/LinkContestRoom6/border.bin"
-
-LinkContestRoom6_MapBlockdata:: @ 82E9F28
-	.incbin "data/maps/LinkContestRoom6/map.bin"
-
-	.align 2
-LinkContestRoom6_MapAttributes:: @ 82EA074
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom6_MapBorder
-	.4byte LinkContestRoom6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-InsideOfTruck_MapBorder:: @ 82EA08C
-	.incbin "data/maps/InsideOfTruck/border.bin"
-
-InsideOfTruck_MapBlockdata:: @ 82EA094
-	.incbin "data/maps/InsideOfTruck/map.bin"
-
-	.align 2
-InsideOfTruck_MapAttributes:: @ 82EA0C8
-	.4byte 0x5
-	.4byte 0x5
-	.4byte InsideOfTruck_MapBorder
-	.4byte InsideOfTruck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideOfTruck
-
-SafariZone_Northwest_MapBorder:: @ 82EA0E0
-	.incbin "data/maps/SafariZone_Northwest/border.bin"
-
-SafariZone_Northwest_MapBlockdata:: @ 82EA0E8
-	.incbin "data/maps/SafariZone_Northwest/map.bin"
-
-	.align 2
-SafariZone_Northwest_MapAttributes:: @ 82EAD68
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northwest_MapBorder
-	.4byte SafariZone_Northwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-SafariZone_Northeast_MapBorder:: @ 82EAD80
-	.incbin "data/maps/SafariZone_Northeast/border.bin"
-
-SafariZone_Northeast_MapBlockdata:: @ 82EAD88
-	.incbin "data/maps/SafariZone_Northeast/map.bin"
-
-	.align 2
-SafariZone_Northeast_MapAttributes:: @ 82EBA08
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northeast_MapBorder
-	.4byte SafariZone_Northeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-SafariZone_Southwest_MapBorder:: @ 82EBA20
-	.incbin "data/maps/SafariZone_Southwest/border.bin"
-
-SafariZone_Southwest_MapBlockdata:: @ 82EBA28
-	.incbin "data/maps/SafariZone_Southwest/map.bin"
-
-	.align 2
-SafariZone_Southwest_MapAttributes:: @ 82EC6A8
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southwest_MapBorder
-	.4byte SafariZone_Southwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-SafariZone_Southeast_MapBorder:: @ 82EC6C0
-	.incbin "data/maps/SafariZone_Southeast/border.bin"
-
-SafariZone_Southeast_MapBlockdata:: @ 82EC6C8
-	.incbin "data/maps/SafariZone_Southeast/map.bin"
-
-	.align 2
-SafariZone_Southeast_MapAttributes:: @ 82ED348
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southeast_MapBorder
-	.4byte SafariZone_Southeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-UnknownMapBorder_082EDF30:
-	.incbin "data/maps/UnknownMap_082EDF30/border.bin"
-
-UnknownMapBlockdata_082EDF30:
-	.incbin "data/maps/UnknownMap_082EDF30/map.bin"
-
-	.align 2
-UnknownMapAttributes_082EDF30:
-	.4byte 0x3A
-	.4byte 0x1A
-	.4byte UnknownMapBorder_082EDF30
-	.4byte UnknownMapBlockdata_082EDF30
-	.4byte gTileset_General
-	.4byte 0
-
-Route109_SeashoreHouse_MapBorder:: @ 82EDF48
-	.incbin "data/maps/Route109_SeashoreHouse/border.bin"
-
-Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50
-	.incbin "data/maps/Route109_SeashoreHouse/map.bin"
-
-	.align 2
-Route109_SeashoreHouse_MapAttributes:: @ 82EE07C
-	.4byte 0xf
-	.4byte 0xa
-	.4byte Route109_SeashoreHouse_MapBorder
-	.4byte Route109_SeashoreHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SeashoreHouse
-
-Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
-	.incbin "data/maps/Route110_TrickHouseEntrance/border.bin"
-
-Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C
-	.incbin "data/maps/Route110_TrickHouseEntrance/map.bin"
-
-	.align 2
-Route110_TrickHouseEntrance_MapAttributes:: @ 82EE15C
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEntrance_MapBorder
-	.4byte Route110_TrickHouseEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_TrickHouseEnd_MapBorder:: @ 82EE174
-	.incbin "data/maps/Route110_TrickHouseEnd/border.bin"
-
-Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C
-	.incbin "data/maps/Route110_TrickHouseEnd/map.bin"
-
-	.align 2
-Route110_TrickHouseEnd_MapAttributes:: @ 82EE23C
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEnd_MapBorder
-	.4byte Route110_TrickHouseEnd_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
-	.incbin "data/maps/Route110_TrickHouseCorridor/border.bin"
-
-Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C
-	.incbin "data/maps/Route110_TrickHouseCorridor/map.bin"
-
-	.align 2
-Route110_TrickHouseCorridor_MapAttributes:: @ 82EE52C
-	.4byte 0xf
-	.4byte 0x18
-	.4byte Route110_TrickHouseCorridor_MapBorder
-	.4byte Route110_TrickHouseCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
-	.incbin "data/maps/Route110_TrickHousePuzzle1/border.bin"
-
-Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C
-	.incbin "data/maps/Route110_TrickHousePuzzle1/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle1_MapAttributes:: @ 82EE7E0
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle1_MapBorder
-	.4byte Route110_TrickHousePuzzle1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
-	.incbin "data/maps/Route110_TrickHousePuzzle2/border.bin"
-
-Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800
-	.incbin "data/maps/Route110_TrickHousePuzzle2/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle2_MapAttributes:: @ 82EEA94
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle2_MapBorder
-	.4byte Route110_TrickHousePuzzle2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
-	.incbin "data/maps/Route110_TrickHousePuzzle3/border.bin"
-
-Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4
-	.incbin "data/maps/Route110_TrickHousePuzzle3/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle3_MapAttributes:: @ 82EED48
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle3_MapBorder
-	.4byte Route110_TrickHousePuzzle3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
-	.incbin "data/maps/Route110_TrickHousePuzzle4/border.bin"
-
-Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68
-	.incbin "data/maps/Route110_TrickHousePuzzle4/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle4_MapAttributes:: @ 82EEFFC
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle4_MapBorder
-	.4byte Route110_TrickHousePuzzle4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
-	.incbin "data/maps/Route110_TrickHousePuzzle5/border.bin"
-
-Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C
-	.incbin "data/maps/Route110_TrickHousePuzzle5/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle5_MapAttributes:: @ 82EF2B0
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle5_MapBorder
-	.4byte Route110_TrickHousePuzzle5_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
-	.incbin "data/maps/Route110_TrickHousePuzzle6/border.bin"
-
-Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0
-	.incbin "data/maps/Route110_TrickHousePuzzle6/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle6_MapAttributes:: @ 82EF564
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle6_MapBorder
-	.4byte Route110_TrickHousePuzzle6_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
-	.incbin "data/maps/Route110_TrickHousePuzzle7/border.bin"
-
-Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584
-	.incbin "data/maps/Route110_TrickHousePuzzle7/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle7_MapAttributes:: @ 82EF818
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle7_MapBorder
-	.4byte Route110_TrickHousePuzzle7_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
-	.incbin "data/maps/Route110_TrickHousePuzzle8/border.bin"
-
-Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838
-	.incbin "data/maps/Route110_TrickHousePuzzle8/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle8_MapAttributes:: @ 82EFACC
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle8_MapBorder
-	.4byte Route110_TrickHousePuzzle8_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
-	.incbin "data/maps/FortreeCity_DecorationShop/border.bin"
-
-FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC
-	.incbin "data/maps/FortreeCity_DecorationShop/map.bin"
-
-	.align 2
-FortreeCity_DecorationShop_MapAttributes:: @ 82EFB4C
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_DecorationShop_MapBorder
-	.4byte FortreeCity_DecorationShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64
-	.incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin"
-
-Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata:: @ 82EFB6C
-	.incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin"
-
-	.align 2
-Route110_SeasideCyclingRoadNorthEntrance_MapAttributes:: @ 82EFC20
-Route110_SeasideCyclingRoadSouthEntrance_MapAttributes:: @ 82EFC20
-	.4byte 0xf
-	.4byte 0x6
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapBorder
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
-	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin"
-
-LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40
-	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_1F_MapAttributes:: @ 82EFD60
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
-	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin"
-
-LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80
-	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_2F_MapAttributes:: @ 82EFEA0
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
-	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin"
-
-LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0
-	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_3F_MapAttributes:: @ 82EFFE0
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
-	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin"
-
-LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000
-	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_4F_MapAttributes:: @ 82F0120
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
-	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin"
-
-LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140
-	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_5F_MapAttributes:: @ 82F0260
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
-	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin"
-
-LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280
-	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreRooftop_MapAttributes:: @ 82F0430
-	.4byte 0x12
-	.4byte 0xc
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-Route130_MapBorder:: @ 82F0448
-	.incbin "data/maps/Route130/border.bin"
-
-Route130_MapBlockdata:: @ 82F0450
-	.incbin "data/maps/Route130/map.bin"
-
-	.align 2
-Route130_MapAttributes:: @ 82F1D50
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route130_MapBorder
-	.4byte Route130_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-BattleTower_Lobby_MapBorder:: @ 82F1D68
-	.incbin "data/maps/BattleTower_Lobby/border.bin"
-
-BattleTower_Lobby_MapBlockdata:: @ 82F1D70
-	.incbin "data/maps/BattleTower_Lobby/map.bin"
-
-	.align 2
-BattleTower_Lobby_MapAttributes:: @ 82F1E6C
-	.4byte 0xe
-	.4byte 0x9
-	.4byte BattleTower_Lobby_MapBorder
-	.4byte BattleTower_Lobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-BattleTower_Outside_MapBorder:: @ 82F1E84
-	.incbin "data/maps/BattleTower_Outside/border.bin"
-
-BattleTower_Outside_MapBlockdata:: @ 82F1E8C
-	.incbin "data/maps/BattleTower_Outside/map.bin"
-
-	.align 2
-BattleTower_Outside_MapAttributes:: @ 82F2558
-	.4byte 0x1d
-	.4byte 0x1e
-	.4byte BattleTower_Outside_MapBorder
-	.4byte BattleTower_Outside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-BattleTower_Elevator_MapBorder:: @ 82F2570
-	.incbin "data/maps/BattleTower_Elevator/border.bin"
-
-BattleTower_Elevator_MapBlockdata:: @ 82F2578
-	.incbin "data/maps/BattleTower_Elevator/map.bin"
-
-	.align 2
-BattleTower_Elevator_MapAttributes:: @ 82F25B0
-	.4byte 0x4
-	.4byte 0x7
-	.4byte BattleTower_Elevator_MapBorder
-	.4byte BattleTower_Elevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-BattleTower_Corridor_MapBorder:: @ 82F25C8
-	.incbin "data/maps/BattleTower_Corridor/border.bin"
-
-BattleTower_Corridor_MapBlockdata:: @ 82F25D0
-	.incbin "data/maps/BattleTower_Corridor/map.bin"
-
-	.align 2
-BattleTower_Corridor_MapAttributes:: @ 82F267C
-	.4byte 0x11
-	.4byte 0x5
-	.4byte BattleTower_Corridor_MapBorder
-	.4byte BattleTower_Corridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-BattleTower_BattleRoom_MapBorder:: @ 82F2694
-	.incbin "data/maps/BattleTower_BattleRoom/border.bin"
-
-BattleTower_BattleRoom_MapBlockdata:: @ 82F269C
-	.incbin "data/maps/BattleTower_BattleRoom/map.bin"
-
-	.align 2
-BattleTower_BattleRoom_MapAttributes:: @ 82F2750
-	.4byte 0xa
-	.4byte 0x9
-	.4byte BattleTower_BattleRoom_MapBorder
-	.4byte BattleTower_BattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
-	.incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin"
-
-RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770
-	.incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_3F_MapAttributes:: @ 82F28C8
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_3F_MapBorder
-	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
-	.incbin "data/maps/EverGrandeCity_PokemonLeague/border.bin"
-
-EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8
-	.incbin "data/maps/EverGrandeCity_PokemonLeague/map.bin"
-
-	.align 2
-EverGrandeCity_PokemonLeague_MapAttributes:: @ 82F2AB0
-	.4byte 0x13
-	.4byte 0xc
-	.4byte EverGrandeCity_PokemonLeague_MapBorder
-	.4byte EverGrandeCity_PokemonLeague_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
-	.incbin "data/maps/Route119_WeatherInstitute_1F/border.bin"
-
-Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0
-	.incbin "data/maps/Route119_WeatherInstitute_1F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_1F_MapAttributes:: @ 82F2CD8
-	.4byte 0x14
-	.4byte 0xd
-	.4byte Route119_WeatherInstitute_1F_MapBorder
-	.4byte Route119_WeatherInstitute_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
-	.incbin "data/maps/Route119_WeatherInstitute_2F/border.bin"
-
-Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8
-	.incbin "data/maps/Route119_WeatherInstitute_2F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_2F_MapAttributes:: @ 82F2EB0
-	.4byte 0x14
-	.4byte 0xb
-	.4byte Route119_WeatherInstitute_2F_MapBorder
-	.4byte Route119_WeatherInstitute_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
-	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin"
-
-LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0
-	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreElevator_MapAttributes:: @ 82F2F00
-	.4byte 0x4
-	.4byte 0x6
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-Underwater1_MapBorder:: @ 82F2F18
-	.incbin "data/maps/Underwater1/border.bin"
-
-Underwater1_MapBlockdata:: @ 82F2F20
-	.incbin "data/maps/Underwater1/map.bin"
-
-	.align 2
-Underwater1_MapAttributes:: @ 82F6120
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater1_MapBorder
-	.4byte Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
-	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin"
-
-MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140
-	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_1F_MapAttributes:: @ 82F6280
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
-	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin"
-
-MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0
-	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_2F_MapAttributes:: @ 82F63E0
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-SSTidalCorridor_MapBorder:: @ 82F63F8
-	.incbin "data/maps/SSTidalCorridor/border.bin"
-
-SSTidalCorridor_MapBlockdata:: @ 82F6400
-	.incbin "data/maps/SSTidalCorridor/map.bin"
-
-	.align 2
-SSTidalCorridor_MapAttributes:: @ 82F65D4
-	.4byte 0x12
-	.4byte 0xd
-	.4byte SSTidalCorridor_MapBorder
-	.4byte SSTidalCorridor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SSTidalLowerDeck_MapBorder:: @ 82F65EC
-	.incbin "data/maps/SSTidalLowerDeck/border.bin"
-
-SSTidalLowerDeck_MapBlockdata:: @ 82F65F4
-	.incbin "data/maps/SSTidalLowerDeck/map.bin"
-
-	.align 2
-SSTidalLowerDeck_MapAttributes:: @ 82F67B0
-	.4byte 0x11
-	.4byte 0xd
-	.4byte SSTidalLowerDeck_MapBorder
-	.4byte SSTidalLowerDeck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SSTidalRooms_MapBorder:: @ 82F67C8
-	.incbin "data/maps/SSTidalRooms/border.bin"
-
-SSTidalRooms_MapBlockdata:: @ 82F67D0
-	.incbin "data/maps/SSTidalRooms/map.bin"
-
-	.align 2
-SSTidalRooms_MapAttributes:: @ 82F6CE0
-	.4byte 0x24
-	.4byte 0x12
-	.4byte SSTidalRooms_MapBorder
-	.4byte SSTidalRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-IslandCave_MapBorder:: @ 82F6CF8
-	.incbin "data/maps/IslandCave/border.bin"
-
-IslandCave_MapBlockdata:: @ 82F6D00
-	.incbin "data/maps/IslandCave/map.bin"
-
-	.align 2
-IslandCave_MapAttributes:: @ 82F7164
-	.4byte 0x11
-	.4byte 0x21
-	.4byte IslandCave_MapBorder
-	.4byte IslandCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-AncientTomb_MapBorder:: @ 82F717C
-	.incbin "data/maps/AncientTomb/border.bin"
-
-AncientTomb_MapBlockdata:: @ 82F7184
-	.incbin "data/maps/AncientTomb/map.bin"
-
-	.align 2
-AncientTomb_MapAttributes:: @ 82F75E8
-	.4byte 0x11
-	.4byte 0x21
-	.4byte AncientTomb_MapBorder
-	.4byte AncientTomb_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-Underwater_Route134_MapBorder:: @ 82F7600
-	.incbin "data/maps/Underwater_Route134/border.bin"
-
-Underwater_Route134_MapBlockdata:: @ 82F7608
-	.incbin "data/maps/Underwater_Route134/map.bin"
-
-	.align 2
-Underwater_Route134_MapAttributes:: @ 82F7770
-	.4byte 0x12
-	.4byte 0xa
-	.4byte Underwater_Route134_MapBorder
-	.4byte Underwater_Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-Underwater_SealedChamber_MapBorder:: @ 82F7788
-	.incbin "data/maps/Underwater_SealedChamber/border.bin"
-
-Underwater_SealedChamber_MapBlockdata:: @ 82F7790
-	.incbin "data/maps/Underwater_SealedChamber/map.bin"
-
-	.align 2
-Underwater_SealedChamber_MapAttributes:: @ 82F7FD0
-	.4byte 0x16
-	.4byte 0x30
-	.4byte Underwater_SealedChamber_MapBorder
-	.4byte Underwater_SealedChamber_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
-	.incbin "data/maps/SealedChamber_OuterRoom/border.bin"
-
-SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0
-	.incbin "data/maps/SealedChamber_OuterRoom/map.bin"
-
-	.align 2
-SealedChamber_OuterRoom_MapAttributes:: @ 82F83B8
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_OuterRoom_MapBorder
-	.4byte SealedChamber_OuterRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-VictoryRoad_B1F_MapBorder:: @ 82F83D0
-	.incbin "data/maps/VictoryRoad_B1F/border.bin"
-
-VictoryRoad_B1F_MapBlockdata:: @ 82F83D8
-	.incbin "data/maps/VictoryRoad_B1F/map.bin"
-
-	.align 2
-VictoryRoad_B1F_MapAttributes:: @ 82F8EFC
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B1F_MapBorder
-	.4byte VictoryRoad_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-VictoryRoad_B2F_MapBorder:: @ 82F8F14
-	.incbin "data/maps/VictoryRoad_B2F/border.bin"
-
-VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C
-	.incbin "data/maps/VictoryRoad_B2F/map.bin"
-
-	.align 2
-VictoryRoad_B2F_MapAttributes:: @ 82F9A40
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B2F_MapBorder
-	.4byte VictoryRoad_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-Route104_Prototype_MapBorder:: @ 82F9A58
-	.incbin "data/maps/Route104_Prototype/border.bin"
-
-Route104_Prototype_MapBlockdata:: @ 82F9A60
-	.incbin "data/maps/Route104_Prototype/map.bin"
-
-	.align 2
-Route104_Prototype_MapAttributes:: @ 82F9A64
-	.4byte 0x1
-	.4byte 0x1
-	.4byte Route104_Prototype_MapBorder
-	.4byte Route104_Prototype_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
-	.incbin "data/maps/GraniteCave_StevensRoom/border.bin"
-
-GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84
-	.incbin "data/maps/GraniteCave_StevensRoom/map.bin"
-
-	.align 2
-GraniteCave_StevensRoom_MapAttributes:: @ 82F9C28
-	.4byte 0xf
-	.4byte 0xe
-	.4byte GraniteCave_StevensRoom_MapBorder
-	.4byte GraniteCave_StevensRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
-	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin"
-
-AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48
-	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorCorridors_MapAttributes:: @ 82F9D68
-	.4byte 0xd
-	.4byte 0xb
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SouthernIsland_Exterior_MapBorder:: @ 82F9D80
-	.incbin "data/maps/SouthernIsland_Exterior/border.bin"
-
-SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88
-	.incbin "data/maps/SouthernIsland_Exterior/map.bin"
-
-	.align 2
-SouthernIsland_Exterior_MapAttributes:: @ 82FA544
-	.4byte 0x21
-	.4byte 0x1e
-	.4byte SouthernIsland_Exterior_MapBorder
-	.4byte SouthernIsland_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-SouthernIsland_Interior_MapBorder:: @ 82FA55C
-	.incbin "data/maps/SouthernIsland_Interior/border.bin"
-
-SouthernIsland_Interior_MapBlockdata:: @ 82FA564
-	.incbin "data/maps/SouthernIsland_Interior/map.bin"
-
-	.align 2
-SouthernIsland_Interior_MapAttributes:: @ 82FAA74
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SouthernIsland_Interior_MapBorder
-	.4byte SouthernIsland_Interior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-JaggedPass_MapBorder:: @ 82FAA8C
-	.incbin "data/maps/JaggedPass/border.bin"
-
-JaggedPass_MapBlockdata:: @ 82FAA94
-	.incbin "data/maps/JaggedPass/map.bin"
-
-	.align 2
-JaggedPass_MapAttributes:: @ 82FB55C
-	.4byte 0x1e
-	.4byte 0x2e
-	.4byte JaggedPass_MapBorder
-	.4byte JaggedPass_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-FieryPath_MapBorder:: @ 82FB574
-	.incbin "data/maps/FieryPath/border.bin"
-
-FieryPath_MapBlockdata:: @ 82FB57C
-	.incbin "data/maps/FieryPath/map.bin"
-
-	.align 2
-FieryPath_MapAttributes:: @ 82FBFE0
-	.4byte 0x23
-	.4byte 0x26
-	.4byte FieryPath_MapBorder
-	.4byte FieryPath_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
-	.incbin "data/maps/RustboroCity_Flat2_1F/border.bin"
-
-RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000
-	.incbin "data/maps/RustboroCity_Flat2_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_1F_MapAttributes:: @ 82FC0FC
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_1F_MapBorder
-	.4byte RustboroCity_Flat2_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
-	.incbin "data/maps/RustboroCity_Flat2_2F/border.bin"
-
-RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C
-	.incbin "data/maps/RustboroCity_Flat2_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_2F_MapAttributes:: @ 82FC218
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_2F_MapBorder
-	.4byte RustboroCity_Flat2_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
-	.incbin "data/maps/RustboroCity_Flat2_3F/border.bin"
-
-RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238
-	.incbin "data/maps/RustboroCity_Flat2_3F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_3F_MapAttributes:: @ 82FC334
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_3F_MapBorder
-	.4byte RustboroCity_Flat2_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House8_MapBorder:: @ 82FC34C
-	.incbin "data/maps/SootopolisCity_House8/border.bin"
-
-SootopolisCity_House8_MapBlockdata:: @ 82FC354
-	.incbin "data/maps/SootopolisCity_House8/map.bin"
-
-	.align 2
-SootopolisCity_House8_MapAttributes:: @ 82FC3C4
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House8_MapBorder
-	.4byte SootopolisCity_House8_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
-	.incbin "data/maps/EverGrandeCity_HallOfFame/border.bin"
-
-EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4
-	.incbin "data/maps/EverGrandeCity_HallOfFame/map.bin"
-
-	.align 2
-EverGrandeCity_HallOfFame_MapAttributes:: @ 82FC5E4
-	.4byte 0xf
-	.4byte 0x11
-	.4byte EverGrandeCity_HallOfFame_MapBorder
-	.4byte EverGrandeCity_HallOfFame_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin"
-
-LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_1F_MapAttributes:: @ 82FC6DC
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin"
-
-LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_2F_MapAttributes:: @ 82FC7D4
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
-	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin"
-
-Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4
-	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin"
-
-	.align 2
-Route124_DivingTreasureHuntersHouse_MapAttributes:: @ 82FC8A8
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
-	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-MtPyre_Exterior_MapBorder:: @ 82FC8C0
-	.incbin "data/maps/MtPyre_Exterior/border.bin"
-
-MtPyre_Exterior_MapBlockdata:: @ 82FC8C8
-	.incbin "data/maps/MtPyre_Exterior/map.bin"
-
-	.align 2
-MtPyre_Exterior_MapAttributes:: @ 82FD7EC
-	.4byte 0x26
-	.4byte 0x33
-	.4byte MtPyre_Exterior_MapBorder
-	.4byte MtPyre_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_Summit_MapBorder:: @ 82FD804
-	.incbin "data/maps/MtPyre_Summit/border.bin"
-
-MtPyre_Summit_MapBlockdata:: @ 82FD80C
-	.incbin "data/maps/MtPyre_Summit/map.bin"
-
-	.align 2
-MtPyre_Summit_MapAttributes:: @ 82FE680
-	.4byte 0x32
-	.4byte 0x25
-	.4byte MtPyre_Summit_MapBorder
-	.4byte MtPyre_Summit_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-SealedChamber_InnerRoom_MapBorder:: @ 82FE698
-	.incbin "data/maps/SealedChamber_InnerRoom/border.bin"
-
-SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0
-	.incbin "data/maps/SealedChamber_InnerRoom/map.bin"
-
-	.align 2
-SealedChamber_InnerRoom_MapAttributes:: @ 82FEA68
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_InnerRoom_MapBorder
-	.4byte SealedChamber_InnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
-	.incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin"
-
-MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88
-	.incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_1F_MapAttributes:: @ 82FEB38
-	.4byte 0xb
-	.4byte 0x8
-	.4byte MossdeepCity_GameCorner_1F_MapBorder
-	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
-	.incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin"
-
-MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58
-	.incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_B1F_MapAttributes:: @ 82FEC30
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MossdeepCity_GameCorner_B1F_MapBorder
-	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House1_MapBorder:: @ 82FEC48
-	.incbin "data/maps/SootopolisCity_House1/border.bin"
-
-SootopolisCity_House1_MapBlockdata:: @ 82FEC50
-	.incbin "data/maps/SootopolisCity_House1/map.bin"
-
-	.align 2
-SootopolisCity_House1_MapAttributes:: @ 82FECC0
-SootopolisCity_House4_MapAttributes:: @ 82FECC0
-SootopolisCity_House7_MapAttributes:: @ 82FECC0
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House1_MapBorder
-	.4byte SootopolisCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House2_MapBorder:: @ 82FECD8
-	.incbin "data/maps/SootopolisCity_House2/border.bin"
-
-SootopolisCity_House2_MapBlockdata:: @ 82FECE0
-	.incbin "data/maps/SootopolisCity_House2/map.bin"
-
-	.align 2
-SootopolisCity_House2_MapAttributes:: @ 82FED50
-SootopolisCity_House5_MapAttributes:: @ 82FED50
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House2_MapBorder
-	.4byte SootopolisCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House3_MapBorder:: @ 82FED68
-	.incbin "data/maps/SootopolisCity_House3/border.bin"
-
-SootopolisCity_House3_MapBlockdata:: @ 82FED70
-	.incbin "data/maps/SootopolisCity_House3/map.bin"
-
-	.align 2
-SootopolisCity_House3_MapAttributes:: @ 82FEDE0
-SootopolisCity_House6_MapAttributes:: @ 82FEDE0
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House3_MapBorder
-	.4byte SootopolisCity_House3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
-	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin"
-
-AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00
-	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorRooms_MapAttributes:: @ 82FF328
-	.4byte 0x2c
-	.4byte 0xf
-	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
-	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-ScorchedSlab_MapBorder:: @ 82FF340
-	.incbin "data/maps/ScorchedSlab/border.bin"
-
-ScorchedSlab_MapBlockdata:: @ 82FF348
-	.incbin "data/maps/ScorchedSlab/map.bin"
-
-	.align 2
-ScorchedSlab_MapAttributes:: @ 82FF5A0
-	.4byte 0xf
-	.4byte 0x14
-	.4byte ScorchedSlab_MapBorder
-	.4byte ScorchedSlab_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082FF894:
-	.incbin "data/maps/UnknownMap_082FF894/border.bin"
-
-UnknownMapBlockdata_082FF894:
-	.incbin "data/maps/UnknownMap_082FF894/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082FF894:
-	.4byte 0x13
-	.4byte 0x13
-	.4byte UnknownMapBorder_082FF894
-	.4byte UnknownMapBlockdata_082FF894
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
-	.incbin "data/maps/RustboroCity_Flat1_1F/border.bin"
-
-RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4
-	.incbin "data/maps/RustboroCity_Flat1_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_1F_MapAttributes:: @ 82FF994
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_1F_MapBorder
-	.4byte RustboroCity_Flat1_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
-	.incbin "data/maps/RustboroCity_Flat1_2F/border.bin"
-
-RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4
-	.incbin "data/maps/RustboroCity_Flat1_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_2F_MapAttributes:: @ 82FFA94
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_2F_MapBorder
-	.4byte RustboroCity_Flat1_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
-	.incbin "data/maps/EverGrandeCity_Corridor4/border.bin"
-
-EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4
-	.incbin "data/maps/EverGrandeCity_Corridor4/map.bin"
-
-	.align 2
-EverGrandeCity_Corridor4_MapAttributes:: @ 82FFDA0
-	.4byte 0xb
-	.4byte 0x22
-	.4byte EverGrandeCity_Corridor4_MapBorder
-	.4byte EverGrandeCity_Corridor4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-MagmaHideout_1F_MapBorder:: @ 82FFDB8
-	.incbin "data/maps/MagmaHideout_1F/border.bin"
-
-MagmaHideout_1F_MapBlockdata:: @ 82FFDC0
-	.incbin "data/maps/MagmaHideout_1F/map.bin"
-
-	.align 2
-MagmaHideout_1F_MapAttributes:: @ 8300450
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte MagmaHideout_1F_MapBorder
-	.4byte MagmaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MagmaHideout_B1F_MapBorder:: @ 8300468
-	.incbin "data/maps/MagmaHideout_B1F/border.bin"
-
-MagmaHideout_B1F_MapBlockdata:: @ 8300470
-	.incbin "data/maps/MagmaHideout_B1F/map.bin"
-
-	.align 2
-MagmaHideout_B1F_MapAttributes:: @ 8301010
-	.4byte 0x3e
-	.4byte 0x18
-	.4byte MagmaHideout_B1F_MapBorder
-	.4byte MagmaHideout_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MagmaHideout_B2F_MapBorder:: @ 8301028
-	.incbin "data/maps/MagmaHideout_B2F/border.bin"
-
-MagmaHideout_B2F_MapBlockdata:: @ 8301030
-	.incbin "data/maps/MagmaHideout_B2F/map.bin"
-
-	.align 2
-MagmaHideout_B2F_MapAttributes:: @ 8301690
-	.4byte 0x22
-	.4byte 0x18
-	.4byte MagmaHideout_B2F_MapBorder
-	.4byte MagmaHideout_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-UnknownMapBorder_08302970:
-	.incbin "data/maps/UnknownMap_08302970/border.bin"
-
-UnknownMapBlockdata_08302970:
-	.incbin "data/maps/UnknownMap_08302970/map.bin"
-	
-	.align 2
-UnknownMapAttributes_08302970:
-	.4byte 0x3C
-	.4byte 0x28
-	.4byte UnknownMapBorder_08302970
-	.4byte UnknownMapBlockdata_08302970
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_Entrance_MapBorder:: @ 8302988
-	.incbin "data/maps/SkyPillar_Entrance/border.bin"
-
-SkyPillar_Entrance_MapBlockdata:: @ 8302990
-	.incbin "data/maps/SkyPillar_Entrance/map.bin"
-
-	.align 2
-SkyPillar_Entrance_MapAttributes:: @ 8302C18
-	.4byte 0x12
-	.4byte 0x12
-	.4byte SkyPillar_Entrance_MapBorder
-	.4byte SkyPillar_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SkyPillar_Outside_MapBorder:: @ 8302C30
-	.incbin "data/maps/SkyPillar_Outside/border.bin"
-
-SkyPillar_Outside_MapBlockdata:: @ 8302C38
-	.incbin "data/maps/SkyPillar_Outside/map.bin"
-
-	.align 2
-SkyPillar_Outside_MapAttributes:: @ 8303140
-	.4byte 0x1c
-	.4byte 0x17
-	.4byte SkyPillar_Outside_MapBorder
-	.4byte SkyPillar_Outside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_1F_MapBorder:: @ 8303158
-	.incbin "data/maps/SkyPillar_1F/border.bin"
-
-SkyPillar_1F_MapBlockdata:: @ 8303160
-	.incbin "data/maps/SkyPillar_1F/map.bin"
-
-	.align 2
-SkyPillar_1F_MapAttributes:: @ 83032E8
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_1F_MapBorder
-	.4byte SkyPillar_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_2F_MapBorder:: @ 8303300
-	.incbin "data/maps/SkyPillar_2F/border.bin"
-
-SkyPillar_2F_MapBlockdata:: @ 8303308
-	.incbin "data/maps/SkyPillar_2F/map.bin"
-
-	.align 2
-SkyPillar_2F_MapAttributes:: @ 8303490
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_2F_MapBorder
-	.4byte SkyPillar_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_3F_MapBorder:: @ 83034A8
-	.incbin "data/maps/SkyPillar_3F/border.bin"
-
-SkyPillar_3F_MapBlockdata:: @ 83034B0
-	.incbin "data/maps/SkyPillar_3F/map.bin"
-
-	.align 2
-SkyPillar_3F_MapAttributes:: @ 8303638
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_3F_MapBorder
-	.4byte SkyPillar_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_4F_MapBorder:: @ 8303650
-	.incbin "data/maps/SkyPillar_4F/border.bin"
-
-SkyPillar_4F_MapBlockdata:: @ 8303658
-	.incbin "data/maps/SkyPillar_4F/map.bin"
-
-	.align 2
-SkyPillar_4F_MapAttributes:: @ 83037E0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_4F_MapBorder
-	.4byte SkyPillar_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-UnknownMapBorder_083041B4:
-	.incbin "data/maps/UnknownMap_083041B4/border.bin"
-	
-UnknownMapBlockdata_083041B4:
-	.incbin "data/maps/UnknownMap_083041B4/map.bin"
-	
-	.align 2
-UnknownMapAttributes_083041B4:
-	.4byte 0x1B
-	.4byte 0x2E
-	.4byte UnknownMapBorder_083041B4
-	.4byte UnknownMapBlockdata_083041B4
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
-	.incbin "data/maps/MossdeepCity_StevensHouse/border.bin"
-
-MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4
-	.incbin "data/maps/MossdeepCity_StevensHouse/map.bin"
-
-	.align 2
-MossdeepCity_StevensHouse_MapAttributes:: @ 8304284
-	.4byte 0xb
-	.4byte 0x8
-	.4byte MossdeepCity_StevensHouse_MapBorder
-	.4byte MossdeepCity_StevensHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
-	.incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin"
-
-ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4
-	.incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideIceRoom_MapAttributes:: @ 8304754
-	.4byte 0x14
-	.4byte 0x1e
-	.4byte ShoalCave_LowTideIceRoom_MapBorder
-	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SafariZone_RestHouse_MapBorder:: @ 830476C
-	.incbin "data/maps/SafariZone_RestHouse/border.bin"
-
-SafariZone_RestHouse_MapBlockdata:: @ 8304774
-	.incbin "data/maps/SafariZone_RestHouse/map.bin"
-
-	.align 2
-SafariZone_RestHouse_MapAttributes:: @ 8304828
-	.4byte 0xa
-	.4byte 0x9
-	.4byte SafariZone_RestHouse_MapBorder
-	.4byte SafariZone_RestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SkyPillar_5F_MapBorder:: @ 8304840
-	.incbin "data/maps/SkyPillar_5F/border.bin"
-
-SkyPillar_5F_MapBlockdata:: @ 8304848
-	.incbin "data/maps/SkyPillar_5F/map.bin"
-
-	.align 2
-SkyPillar_5F_MapAttributes:: @ 83049D0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_5F_MapBorder
-	.4byte SkyPillar_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_Top_MapBorder:: @ 83049E8
-	.incbin "data/maps/SkyPillar_Top/border.bin"
-
-SkyPillar_Top_MapBlockdata:: @ 83049F0
-	.incbin "data/maps/SkyPillar_Top/map.bin"
-
-	.align 2
-SkyPillar_Top_MapAttributes:: @ 8304F00
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SkyPillar_Top_MapBorder
-	.4byte SkyPillar_Top_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc
deleted file mode 100644
index 41b0df228..000000000
--- a/data/maps/attributes_table.inc
+++ /dev/null
@@ -1,334 +0,0 @@
-	.align 2
-gMapAttributes:: @ 8304F18
-	.4byte PetalburgCity_MapAttributes
-	.4byte SlateportCity_MapAttributes
-	.4byte MauvilleCity_MapAttributes
-	.4byte RustboroCity_MapAttributes
-	.4byte FortreeCity_MapAttributes
-	.4byte LilycoveCity_MapAttributes
-	.4byte MossdeepCity_MapAttributes
-	.4byte SootopolisCity_MapAttributes
-	.4byte EverGrandeCity_MapAttributes
-	.4byte LittlerootTown_MapAttributes
-	.4byte OldaleTown_MapAttributes
-	.4byte DewfordTown_MapAttributes
-	.4byte LavaridgeTown_MapAttributes
-	.4byte FallarborTown_MapAttributes
-	.4byte VerdanturfTown_MapAttributes
-	.4byte PacifidlogTown_MapAttributes
-	.4byte Route101_MapAttributes
-	.4byte Route102_MapAttributes
-	.4byte Route103_MapAttributes
-	.4byte Route104_MapAttributes
-	.4byte Route105_MapAttributes
-	.4byte Route106_MapAttributes
-	.4byte Route107_MapAttributes
-	.4byte Route108_MapAttributes
-	.4byte Route109_MapAttributes
-	.4byte Route110_MapAttributes
-	.4byte Route111_MapAttributes
-	.4byte Route112_MapAttributes
-	.4byte Route113_MapAttributes
-	.4byte Route114_MapAttributes
-	.4byte Route115_MapAttributes
-	.4byte Route116_MapAttributes
-	.4byte Route117_MapAttributes
-	.4byte Route118_MapAttributes
-	.4byte Route119_MapAttributes
-	.4byte Route120_MapAttributes
-	.4byte Route121_MapAttributes
-	.4byte Route122_MapAttributes
-	.4byte Route123_MapAttributes
-	.4byte Route124_MapAttributes
-	.4byte Route125_MapAttributes
-	.4byte Route126_MapAttributes
-	.4byte Route127_MapAttributes
-	.4byte Route128_MapAttributes
-	.4byte Route129_MapAttributes
-	.4byte UnreferencedMap_MapAttributes
-	.4byte Route131_MapAttributes
-	.4byte Route132_MapAttributes
-	.4byte Route133_MapAttributes
-	.4byte Route134_MapAttributes
-	.4byte Underwater2_MapAttributes
-	.4byte Underwater3_MapAttributes
-	.4byte Underwater4_MapAttributes
-	.4byte LittlerootTown_BrendansHouse_1F_MapAttributes
-	.4byte LittlerootTown_BrendansHouse_2F_MapAttributes
-	.4byte LittlerootTown_MaysHouse_1F_MapAttributes
-	.4byte LittlerootTown_MaysHouse_2F_MapAttributes
-	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
-	.4byte House1_MapAttributes
-	.4byte House2_MapAttributes
-	.4byte PokemonCenter_1F_MapAttributes
-	.4byte PokemonCenter_2F_MapAttributes
-	.4byte PokeMart_MapAttributes
-	.4byte DewfordTown_House1_MapAttributes
-	.4byte DewfordTown_Gym_MapAttributes
-	.4byte DewfordTown_Hall_MapAttributes
-	.4byte DewfordTown_House2_MapAttributes
-	.4byte LavaridgeTown_HerbShop_MapAttributes
-	.4byte LavaridgeTown_Gym_1F_MapAttributes
-	.4byte LavaridgeTown_Gym_B1F_MapAttributes
-	.4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
-	.4byte FallarborTown_ContestLobby_MapAttributes
-	.4byte FallarborTown_ContestHall_MapAttributes
-	.4byte LilycoveCity_House2_MapAttributes
-	.4byte UnknownMapAttributes_082CF564
-	.4byte VerdanturfTown_WandasHouse_MapAttributes
-	.4byte PacifidlogTown_House1_MapAttributes
-	.4byte PacifidlogTown_House2_MapAttributes
-	.4byte PetalburgCity_Gym_MapAttributes
-	.4byte MossdeepCity_House4_MapAttributes
-	.4byte SlateportCity_SternsShipyard_1F_MapAttributes
-	.4byte SlateportCity_SternsShipyard_2F_MapAttributes
-	.4byte UnknownMapAttributes_082D05D8
-	.4byte UnknownMapAttributes_082D05FC
-	.4byte SlateportCity_PokemonFanClub_MapAttributes
-	.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
-	.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
-	.4byte LilycoveCity_Harbor_MapAttributes
-	.4byte MauvilleCity_Gym_MapAttributes
-	.4byte MauvilleCity_BikeShop_MapAttributes
-	.4byte MauvilleCity_GameCorner_MapAttributes
-	.4byte RustboroCity_DevonCorp_1F_MapAttributes
-	.4byte RustboroCity_DevonCorp_2F_MapAttributes
-	.4byte RustboroCity_Gym_MapAttributes
-	.4byte RustboroCity_PokemonSchool_MapAttributes
-	.4byte RustboroCity_House2_MapAttributes
-	.4byte RustboroCity_House1_MapAttributes
-	.4byte RustboroCity_CuttersHouse_MapAttributes
-	.4byte FortreeCity_House1_MapAttributes
-	.4byte FortreeCity_Gym_MapAttributes
-	.4byte FortreeCity_House2_MapAttributes
-	.4byte Route104_MrBrineysHouse_MapAttributes
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
-	.4byte LilycoveCity_ContestLobby_MapAttributes
-	.4byte LilycoveCity_ContestHall_MapAttributes
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
-	.4byte LilycoveCity_EmptyMap_MapAttributes
-	.4byte MossdeepCity_Gym_MapAttributes
-	.4byte SootopolisCity_Gym_1F_MapAttributes
-	.4byte SootopolisCity_Gym_B1F_MapAttributes
-	.4byte EverGrandeCity_SidneysRoom_MapAttributes
-	.4byte EverGrandeCity_PhoebesRoom_MapAttributes
-	.4byte EverGrandeCity_GlaciasRoom_MapAttributes
-	.4byte EverGrandeCity_DrakesRoom_MapAttributes
-	.4byte EverGrandeCity_ChampionsRoom_MapAttributes
-	.4byte EverGrandeCity_Corridor1_MapAttributes
-	.4byte Route104_PrettyPetalFlowerShop_MapAttributes
-	.4byte Route112_CableCarStation_MapAttributes
-	.4byte Route114_FossilManiacsHouse_MapAttributes
-	.4byte Route114_FossilManiacsTunnel_MapAttributes
-	.4byte Route114_LanettesHouse_MapAttributes
-	.4byte Route116_TunnelersRestHouse_MapAttributes
-	.4byte Route117_PokemonDayCare_MapAttributes
-	.4byte Route121_SafariZoneEntrance_MapAttributes
-	.4byte MeteorFalls_1F_1R_MapAttributes
-	.4byte MeteorFalls_1F_2R_MapAttributes
-	.4byte MeteorFalls_B1F_1R_MapAttributes
-	.4byte MeteorFalls_B1F_2R_MapAttributes
-	.4byte RusturfTunnel_MapAttributes
-	.4byte Underwater_SootopolisCity_MapAttributes
-	.4byte DesertRuins_MapAttributes
-	.4byte GraniteCave_1F_MapAttributes
-	.4byte GraniteCave_B1F_MapAttributes
-	.4byte GraniteCave_B2F_MapAttributes
-	.4byte PetalburgWoods_MapAttributes
-	.4byte MtChimney_MapAttributes
-	.4byte MtPyre_1F_MapAttributes
-	.4byte MtPyre_2F_MapAttributes
-	.4byte MtPyre_3F_MapAttributes
-	.4byte MtPyre_4F_MapAttributes
-	.4byte MtPyre_5F_MapAttributes
-	.4byte MtPyre_6F_MapAttributes
-	.4byte AquaHideout_1F_MapAttributes
-	.4byte AquaHideout_B1F_MapAttributes
-	.4byte AquaHideout_B2F_MapAttributes
-	.4byte Underwater_SeafloorCavern_MapAttributes
-	.4byte SeafloorCavern_Entrance_MapAttributes
-	.4byte SeafloorCavern_Room1_MapAttributes
-	.4byte SeafloorCavern_Room2_MapAttributes
-	.4byte SeafloorCavern_Room3_MapAttributes
-	.4byte SeafloorCavern_Room4_MapAttributes
-	.4byte SeafloorCavern_Room5_MapAttributes
-	.4byte SeafloorCavern_Room6_MapAttributes
-	.4byte SeafloorCavern_Room7_MapAttributes
-	.4byte SeafloorCavern_Room8_MapAttributes
-	.4byte SeafloorCavern_Room9_MapAttributes
-	.4byte CaveOfOrigin_Entrance_MapAttributes
-	.4byte CaveOfOrigin_1F_MapAttributes
-	.4byte CaveOfOrigin_B1F_MapAttributes
-	.4byte CaveOfOrigin_B2F_MapAttributes
-	.4byte CaveOfOrigin_B3F_MapAttributes
-	.4byte CaveOfOrigin_B4F_MapAttributes
-	.4byte VictoryRoad_1F_MapAttributes
-	.4byte ShoalCave_LowTideEntranceRoom_MapAttributes
-	.4byte ShoalCave_LowTideInnerRoom_MapAttributes
-	.4byte ShoalCave_LowTideStairsRoom_MapAttributes
-	.4byte ShoalCave_LowTideLowerRoom_MapAttributes
-	.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
-	.4byte ShoalCave_HighTideInnerRoom_MapAttributes
-	.4byte UnknownMapAttributes_082E55C8 @ unused maps
-	.4byte UnknownMapAttributes_082E55EC
-	.4byte UnknownMapAttributes_082E5610
-	.4byte UnknownMapAttributes_082E5634
-	.4byte UnknownMapAttributes_082E5658
-	.4byte UnknownMapAttributes_082E567C
-	.4byte UnknownMapAttributes_082E56A0
-	.4byte UnknownMapAttributes_082E56C4
-	.4byte UnknownMapAttributes_082E56E8
-	.4byte UnknownMapAttributes_082E570C
-	.4byte UnknownMapAttributes_082E5730
-	.4byte UnknownMapAttributes_082E5754
-	.4byte UnknownMapAttributes_082E5778
-	.4byte UnknownMapAttributes_082E579C
-	.4byte NewMauville_Entrance_MapAttributes
-	.4byte NewMauville_Inside_MapAttributes
-	.4byte AbandonedShip_Deck_MapAttributes
-	.4byte AbandonedShip_Corridors_1F_MapAttributes
-	.4byte AbandonedShip_Rooms_1F_MapAttributes
-	.4byte AbandonedShip_Corridors_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms2_B1F_MapAttributes
-	.4byte AbandonedShip_Underwater1_MapAttributes
-	.4byte AbandonedShip_Room_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms2_1F_MapAttributes
-	.4byte AbandonedShip_CaptainsOffice_MapAttributes
-	.4byte AbandonedShip_Underwater2_MapAttributes
-	.4byte SecretBase_RedCave1_MapAttributes
-	.4byte SecretBase_BrownCave1_MapAttributes
-	.4byte SecretBase_BlueCave1_MapAttributes
-	.4byte SecretBase_YellowCave1_MapAttributes
-	.4byte SecretBase_Tree1_MapAttributes
-	.4byte SecretBase_Shrub1_MapAttributes
-	.4byte SecretBase_RedCave2_MapAttributes
-	.4byte SecretBase_BrownCave2_MapAttributes
-	.4byte SecretBase_BlueCave2_MapAttributes
-	.4byte SecretBase_YellowCave2_MapAttributes
-	.4byte SecretBase_Tree2_MapAttributes
-	.4byte SecretBase_Shrub2_MapAttributes
-	.4byte SecretBase_RedCave3_MapAttributes
-	.4byte SecretBase_BrownCave3_MapAttributes
-	.4byte SecretBase_BlueCave3_MapAttributes
-	.4byte SecretBase_YellowCave3_MapAttributes
-	.4byte SecretBase_Tree3_MapAttributes
-	.4byte SecretBase_Shrub3_MapAttributes
-	.4byte SecretBase_RedCave4_MapAttributes
-	.4byte SecretBase_BrownCave4_MapAttributes
-	.4byte SecretBase_BlueCave4_MapAttributes
-	.4byte SecretBase_YellowCave4_MapAttributes
-	.4byte SecretBase_Tree4_MapAttributes
-	.4byte SecretBase_Shrub4_MapAttributes
-	.4byte SingleBattleColosseum_MapAttributes
-	.4byte TradeCenter_MapAttributes
-	.4byte RecordCorner_MapAttributes
-	.4byte DoubleBattleColosseum_MapAttributes
-	.4byte LinkContestRoom1_MapAttributes
-	.4byte UnknownMap_25_29_MapAttributes
-	.4byte UnknownMap_25_30_MapAttributes
-	.4byte UnknownMap_25_31_MapAttributes
-	.4byte UnknownMap_25_32_MapAttributes
-	.4byte UnknownMap_25_33_MapAttributes
-	.4byte UnknownMap_25_34_MapAttributes
-	.4byte LinkContestRoom2_MapAttributes
-	.4byte LinkContestRoom3_MapAttributes
-	.4byte LinkContestRoom4_MapAttributes
-	.4byte LinkContestRoom5_MapAttributes
-	.4byte LinkContestRoom6_MapAttributes
-	.4byte InsideOfTruck_MapAttributes
-	.4byte SafariZone_Northwest_MapAttributes
-	.4byte SafariZone_Northeast_MapAttributes
-	.4byte SafariZone_Southwest_MapAttributes
-	.4byte SafariZone_Southeast_MapAttributes
-	.4byte UnknownMapAttributes_082EDF30
-	.4byte Route109_SeashoreHouse_MapAttributes
-	.4byte Route110_TrickHouseEntrance_MapAttributes
-	.4byte Route110_TrickHouseEnd_MapAttributes
-	.4byte Route110_TrickHouseCorridor_MapAttributes
-	.4byte Route110_TrickHousePuzzle1_MapAttributes
-	.4byte Route110_TrickHousePuzzle2_MapAttributes
-	.4byte Route110_TrickHousePuzzle3_MapAttributes
-	.4byte Route110_TrickHousePuzzle4_MapAttributes
-	.4byte Route110_TrickHousePuzzle5_MapAttributes
-	.4byte Route110_TrickHousePuzzle6_MapAttributes
-	.4byte Route110_TrickHousePuzzle7_MapAttributes
-	.4byte Route110_TrickHousePuzzle8_MapAttributes
-	.4byte FortreeCity_DecorationShop_MapAttributes
-	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_1F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_2F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_3F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_4F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_5F_MapAttributes
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
-	.4byte Route130_MapAttributes
-	.4byte BattleTower_Lobby_MapAttributes
-	.4byte BattleTower_Outside_MapAttributes
-	.4byte BattleTower_Elevator_MapAttributes
-	.4byte BattleTower_Corridor_MapAttributes
-	.4byte BattleTower_BattleRoom_MapAttributes
-	.4byte RustboroCity_DevonCorp_3F_MapAttributes
-	.4byte EverGrandeCity_PokemonLeague_MapAttributes
-	.4byte Route119_WeatherInstitute_1F_MapAttributes
-	.4byte Route119_WeatherInstitute_2F_MapAttributes
-	.4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
-	.4byte Underwater1_MapAttributes
-	.4byte MossdeepCity_SpaceCenter_1F_MapAttributes
-	.4byte MossdeepCity_SpaceCenter_2F_MapAttributes
-	.4byte SSTidalCorridor_MapAttributes
-	.4byte SSTidalLowerDeck_MapAttributes
-	.4byte SSTidalRooms_MapAttributes
-	.4byte IslandCave_MapAttributes
-	.4byte AncientTomb_MapAttributes
-	.4byte Underwater_Route134_MapAttributes
-	.4byte Underwater_SealedChamber_MapAttributes
-	.4byte SealedChamber_OuterRoom_MapAttributes
-	.4byte VictoryRoad_B1F_MapAttributes
-	.4byte VictoryRoad_B2F_MapAttributes
-	.4byte Route104_Prototype_MapAttributes
-	.4byte GraniteCave_StevensRoom_MapAttributes
-	.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
-	.4byte SouthernIsland_Exterior_MapAttributes
-	.4byte SouthernIsland_Interior_MapAttributes
-	.4byte JaggedPass_MapAttributes
-	.4byte FieryPath_MapAttributes
-	.4byte RustboroCity_Flat2_1F_MapAttributes
-	.4byte RustboroCity_Flat2_2F_MapAttributes
-	.4byte RustboroCity_Flat2_3F_MapAttributes
-	.4byte SootopolisCity_House8_MapAttributes
-	.4byte EverGrandeCity_HallOfFame_MapAttributes
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
-	.4byte Route124_DivingTreasureHuntersHouse_MapAttributes
-	.4byte MtPyre_Exterior_MapAttributes
-	.4byte MtPyre_Summit_MapAttributes
-	.4byte SealedChamber_InnerRoom_MapAttributes
-	.4byte MossdeepCity_GameCorner_1F_MapAttributes
-	.4byte MossdeepCity_GameCorner_B1F_MapAttributes
-	.4byte SootopolisCity_House1_MapAttributes
-	.4byte SootopolisCity_House2_MapAttributes
-	.4byte SootopolisCity_House3_MapAttributes
-	.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
-	.4byte ScorchedSlab_MapAttributes
-	.4byte UnknownMapAttributes_082FF894
-	.4byte RustboroCity_Flat1_1F_MapAttributes
-	.4byte RustboroCity_Flat1_2F_MapAttributes
-	.4byte EverGrandeCity_Corridor4_MapAttributes
-	.4byte MagmaHideout_1F_MapAttributes
-	.4byte MagmaHideout_B1F_MapAttributes
-	.4byte MagmaHideout_B2F_MapAttributes
-	.4byte UnknownMapAttributes_08302970
-	.4byte SkyPillar_Entrance_MapAttributes
-	.4byte SkyPillar_Outside_MapAttributes
-	.4byte SkyPillar_1F_MapAttributes
-	.4byte SkyPillar_2F_MapAttributes
-	.4byte SkyPillar_3F_MapAttributes
-	.4byte SkyPillar_4F_MapAttributes
-	.4byte UnknownMapAttributes_083041B4
-	.4byte MossdeepCity_StevensHouse_MapAttributes
-	.4byte ShoalCave_LowTideIceRoom_MapAttributes
-	.4byte SafariZone_RestHouse_MapAttributes
-	.4byte SkyPillar_5F_MapAttributes
-	.4byte SkyPillar_Top_MapAttributes
diff --git a/data/maps/_groups.inc b/data/maps/groups.inc
index 478f03e86..478f03e86 100644
--- a/data/maps/_groups.inc
+++ b/data/maps/groups.inc
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 286a2786f..c78c4ab9e 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -113,7 +113,7 @@ Route102_EventScript_1A161D:: @ 81A161D
 	goto_if_eq Route102_EventScript_1A1642
 	special EventObjectInteractionRemoveBerryTree
 	message Route102_Text_1A17FD
-	playfanfare BGM_ME_KINOMI
+	playfanfare MUS_ME_KINOMI
 	waitmessage
 	waitfanfare
 	waitbuttonpress
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index ec603257d..c5b4cf660 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -803,7 +803,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A
 	setvar VAR_TEMP_9, 1
 	showcontestresults
 	setvar VAR_TEMP_9, 0
-	playbgm BGM_CON_FAN, FALSE
+	playbgm MUS_CON_FAN, FALSE
 	return
 
 LinkContestRoom1_EventScript_1A5984:: @ 81A5984
@@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	setflag FLAG_SYS_RIBBON_GET
 	lockall
 	msgbox LinkContestRoom1_Text_1A6D6A, 4
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	msgbox LinkContestRoom1_Text_1A6D96, 4
 	waitfanfare
 	special sub_80C4858
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 8d226887e..56ed0d9ab 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298
 
 Route117_EventScript_1B22B2:: @ 81B22B2
 	message Route117_Text_1B27A2
-	playfanfare BGM_FANFA1
+	playfanfare MUS_FANFA1
 	waitfanfare
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
deleted file mode 100644
index f540777ee..000000000
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ /dev/null
@@ -1,165 +0,0 @@
-BattleTower_BattleRoom_MapScripts:: @ 81608DB
-	map_script 2, BattleTower_BattleRoom_MapScript2_1608E1
-	.byte 0
-
-BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1
-	map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB
-	.2byte 0
-
-BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB
-	setvar VAR_TEMP_0, 1
-	applymovement 255, BattleTower_BattleRoom_Movement_160AB7
-	waitmovement 0
-
-BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
-	special sub_81347F8
-	addobject 1
-	applymovement 1, BattleTower_BattleRoom_Movement_160AC0
-	waitmovement 0
-	special PrintBattleTowerTrainerGreeting
-	msgbox gStringVar4, 4
-	waitmessage
-	closemessage
-	special ScrSpecial_HealPlayerParty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 0
-	special StartSpecialBattle
-	waitstate
-	switch RESULT
-	case 1, BattleTower_BattleRoom_EventScript_160961
-	special LoadPlayerParty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 5
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 14
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 3
-	special sub_810FF60
-	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
-	waitstate
-
-BattleTower_BattleRoom_EventScript_160961:: @ 8160961
-	setvar VAR_SPECIAL_4, 6
-	special SetBattleTowerProperty
-	switch RESULT
-	case 8, BattleTower_BattleRoom_EventScript_160A56
-	applymovement 1, BattleTower_BattleRoom_Movement_160AC6
-	waitmovement 0
-	removeobject 1
-	applymovement 2, BattleTower_BattleRoom_Movement_160ACB
-	waitmovement 0
-	applymovement 255, BattleTower_BattleRoom_Movement_160ABC
-	waitmovement 0
-	msgbox BattleTower_BattleRoom_Text_19ACDC, 4
-	special LoadPlayerParty
-	special SavePlayerParty
-	special SetBattleTowerParty
-	playfanfare BGM_ME_ASA
-	waitfanfare
-	special ScrSpecial_HealPlayerParty
-
-BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
-	msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_BattleRoom_EventScript_1609E0
-	case YES, BattleTower_BattleRoom_EventScript_160A3C
-	case 127, BattleTower_BattleRoom_EventScript_1609E0
-
-BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0
-	msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_BattleRoom_EventScript_160A0E
-	case YES, BattleTower_BattleRoom_EventScript_160A94
-	case 127, BattleTower_BattleRoom_EventScript_160A0E
-
-BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E
-	msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_BattleRoom_EventScript_1609B2
-	case YES, BattleTower_BattleRoom_EventScript_160AB1
-	case 127, BattleTower_BattleRoom_EventScript_1609B2
-
-BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C
-	closemessage
-	applymovement 255, BattleTower_BattleRoom_Movement_160ABE
-	waitmovement 0
-	applymovement 2, BattleTower_BattleRoom_Movement_160AD0
-	waitmovement 0
-	goto BattleTower_BattleRoom_EventScript_1608FA
-
-BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56
-	special LoadPlayerParty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 4
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 1
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 7
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 14
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 3
-	special sub_810FF60
-	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
-	waitstate
-
-BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
-	setvar VAR_SPECIAL_4, 2
-	special SaveBattleTowerProgress
-	message BattleTower_BattleRoom_Text_1C6CE1
-	delay 60
-	waitmessage
-	playse SE_SAVE
-	waitse
-	msgbox BattleTower_BattleRoom_Text_1C6D05, 4
-
-BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
-	fadescreen 1
-	special BattleTower_SoftReset
-	end
-
-BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
-	walk_up
-	walk_up
-	walk_up
-	face_right
-	end_movement
-
-BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC
-	face_down
-	end_movement
-
-BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE
-	face_right
-	end_movement
-
-BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	face_left
-	end_movement
-
-BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	end_movement
-
-BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	face_right
-	end_movement
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
deleted file mode 100644
index 24637ee75..000000000
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ /dev/null
@@ -1,424 +0,0 @@
-BattleTower_Lobby_MapScripts:: @ 816027E
-	map_script 5, BattleTower_Lobby_MapScript1_160293
-	map_script 3, BattleTower_Lobby_MapScript1_1602E8
-	map_script 2, BattleTower_Lobby_MapScript2_160302
-	map_script 4, BattleTower_Lobby_MapScript2_1602EE
-	.byte 0
-
-BattleTower_Lobby_MapScript1_160293:: @ 8160293
-	special TryEnableBravoTrainerBattleTower
-	call BattleTower_Lobby_EventScript_16029C
-	end
-
-BattleTower_Lobby_EventScript_16029C:: @ 816029C
-	setvar VAR_SPECIAL_4, 10
-	special SetBattleTowerProperty
-	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4
-	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD
-	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
-	compare VAR_SPECIAL_7, 50
-	goto_if_lt BattleTower_Lobby_EventScript_1602E4
-	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	special TryInitBattleTowerAwardManEventObject
-	return
-
-BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
-	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
-	compare VAR_SPECIAL_7, 100
-	goto_if_lt BattleTower_Lobby_EventScript_1602E4
-	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	special TryInitBattleTowerAwardManEventObject
-	return
-
-BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
-	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	return
-
-BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8
-	call BattleTower_Lobby_EventScript_1AE2ED
-	end
-
-BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE
-	map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8
-	.2byte 0
-
-BattleTower_Lobby_EventScript_1602F8:: @ 81602F8
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleTower_Lobby_MapScript2_160302:: @ 8160302
-	map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C
-	map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330
-	map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342
-	map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419
-	map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B
-	.2byte 0
-
-BattleTower_Lobby_EventScript_16032C:: @ 816032C
-	special sub_8134548
-	end
-
-BattleTower_Lobby_EventScript_160330:: @ 8160330
-	lock
-	faceplayer
-	msgbox BattleTower_Lobby_Text_19A3FD, 4
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_160342:: @ 8160342
-	lock
-	faceplayer
-	message BattleTower_Lobby_Text_19A487
-	waitmessage
-	setvar VAR_SPECIAL_4, 0
-	special BattleTowerUtil
-	compare RESULT, 6
-	goto_if_eq BattleTower_Lobby_EventScript_16037D
-	special AwardBattleTowerRibbons
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_16037D
-	message BattleTower_Lobby_Text_19A6BE
-	waitmessage
-	playfanfare BGM_FANFA4
-	waitfanfare
-	msgbox BattleTower_Lobby_Text_19A719, 4
-
-BattleTower_Lobby_EventScript_16037D:: @ 816037D
-	setvar VAR_SPECIAL_4, 8
-	special BattleTowerUtil
-	compare RESULT, 1
-	goto_if_eq BattleTower_Lobby_EventScript_1603AD
-	message BattleTower_Lobby_Text_19A589
-	waitmessage
-	setvar VAR_SPECIAL_4, 13
-	special SetBattleTowerProperty
-	special DetermineBattleTowerPrize
-	setvar VAR_SPECIAL_4, 3
-	special SaveBattleTowerProgress
-	playse SE_SAVE
-	waitse
-
-BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 3
-	special SetBattleTowerProperty
-	message BattleTower_Lobby_Text_19A4BB
-	waitmessage
-	special GiveBattleTowerPrize
-	switch RESULT
-	case 0, BattleTower_Lobby_EventScript_160408
-	message BattleTower_Lobby_Text_19A506
-	waitmessage
-	playfanfare BGM_FANFA4
-	waitfanfare
-	setvar VAR_SPECIAL_4, 9
-	special BattleTowerUtil
-	compare RESULT, 49
-	goto_if_ne BattleTower_Lobby_EventScript_1603F8
-	msgbox BattleTower_Lobby_Text_19A617, 4
-
-BattleTower_Lobby_EventScript_1603F8:: @ 81603F8
-	msgbox BattleTower_Lobby_Text_199FA9, 4
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_160408:: @ 8160408
-	msgbox BattleTower_Lobby_Text_19A520, 4
-	waitmessage
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_160419:: @ 8160419
-	lock
-	faceplayer
-	message BattleTower_Lobby_Text_19A571
-	waitmessage
-	message BattleTower_Lobby_Text_19A589
-	waitmessage
-	setvar VAR_SPECIAL_4, 13
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 0
-	special SaveBattleTowerProgress
-	playse SE_SAVE
-	waitse
-	msgbox BattleTower_Lobby_Text_199FA9, 4
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_16044B:: @ 816044B
-	lock
-	faceplayer
-	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
-	message BattleTower_Lobby_Text_19A5B1
-	waitmessage
-	message BattleTower_Lobby_Text_19A5CE
-	waitmessage
-	setvar VAR_SPECIAL_4, 1
-	special SaveBattleTowerProgress
-	playse SE_SAVE
-	waitse
-	setvar VAR_SPECIAL_4, 8
-	setvar VAR_SPECIAL_5, 0
-	special SetBattleTowerProperty
-	setvar VAR_TEMP_0, 5
-	special SavePlayerParty
-	special SetBattleTowerParty
-	msgbox BattleTower_Lobby_Text_19A0A8, 4
-	closemessage
-	call BattleTower_Lobby_EventScript_160664
-	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
-	setvar VAR_TEMP_0, 0
-	waitstate
-
-BattleTower_Lobby_EventScript_16049E:: @ 816049E
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 0
-	special BattleTowerUtil
-	compare RESULT, 6
-	goto_if_eq BattleTower_Lobby_EventScript_160342
-	special SavePlayerParty
-	msgbox BattleTower_Lobby_Text_199F2C, 4
-
-BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
-	message BattleTower_Lobby_Text_199F79
-	waitmessage
-	multichoice 15, 6, 23, 0
-	switch RESULT
-	case 0, BattleTower_Lobby_EventScript_1604FA
-	case 1, BattleTower_Lobby_EventScript_160600
-	case 2, BattleTower_Lobby_EventScript_160652
-	case 127, BattleTower_Lobby_EventScript_160652
-
-BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
-	message BattleTower_Lobby_Text_19A024
-	waitmessage
-	multichoice 18, 6, 24, 0
-	switch RESULT
-	case 2, BattleTower_Lobby_EventScript_160652
-	case 127, BattleTower_Lobby_EventScript_160652
-	special CheckPartyBattleTowerBanlist
-	compare VAR_SPECIAL_4, 1
-	goto_if_eq BattleTower_Lobby_EventScript_16060D
-	setvar VAR_SPECIAL_4, 1
-	copyvar VAR_SPECIAL_5, RESULT
-	copyvar VAR_SPECIAL_6, RESULT
-	special SetBattleTowerProperty
-	msgbox BattleTower_Lobby_Text_19A07B, 4
-	fadescreen 1
-	special ChooseBattleTowerPlayerParty
-	waitstate
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_16064F
-	msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_Lobby_EventScript_16064F
-	case YES, BattleTower_Lobby_EventScript_160587
-	case 127, BattleTower_Lobby_EventScript_16064F
-
-BattleTower_Lobby_EventScript_160587:: @ 8160587
-	setvar VAR_SPECIAL_4, 5
-	special SetBattleTowerProperty
-	setvar VAR_TEMP_0, 0
-	setvar VAR_SPECIAL_4, 11
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 1
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 8
-	setvar VAR_SPECIAL_5, 0
-	special SetBattleTowerProperty
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call S_DoSaveDialog
-	setvar VAR_TEMP_0, 5
-	erasebox 0, 0, 15, 10
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_160642
-	incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
-	special SavePlayerParty
-	special SetBattleTowerParty
-	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
-	msgbox BattleTower_Lobby_Text_19A0A8, 4
-	closemessage
-	call BattleTower_Lobby_EventScript_160664
-	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
-	setvar VAR_TEMP_0, 0
-	waitstate
-
-BattleTower_Lobby_EventScript_160600:: @ 8160600
-	msgbox BattleTower_Lobby_Text_19A0D1, 4
-	goto BattleTower_Lobby_EventScript_1604BE
-
-BattleTower_Lobby_EventScript_16060D:: @ 816060D
-	switch RESULT
-	case 0, BattleTower_Lobby_EventScript_160628
-	case 1, BattleTower_Lobby_EventScript_160635
-
-BattleTower_Lobby_EventScript_160628:: @ 8160628
-	msgbox BattleTower_Lobby_Text_19A249, 4
-	goto BattleTower_Lobby_EventScript_160662
-
-BattleTower_Lobby_EventScript_160635:: @ 8160635
-	msgbox BattleTower_Lobby_Text_19A32D, 4
-	goto BattleTower_Lobby_EventScript_160662
-
-BattleTower_Lobby_EventScript_160642:: @ 8160642
-	setvar VAR_SPECIAL_4, 12
-	special SetBattleTowerProperty
-	goto BattleTower_Lobby_EventScript_160652
-
-BattleTower_Lobby_EventScript_16064F:: @ 816064F
-	special LoadPlayerParty
-
-BattleTower_Lobby_EventScript_160652:: @ 8160652
-	msgbox BattleTower_Lobby_Text_199FA9, 4
-	setvar VAR_SPECIAL_4, 11
-	special SetBattleTowerProperty
-
-BattleTower_Lobby_EventScript_160662:: @ 8160662
-	release
-	end
-
-BattleTower_Lobby_EventScript_160664:: @ 8160664
-	applymovement 1, BattleTower_Lobby_Movement_160693
-	applymovement 255, BattleTower_Lobby_Movement_160693
-	waitmovement 0
-	opendoor 6, 1
-	waitdooranim
-	applymovement 1, BattleTower_Lobby_Movement_160697
-	applymovement 255, BattleTower_Lobby_Movement_16069A
-	waitmovement 0
-	closedoor 6, 1
-	waitdooranim
-	return
-
-BattleTower_Lobby_Movement_160693:: @ 8160693
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-BattleTower_Lobby_Movement_160697:: @ 8160697
-	walk_up
-	set_invisible
-	end_movement
-
-BattleTower_Lobby_Movement_16069A:: @ 816069A
-	walk_up
-	walk_up
-	set_invisible
-	end_movement
-
-@ 816069E
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	set_invisible
-	end_movement
-
-BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
-	lock
-	faceplayer
-	msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO
-	switch RESULT
-	case YES, BattleTower_Lobby_EventScript_1606CC
-	case NO, BattleTower_Lobby_EventScript_1606F7
-	release
-	end
-
-BattleTower_Lobby_EventScript_1606CC:: @ 81606CC
-	msgbox BattleTower_Lobby_Text_19A7C3, 4
-	setvar VAR_SPECIAL_4, 1
-	call BattleTower_Lobby_EventScript_1A00F3
-	lock
-	faceplayer
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_160701
-	compare RESULT, 1
-	goto_if_eq BattleTower_Lobby_EventScript_16070B
-	end
-
-BattleTower_Lobby_EventScript_1606F7:: @ 81606F7
-	msgbox BattleTower_Lobby_Text_19A7FD, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_160701:: @ 8160701
-	msgbox BattleTower_Lobby_Text_19A83D, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_16070B:: @ 816070B
-	msgbox BattleTower_Lobby_Text_19A871, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_160715:: @ 8160715
-	msgbox BattleTower_Lobby_Text_19A8AE, 2
-	end
-
-BattleTower_Lobby_EventScript_16071E:: @ 816071E
-	msgbox BattleTower_Lobby_Text_19A946, 2
-	end
-
-BattleTower_Lobby_EventScript_160727:: @ 8160727
-	lockall
-	special ShowBattleTowerRecords
-	waitbuttonpress
-	erasebox 0, 0, 29, 19
-	releaseall
-	end
-
-BattleTower_Lobby_EventScript_160733:: @ 8160733
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5
-	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773
-	msgbox BattleTower_Lobby_Text_19A9EE, 4
-	setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD
-	givedecoration_std DECOR_SILVER_SHIELD
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag FLAG_RECEIVED_SILVER_SHIELD
-	msgbox BattleTower_Lobby_Text_19ABAA, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_160773:: @ 8160773
-	specialvar RESULT, GetBestBattleTowerStreak
-	compare RESULT, 100
-	goto_if_lt BattleTower_Lobby_EventScript_1607C5
-	msgbox BattleTower_Lobby_Text_19AAC4, 4
-	setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD
-	givedecoration_std DECOR_GOLD_SHIELD
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag FLAG_RECEIVED_GOLD_SHIELD
-	msgbox BattleTower_Lobby_Text_19ABAA, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_1607AF:: @ 81607AF
-	bufferdecorationname 1, VAR_SPECIAL_8
-	msgbox BattleTower_Lobby_Text_1A0CEF, 4
-	msgbox BattleTower_Lobby_Text_19ABED, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_1607C5:: @ 81607C5
-	msgbox BattleTower_Lobby_Text_19AC55, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
deleted file mode 100644
index a4406c8e6..000000000
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ /dev/null
@@ -1,226 +0,0 @@
-EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF
-	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF
-	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5
-	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4
-	.byte 0
-
-EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF
-	call EverGrandeCity_ChampionsRoom_EventScript_1A014E
-	end
-
-EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF
-	.2byte 0
-
-EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF
-	turnobject 255, 2
-	end
-
-EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE
-	.2byte 0
-
-EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
-	lockall
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E
-	waitmovement 0
-	delay 40
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802
-	waitmovement 0
-	setvar VAR_TEMP_1, 1
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B805
-	releaseall
-	end
-
-EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
-	walk_up
-	walk_up
-	end_movement
-
-EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
-	playbgm BGM_DAIGO, FALSE
-	msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4
-	trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B821
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
-	playse SE_DOOR
-	setmetatile 6, 1, 838, 0
-	setmetatile 6, 2, 839, 0
-	special DrawWholeMapView
-	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
-	closemessage
-	playse SE_DOOR
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C
-	compare RESULT, 1
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881
-	addobject 2
-	call EverGrandeCity_ChampionsRoom_EventScript_15B9BD
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886
-	compare RESULT, 1
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C
-	playbgm BGM_GIRL_SUP, FALSE
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881
-	playbgm BGM_BOY_SUP, FALSE
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886
-	msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4
-	delay 40
-	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
-	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
-	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
-	msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB
-	msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4
-	delay 40
-	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
-	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
-	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
-	msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
-	closemessage
-	addobject 3
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03
-	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4
-	call EverGrandeCity_ChampionsRoom_EventScript_1A03B0
-	msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841
-	waitmovement 0
-	delay 20
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4
-	closemessage
-	delay 30
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8
-	waitmovement 0
-	delay 20
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB
-	compare RESULT, 1
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4
-	closemessage
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
-	waitmovement 0
-	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
-	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
-	waitstate
-	releaseall
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9AB:: @ 815B9AB
-	msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, 4
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4
-	msgbox EverGrandeCity_ChampionsRoom_Text_191675, 4
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6
-	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F
-	waitmovement 0
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF
-	waitmovement 0
-	return
-
-EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD
-	walk_up
-	walk_up
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0
-	walk_up
-	delay_16
-	walk_up
-	delay_8
-	set_invisible
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_left
-	walk_up
-	walk_in_place_fastest_right
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_fastest_right
-	delay_16
-	walk_in_place_fastest_up
-	delay_8
-	walk_in_place_fastest_right
-	delay_16
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8
-	walk_right
-	walk_up
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF
-	walk_up
-	delay_8
-	set_invisible
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	walk_in_place_fastest_left
-	end_movement
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
deleted file mode 100644
index 8eb7bbc45..000000000
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D
-	map_script 2, EverGrandeCity_DrakesRoom_MapScript2_15B72C
-	map_script 1, EverGrandeCity_DrakesRoom_MapScript1_15B743
-	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570
-	.byte 0
-
-@ 815B71D
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727
-	.2byte 0
-
-EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727
-	turnobject 255, 2
-	end
-
-EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
-	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736
-	.2byte 0
-
-EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
-	lockall
-	call EverGrandeCity_DrakesRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 4
-	releaseall
-	end
-
-EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
-	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758
-	compare VAR_ELITE_4_STATE, 4
-	call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E
-	end
-
-EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
-	call EverGrandeCity_DrakesRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
-	call EverGrandeCity_DrakesRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
-	trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42
-	goto EverGrandeCity_DrakesRoom_EventScript_15B795
-	end
-
-EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
-	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
-	release
-	end
-
-EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
-	setvar VAR_SPECIAL_4, 0
-	special sub_810FF60
-	setflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call EverGrandeCity_DrakesRoom_EventScript_1A0693
-	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
deleted file mode 100644
index a72b84440..000000000
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673
-	map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_15B692
-	map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9
-	map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_15B683
-	.byte 0
-
-EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D
-	.2byte 0
-
-EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D
-	turnobject 255, 2
-	end
-
-EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
-	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C
-	.2byte 0
-
-EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
-	lockall
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 3
-	releaseall
-	end
-
-EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
-	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
-	compare VAR_ELITE_4_STATE, 3
-	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4
-	end
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
-	call EverGrandeCity_GlaciasRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
-	trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01
-	goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB
-	end
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
-	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
-	release
-	end
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
-	setflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
-	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
deleted file mode 100644
index 2d09f1ebb..000000000
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9
-	map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_15B60F
-	map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9
-	map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8
-	.byte 0
-
-EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3
-	.2byte 0
-
-EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3
-	turnobject 255, 2
-	end
-
-EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
-	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602
-	.2byte 0
-
-EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
-	lockall
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 2
-	releaseall
-	end
-
-EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
-	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624
-	compare VAR_ELITE_4_STATE, 2
-	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A
-	end
-
-EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
-	call EverGrandeCity_PhoebesRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
-	trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C
-	goto EverGrandeCity_PhoebesRoom_EventScript_15B661
-	end
-
-EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
-	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
-	release
-	end
-
-EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
-	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
-	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
deleted file mode 100644
index 0138f99f1..000000000
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ /dev/null
@@ -1,121 +0,0 @@
-EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
-	map_script 3, EverGrandeCity_PokemonLeague_MapScript1_15BA7B
-	.byte 0
-
-EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
-	setrespawn 20
-	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
-	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B
-	setobjectxyperm 3, 9, 2
-	setobjectxyperm 4, 10, 2
-	return
-
-EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
-	setvar VAR_SPECIAL_B, 1
-	call EverGrandeCity_PokemonLeague_EventScript_19FD5B
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8
-	lock
-	faceplayer
-	message EverGrandeCity_PokemonLeague_Text_1A0BE4
-	waitmessage
-	pokemart EverGrandeCity_PokemonLeague_Items
-	msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
-	.2byte ITEM_ULTRA_BALL
-	.2byte ITEM_HYPER_POTION
-	.2byte ITEM_MAX_POTION
-	.2byte ITEM_FULL_RESTORE
-	.2byte ITEM_FULL_HEAL
-	.2byte ITEM_REVIVE
-	.2byte ITEM_MAX_REPEL
-	.2byte ITEM_NONE
-	release
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
-	lockall
-	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_0, 11
-	call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34
-	compare VAR_TEMP_0, 8
-	call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F
-	message EverGrandeCity_PokemonLeague_Text_1916FD
-	waitmessage
-	delay 75
-	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A
-	closemessage
-	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
-	applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81
-	waitmovement 0
-	delay 10
-	playfanfare BGM_ME_BACHI
-	message EverGrandeCity_PokemonLeague_Text_191804
-	waitmessage
-	waitfanfare
-	closemessage
-	moveobjectoffscreen 3
-	moveobjectoffscreen 4
-	setflag FLAG_ENTERED_ELITE_FOUR
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34
-	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F
-	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A
-	playse SE_HAZURE
-	msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57
-	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839
-	waitmovement 0
-	msgbox EverGrandeCity_PokemonLeague_Text_191804, 4
-	closemessage
-	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D
-	waitmovement 0
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76
-	walk_down
-	walk_left
-	walk_in_place_fastest_up
-	end_movement
-
-EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A
-	walk_down
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E
-	walk_left
-	walk_in_place_fastest_down
-	end_movement
-
-EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81
-	walk_right
-	walk_in_place_fastest_down
-	end_movement
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
deleted file mode 100644
index 45a729c0a..000000000
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
-	map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F
-	map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570
-	map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F
-	.byte 0
-
-EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
-	call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564
-	compare VAR_ELITE_4_STATE, 1
-	call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
-	call EverGrandeCity_SidneysRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A
-	call EverGrandeCity_SidneysRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570
-EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A
-	.2byte 0
-
-EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A
-	turnobject 255, 2
-	end
-
-EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
-	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589
-	.2byte 0
-
-EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
-	lockall
-	call EverGrandeCity_SidneysRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 1
-	releaseall
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
-	trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823
-	goto EverGrandeCity_SidneysRoom_EventScript_15B5C7
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
-	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
-	release
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
-	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
-	call EverGrandeCity_SidneysRoom_EventScript_1A0693
-	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
-	release
-	end
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
deleted file mode 100644
index f14601747..000000000
--- a/data/scripts/maps/LavaridgeTown.inc
+++ /dev/null
@@ -1,320 +0,0 @@
-LavaridgeTown_MapScripts:: @ 814E4A3
-	map_script 3, LavaridgeTown_MapScript1_14E4AE
-	map_script 2, LavaridgeTown_MapScript2_14E4E3
-	.byte 0
-
-LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
-	setflag FLAG_VISITED_LAVARIDGE_TOWN
-	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF
-	call LavaridgeTown_EventScript_1A014E
-	call LavaridgeTown_EventScript_1A0172
-	compare VAR_LAVARIDGE_RIVAL_STATE, 2
-	call_if_eq LavaridgeTown_EventScript_14E4D0
-	end
-
-LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
-	setobjectxyperm 8, 11, 9
-	setobjectxyperm 7, 11, 9
-	return
-
-LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
-	clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
-	return
-
-LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
-	map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED
-	.2byte 0
-
-LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	opendoor 12, 15
-	waitdooranim
-	addobject 8
-	applymovement 8, LavaridgeTown_Movement_14E70E
-	waitmovement 0
-	closedoor 12, 15
-	waitdooranim
-	applymovement 8, LavaridgeTown_Movement_1A083F
-	waitmovement 0
-	applymovement 255, LavaridgeTown_Movement_1A0843
-	applymovement 8, LavaridgeTown_Movement_1A0833
-	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_1A0835
-	waitmovement 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LavaridgeTown_EventScript_14E56B
-	compare RESULT, 1
-	call_if_eq LavaridgeTown_EventScript_14E570
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LavaridgeTown_EventScript_14E68F
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LavaridgeTown_EventScript_14E5AB
-	compare RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_14E5D0
-	end
-
-LavaridgeTown_EventScript_14E56B:: @ 814E56B
-	playbgm BGM_GIRL_SUP, TRUE
-	return
-
-LavaridgeTown_EventScript_14E570:: @ 814E570
-	playbgm BGM_BOY_SUP, TRUE
-	return
-
-LavaridgeTown_EventScript_14E575:: @ 814E575
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_8, 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LavaridgeTown_EventScript_14E56B
-	compare RESULT, 1
-	call_if_eq LavaridgeTown_EventScript_14E570
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LavaridgeTown_EventScript_14E5AB
-	compare RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_14E5D0
-	end
-
-LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
-	msgbox LavaridgeTown_Text_16BDA4, 4
-	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_16BE7D, 4
-	goto LavaridgeTown_EventScript_14E5F5
-	end
-
-LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
-	msgbox LavaridgeTown_Text_16BF92, 4
-	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_16C020, 4
-	goto LavaridgeTown_EventScript_14E5F5
-	end
-
-LavaridgeTown_EventScript_14E5F5:: @ 814E5F5
-	closemessage
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LavaridgeTown_EventScript_14E646
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LavaridgeTown_EventScript_14E64E
-	removeobject 8
-	addobject 7
-	delay 30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LavaridgeTown_EventScript_14E69A
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LavaridgeTown_EventScript_14E6A5
-	removeobject 7
-	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
-	savebgm 0
-	fadedefaultbgm
-	compare VAR_SPECIAL_8, 0
-	goto_if_eq LavaridgeTown_EventScript_14E644
-	releaseall
-	end
-
-LavaridgeTown_EventScript_14E644:: @ 814E644
-	release
-	end
-
-LavaridgeTown_EventScript_14E646:: @ 814E646
-	setobjectxyperm 7, 6, 16
-	return
-
-LavaridgeTown_EventScript_14E64E:: @ 814E64E
-	compare FACING, 2
-	call_if_eq LavaridgeTown_EventScript_14E67B
-	compare FACING, 1
-	call_if_eq LavaridgeTown_EventScript_14E680
-	compare FACING, 3
-	call_if_eq LavaridgeTown_EventScript_14E685
-	compare FACING, 4
-	call_if_eq LavaridgeTown_EventScript_14E68A
-	return
-
-LavaridgeTown_EventScript_14E67B:: @ 814E67B
-	setobjectmovementtype 7, 8
-	return
-
-LavaridgeTown_EventScript_14E680:: @ 814E680
-	setobjectmovementtype 7, 7
-	return
-
-LavaridgeTown_EventScript_14E685:: @ 814E685
-	setobjectmovementtype 7, 10
-	return
-
-LavaridgeTown_EventScript_14E68A:: @ 814E68A
-	setobjectmovementtype 7, 9
-	return
-
-LavaridgeTown_EventScript_14E68F:: @ 814E68F
-	applymovement 8, LavaridgeTown_Movement_14E6E8
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_14E69A:: @ 814E69A
-	applymovement 7, LavaridgeTown_Movement_14E6EF
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_14E6A5:: @ 814E6A5
-	compare FACING, 2
-	call_if_eq LavaridgeTown_EventScript_14E6D2
-	compare FACING, 1
-	call_if_eq LavaridgeTown_EventScript_14E6D2
-	compare FACING, 3
-	call_if_eq LavaridgeTown_EventScript_14E6DD
-	compare FACING, 4
-	call_if_eq LavaridgeTown_EventScript_14E6D2
-	return
-
-LavaridgeTown_EventScript_14E6D2:: @ 814E6D2
-	applymovement 7, LavaridgeTown_Movement_14E6FA
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_14E6DD:: @ 814E6DD
-	applymovement 7, LavaridgeTown_Movement_14E703
-	waitmovement 0
-	return
-
-LavaridgeTown_Movement_14E6E8:: @ 814E6E8
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-LavaridgeTown_Movement_14E6EF:: @ 814E6EF
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-LavaridgeTown_Movement_14E6FA:: @ 814E6FA
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	end_movement
-
-LavaridgeTown_Movement_14E703:: @ 814E703
-	walk_fast_down
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	end_movement
-
-LavaridgeTown_Movement_14E70E:: @ 814E70E
-	walk_down
-	end_movement
-
-LavaridgeTown_EventScript_14E710:: @ 814E710
-	specialvar RESULT, GetPlayerFacingDirection
-	compare RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_14E721
-	end
-
-LavaridgeTown_EventScript_14E721:: @ 814E721
-	incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
-	end
-
-LavaridgeTown_EventScript_14E724:: @ 814E724
-	msgbox LavaridgeTown_Text_16C3FD, 2
-	end
-
-LavaridgeTown_EventScript_14E72D:: @ 814E72D
-	msgbox LavaridgeTown_Text_16C4DB, 3
-	end
-
-LavaridgeTown_EventScript_14E736:: @ 814E736
-	msgbox LavaridgeTown_Text_16C59B, 2
-	end
-
-LavaridgeTown_EventScript_14E73F:: @ 814E73F
-	msgbox LavaridgeTown_Text_16C603, 2
-	end
-
-LavaridgeTown_EventScript_14E748:: @ 814E748
-	msgbox LavaridgeTown_Text_16C694, 2
-	end
-
-LavaridgeTown_EventScript_14E751:: @ 814E751
-	msgbox LavaridgeTown_Text_16C54E, 2
-	end
-
-LavaridgeTown_EventScript_14E75A:: @ 814E75A
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E
-	msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq LavaridgeTown_EventScript_14E7B2
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq LavaridgeTown_EventScript_14E7A8
-	msgbox LavaridgeTown_Text_16C2B6, 4
-	setflag FLAG_RECEIVED_LAVARIDGE_EGG
-	playfanfare BGM_FANFA4
-	message LavaridgeTown_Text_16C2EA
-	waitfanfare
-	waitmessage
-	giveegg SPECIES_WYNAUT
-	release
-	end
-
-LavaridgeTown_EventScript_14E79E:: @ 814E79E
-	msgbox LavaridgeTown_Text_16C398, 4
-	release
-	end
-
-LavaridgeTown_EventScript_14E7A8:: @ 814E7A8
-	msgbox LavaridgeTown_Text_16C2FF, 4
-	release
-	end
-
-LavaridgeTown_EventScript_14E7B2:: @ 814E7B2
-	msgbox LavaridgeTown_Text_16C33C, 4
-	release
-	end
-
-LavaridgeTown_EventScript_14E7BC:: @ 814E7BC
-	msgbox LavaridgeTown_Text_16C72F, 3
-	end
-
-LavaridgeTown_EventScript_14E7C5:: @ 814E7C5
-	msgbox LavaridgeTown_Text_16C77C, 3
-	end
-
-@ 814E7CE
-	msgbox LavaridgeTown_Text_16C7CF, 3
-	end
-
-LavaridgeTown_EventScript_14E7D7:: @ 814E7D7
-	msgbox LavaridgeTown_Text_16C7CF, 3
-	end
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
deleted file mode 100644
index f632a4d41..000000000
--- a/data/scripts/maps/LilycoveCity.inc
+++ /dev/null
@@ -1,408 +0,0 @@
-LilycoveCity_MapScripts:: @ 814CA15
-	map_script 3, LilycoveCity_MapScript1_14CA20
-	map_script 1, LilycoveCity_MapScript1_14CA3F
-	.byte 0
-
-LilycoveCity_MapScript1_14CA20:: @ 814CA20
-	setflag FLAG_VISITED_LILYCOVE_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
-	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
-	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1
-	call LilycoveCity_EventScript_1A0196
-	call LilycoveCity_EventScript_1A014E
-	end
-
-LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
-	.ifndef SAPPHIRE
-	setmetatile 69, 4, 169, 1
-	setmetatile 70, 4, 680, 1
-	setmetatile 71, 4, 681, 1
-	setmetatile 72, 4, 682, 1
-	setmetatile 69, 5, 145, 1
-	setmetatile 70, 5, 688, 1
-	setmetatile 71, 5, 689, 0
-	setmetatile 72, 5, 690, 1
-	setmetatile 69, 6, 446, 0
-	setmetatile 70, 6, 447, 0
-	setmetatile 71, 6, 368, 0
-	setmetatile 72, 6, 445, 0
-	.endif
-	call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE
-	call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B
-	end
-
-LilycoveCity_EventScript_14CABE:: @ 814CABE
-	setmetatile 76, 12, 656, 1
-	setmetatile 77, 12, 657, 1
-	setmetatile 76, 13, 672, 1
-	setmetatile 77, 13, 673, 1
-	setmetatile 76, 14, 664, 1
-	setmetatile 77, 14, 665, 1
-	setmetatile 76, 15, 672, 1
-	setmetatile 77, 15, 673, 1
-	setmetatile 77, 16, 664, 1
-	setmetatile 78, 16, 665, 1
-	setmetatile 77, 17, 672, 1
-	setmetatile 78, 17, 673, 1
-	return
-
-LilycoveCity_EventScript_14CB2B:: @ 814CB2B
-	setmetatile 69, 4, 169, 1
-	setmetatile 70, 4, 169, 1
-	setmetatile 71, 4, 169, 1
-	setmetatile 72, 4, 169, 1
-	setmetatile 69, 5, 145, 1
-	setmetatile 70, 5, 145, 1
-	setmetatile 71, 5, 145, 1
-	setmetatile 72, 5, 145, 1
-	return
-
-LilycoveCity_EventScript_14CB74:: @ 814CB74
-	lock
-	faceplayer
-	dodailyevents
-	goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4
-	msgbox LilycoveCity_Text_1C5A7A, 4
-	random 10
-	addvar RESULT, ITEM_CHERI_BERRY
-	giveitem_std RESULT
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_1A029B
-	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
-	msgbox LilycoveCity_Text_1C5B1D, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBB4:: @ 814CBB4
-	msgbox LilycoveCity_Text_1C5B5D, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBBE:: @ 814CBBE
-	msgbox LilycoveCity_Text_1686C9, 2
-	end
-
-LilycoveCity_EventScript_14CBC7:: @ 814CBC7
-	lock
-	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC
-	msgbox LilycoveCity_Text_168750, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBDC:: @ 814CBDC
-	msgbox LilycoveCity_Text_168791, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBE6:: @ 814CBE6
-	msgbox LilycoveCity_Text_168819, 2
-	end
-
-LilycoveCity_EventScript_14CBEF:: @ 814CBEF
-	lock
-	faceplayer
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04
-	msgbox LilycoveCity_Text_1688C1, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC04:: @ 814CC04
-	msgbox LilycoveCity_Text_168934, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC0E:: @ 814CC0E
-	lock
-	faceplayer
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23
-	msgbox LilycoveCity_Text_1689BF, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC23:: @ 814CC23
-	msgbox LilycoveCity_Text_168A55, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC2D:: @ 814CC2D
-	msgbox LilycoveCity_Text_168A8D, 2
-	end
-
-LilycoveCity_EventScript_14CC36:: @ 814CC36
-	msgbox LilycoveCity_Text_168B1F, 3
-	end
-
-LilycoveCity_EventScript_14CC3F:: @ 814CC3F
-	msgbox LilycoveCity_Text_168B9B, 3
-	end
-
-LilycoveCity_EventScript_14CC48:: @ 814CC48
-	lock
-	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D
-	msgbox LilycoveCity_Text_168C16, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC5D:: @ 814CC5D
-	msgbox LilycoveCity_Text_168D15, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC67:: @ 814CC67
-	msgbox LilycoveCity_Text_168DA9, 3
-	end
-
-LilycoveCity_EventScript_14CC70:: @ 814CC70
-	msgbox LilycoveCity_Text_168DE1, 3
-	end
-
-LilycoveCity_EventScript_14CC79:: @ 814CC79
-	msgbox LilycoveCity_Text_168E2F, 3
-	end
-
-LilycoveCity_EventScript_14CC82:: @ 814CC82
-	lockall
-	specialvar VAR_SPECIAL_4, sub_80C4D50
-	switch VAR_SPECIAL_4
-	case 0, LilycoveCity_EventScript_14CCA2
-	msgbox LilycoveCity_Text_168EA4, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCA2:: @ 814CCA2
-	msgbox LilycoveCity_Text_168E67, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCAC:: @ 814CCAC
-	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0
-	msgbox LilycoveCity_Text_168EDA, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCC0:: @ 814CCC0
-	msgbox LilycoveCity_Text_168F57, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCCA:: @ 814CCCA
-	msgbox LilycoveCity_Text_168FA1, 3
-	end
-
-LilycoveCity_EventScript_14CCD3:: @ 814CCD3
-	msgbox LilycoveCity_Text_168FF3, 3
-	end
-
-LilycoveCity_EventScript_14CCDC:: @ 814CCDC
-	msgbox LilycoveCity_Text_169072, 3
-	end
-
-LilycoveCity_EventScript_14CCE5:: @ 814CCE5
-	lockall
-	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18
-	msgbox LilycoveCity_Text_16864A, 4
-	applymovement LAST_TALKED, LilycoveCity_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_Text_168675, 4
-	applymovement LAST_TALKED, LilycoveCity_Movement_1A083D
-	waitmovement 0
-	setflag FLAG_MET_WAILMER_TRAINER
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CD18:: @ 814CD18
-	msgbox LilycoveCity_Text_16864A, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CD22:: @ 814CD22
-	msgbox LilycoveCity_Text_168455, 2
-	end
-
-LilycoveCity_EventScript_14CD2B:: @ 814CD2B
-	msgbox LilycoveCity_Text_1684C2, 2
-	end
-
-LilycoveCity_EventScript_14CD34:: @ 814CD34
-	msgbox LilycoveCity_Text_168573, 2
-	end
-
-LilycoveCity_EventScript_14CD3D:: @ 814CD3D
-	msgbox LilycoveCity_Text_1685EB, 2
-	end
-
-LilycoveCity_EventScript_14CD46:: @ 814CD46
-	lock
-	faceplayer
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_14CD60
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_EventScript_14CDD3
-	end
-
-LilycoveCity_EventScript_14CD60:: @ 814CD60
-	playbgm BGM_GIRL_SUP, TRUE
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_EventScript_14CDC2
-	msgbox LilycoveCity_Text_167B94, 4
-	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_14CE46
-	case 1, LilycoveCity_EventScript_14CE56
-	case 2, LilycoveCity_EventScript_14CE66
-	end
-
-LilycoveCity_EventScript_14CDB0:: @ 814CDB0
-	msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CDB9:: @ 814CDB9
-	msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CDC2:: @ 814CDC2
-	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_167AEB, 4
-	savebgm 0
-	fadedefaultbgm
-	release
-	end
-
-LilycoveCity_EventScript_14CDD3:: @ 814CDD3
-	playbgm BGM_BOY_SUP, TRUE
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_EventScript_14CE35
-	msgbox LilycoveCity_Text_1680A9, 4
-	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_14CE76
-	case 1, LilycoveCity_EventScript_14CE86
-	case 2, LilycoveCity_EventScript_14CE96
-	end
-
-LilycoveCity_EventScript_14CE23:: @ 814CE23
-	msgbox LilycoveCity_Text_168067, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CE2C:: @ 814CE2C
-	msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CE35:: @ 814CE35
-	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_16802C, 4
-	savebgm 0
-	fadedefaultbgm
-	release
-	end
-
-LilycoveCity_EventScript_14CE46:: @ 814CE46
-	trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5
-	goto LilycoveCity_EventScript_14CEA6
-	end
-
-LilycoveCity_EventScript_14CE56:: @ 814CE56
-	trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5
-	goto LilycoveCity_EventScript_14CEA6
-	end
-
-LilycoveCity_EventScript_14CE66:: @ 814CE66
-	trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5
-	goto LilycoveCity_EventScript_14CEA6
-	end
-
-LilycoveCity_EventScript_14CE76:: @ 814CE76
-	trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4
-	goto LilycoveCity_EventScript_14CF12
-	end
-
-LilycoveCity_EventScript_14CE86:: @ 814CE86
-	trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4
-	goto LilycoveCity_EventScript_14CF12
-	end
-
-LilycoveCity_EventScript_14CE96:: @ 814CE96
-	trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4
-	goto LilycoveCity_EventScript_14CF12
-	end
-
-LilycoveCity_EventScript_14CEA6:: @ 814CEA6
-	msgbox LilycoveCity_Text_167C6B, 4
-	setvar RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
-	compare RESULT, 0
-	call_if_eq LilycoveCity_EventScript_14CEEE
-	compare RESULT, 1
-	call_if_eq LilycoveCity_EventScript_14CEF7
-	clearflag FLAG_HIDE_MAY_UPSTAIRS
-	clearflag FLAG_HIDE_MAY_PICHU_DOLL
-	goto LilycoveCity_EventScript_14CF6B
-	end
-
-LilycoveCity_EventScript_14CEDE:: @ 814CEDE
-	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8
-	return
-
-LilycoveCity_EventScript_14CEE8:: @ 814CEE8
-	setvar RESULT, 1
-	return
-
-LilycoveCity_EventScript_14CEEE:: @ 814CEEE
-	msgbox LilycoveCity_Text_167D08, 4
-	return
-
-LilycoveCity_EventScript_14CEF7:: @ 814CEF7
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09
-	msgbox LilycoveCity_Text_167DDD, 4
-	return
-
-LilycoveCity_EventScript_14CF09:: @ 814CF09
-	msgbox LilycoveCity_Text_167EAA, 4
-	return
-
-LilycoveCity_EventScript_14CF12:: @ 814CF12
-	msgbox LilycoveCity_Text_168149, 4
-	setvar RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
-	compare RESULT, 0
-	call_if_eq LilycoveCity_EventScript_14CF47
-	compare RESULT, 1
-	call_if_eq LilycoveCity_EventScript_14CF50
-	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS
-	goto LilycoveCity_EventScript_14CF6B
-	end
-
-LilycoveCity_EventScript_14CF47:: @ 814CF47
-	msgbox LilycoveCity_Text_1681EA, 4
-	return
-
-LilycoveCity_EventScript_14CF50:: @ 814CF50
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62
-	msgbox LilycoveCity_Text_168282, 4
-	return
-
-LilycoveCity_EventScript_14CF62:: @ 814CF62
-	msgbox LilycoveCity_Text_16835A, 4
-	return
-
-LilycoveCity_EventScript_14CF6B:: @ 814CF6B
-	closemessage
-	applymovement LAST_TALKED, LilycoveCity_Movement_1A0845
-	waitmovement 0
-	delay 50
-	setfieldeffectargument 0, 1
-	dofieldeffect FLDEFF_NPCFLY_OUT
-	delay 15
-	removeobject LAST_TALKED
-	waitfieldeffect FLDEFF_NPCFLY_OUT
-	savebgm 0
-	fadedefaultbgm
-	setflag FLAG_MET_RIVAL_LILYCOVE
-	release
-	end
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
deleted file mode 100644
index 4784a4903..000000000
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ /dev/null
@@ -1,766 +0,0 @@
-LilycoveCity_ContestLobby_MapScripts:: @ 8158866
-	map_script 3, LilycoveCity_ContestLobby_MapScript1_158871
-	map_script 2, LilycoveCity_ContestLobby_MapScript2_158877
-	.byte 0
-
-LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871
-	call LilycoveCity_ContestLobby_EventScript_1AE188
-	end
-
-LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B
-	.2byte 0
-
-LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
-	lockall
-	addobject 4
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B
-	waitmovement 4
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
-	lockall
-	fadescreen 1
-	drawcontestwinner 0
-	lockall
-	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158918
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
-	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
-	closemessage
-	special sub_80C4CEC
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	specialvar RESULT, GiveMonArtistRibbon
-	compare RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_158948
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
-	waitmovement 0
-	removeobject 4
-	call LilycoveCity_ContestLobby_EventScript_158994
-	call LilycoveCity_ContestLobby_EventScript_1589EA
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
-	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
-	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
-	closemessage
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
-	waitmovement 0
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	removeobject 4
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
-	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80C4858
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E
-	waitmovement 0
-	playse SE_PIN
-	applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833
-	waitmovement 0
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A52
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
-	playfanfare BGM_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
-	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
-	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
-	closemessage
-	return
-
-LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
-	specialvar VAR_SPECIAL_4, sub_80C4D50
-	switch VAR_SPECIAL_4
-	case 1, LilycoveCity_ContestLobby_EventScript_1589D6
-	case 2, LilycoveCity_ContestLobby_EventScript_1589DA
-	case 3, LilycoveCity_ContestLobby_EventScript_1589DE
-	case 4, LilycoveCity_ContestLobby_EventScript_1589E2
-	case 5, LilycoveCity_ContestLobby_EventScript_1589E6
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
-	switch CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_158A27
-	case 1, LilycoveCity_ContestLobby_EventScript_158A2B
-	case 2, LilycoveCity_ContestLobby_EventScript_158A2F
-	case 3, LilycoveCity_ContestLobby_EventScript_158A33
-	case 4, LilycoveCity_ContestLobby_EventScript_158A37
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27
-	setflag FLAG_COOL_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B
-	setflag FLAG_BEAUTY_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F
-	setflag FLAG_CUTE_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33
-	setflag FLAG_SMART_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37
-	setflag FLAG_TOUGH_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C
-	walk_in_place_fastest_left
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_in_place_fastest_right
-	end_movement
-
-LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
-	lockall
-	addobject 11
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B64
-	waitmovement 11
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158B76
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
-	lockall
-	fadescreen 1
-	drawcontestwinner 0
-	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8
-	end
-
-LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
-	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
-	closemessage
-	special sub_80C4CEC
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	specialvar RESULT, GiveMonArtistRibbon
-	compare RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_158B18
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
-	waitmovement 0
-	removeobject 11
-	call LilycoveCity_ContestLobby_EventScript_158994
-	call LilycoveCity_ContestLobby_EventScript_1589EA
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
-	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
-	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
-	closemessage
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
-	waitmovement 0
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	removeobject 11
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
-	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80C4858
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B78
-	waitmovement 0
-	playse SE_PIN
-	applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833
-	waitmovement 0
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
-	playfanfare BGM_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
-	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
-	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
-	closemessage
-	return
-
-LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64
-	walk_down
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76
-	walk_in_place_fastest_right
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_in_place_fastest_left
-	end_movement
-
-LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
-	lockall
-	checkitem ITEM_CONTEST_PASS, 1
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
-	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE
-	message LilycoveCity_ContestLobby_Text_18848C
-	waitmessage
-	setflag FLAG_TEMP_2
-	goto LilycoveCity_ContestLobby_EventScript_158BF0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE
-	message LilycoveCity_ContestLobby_Text_188584
-	waitmessage
-	goto LilycoveCity_ContestLobby_EventScript_158BF0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA
-	msgbox LilycoveCity_ContestLobby_Text_1A63F4, 4
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
-	msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
-	call S_DoSaveDialog
-	erasebox 0, 0, 15, 9
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
-	setflag FLAG_TEMP_3
-	return
-
-LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
-	multichoice 0, 0, 2, 0
-	switch RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_158CEA
-	case 1, LilycoveCity_ContestLobby_EventScript_158C27
-	case 2, LilycoveCity_ContestLobby_EventScript_158C35
-	case 127, LilycoveCity_ContestLobby_EventScript_158C35
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
-	msgbox LilycoveCity_ContestLobby_Text_1885A7, 4
-	goto LilycoveCity_ContestLobby_EventScript_158B85
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
-	msgbox LilycoveCity_ContestLobby_Text_188559, 4
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
-	msgbox LilycoveCity_ContestLobby_Text_188703, 4
-	setvar CONTEST_RANK, 0
-	choosecontestmon
-	compare VAR_SPECIAL_4, 255
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA
-	special sub_80C43F4
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
-	compare RESULT, 2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
-	compare RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4
-	compare RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96
-	msgbox LilycoveCity_ContestLobby_Text_1A664A, 4
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4
-	msgbox LilycoveCity_ContestLobby_Text_1A669F, 4
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2
-	msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
-	copyvar VAR_SPECIAL_8, VAR_SPECIAL_4
-	message LilycoveCity_ContestLobby_Text_1A67A3
-	waitmessage
-	yesnobox 20, 8
-	switch RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_158C42
-	case 1, LilycoveCity_ContestLobby_EventScript_158D24
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
-	call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4
-	message LilycoveCity_ContestLobby_Text_1886DC
-	waitmessage
-	multichoice 0, 0, 4, 0
-	switch RESULT
-	case 5, LilycoveCity_ContestLobby_EventScript_158C35
-	case 127, LilycoveCity_ContestLobby_EventScript_158C35
-	copyvar CONTEST_CATEGORY, RESULT
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
-	message LilycoveCity_ContestLobby_Text_1887C7
-	waitmessage
-	copyvar VAR_SPECIAL_4, RESULT
-	special sub_808363C
-	waitstate
-	compare RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90
-	compare RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1
-	compare RESULT, 6
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2
-	messageautoscroll LilycoveCity_ContestLobby_Text_18872A
-	waitmessage
-	contestlinktransfer
-	switch VAR_SPECIAL_4
-	case 0, LilycoveCity_ContestLobby_EventScript_158DD1
-	case 1, LilycoveCity_ContestLobby_EventScript_158D82
-	case 2, LilycoveCity_ContestLobby_EventScript_158DC3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82
-	msgbox LilycoveCity_ContestLobby_Text_188750, 4
-	goto LilycoveCity_ContestLobby_EventScript_158CEA
-	end
-
-LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
-	closemessage
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
-	closemessage
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
-	closemessage
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
-	msgbox LilycoveCity_ContestLobby_Text_18873A, 4
-	goto LilycoveCity_ContestLobby_EventScript_158CEA
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
-	special sub_80C496C
-	addvar VAR_SPECIAL_4, 1
-	buffernumberstring 1, 32772
-	messageautoscroll LilycoveCity_ContestLobby_Text_188845
-	waitmessage
-	addvar VAR_SPECIAL_4, -1
-	goto LilycoveCity_ContestLobby_EventScript_158DEE
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
-	call LilycoveCity_ContestLobby_EventScript_158E0B
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
-	special sub_80C4F70
-	setvar VAR_CONTEST_LOCATION, 5
-	setvar CONTEST_RANK, 3
-	call LilycoveCity_ContestLobby_EventScript_158F08
-	end
-
-LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
-	lockall
-	messageautoscroll LilycoveCity_ContestLobby_Text_1888C6
-	waitmessage
-	delay 20
-	closemessage
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 9, 2, 545, 1
-	setmetatile 9, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 9, 2, 721, 1
-	setmetatile 9, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE
-	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158E99
-	waitmovement 0
-	messageautoscroll LilycoveCity_ContestLobby_Text_1A6832
-	waitmessage
-	delay 20
-	closemessage
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E
-	waitmovement 0
-	releaseall
-	return
-
-LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99
-	walk_in_place_fastest_right
-	walk_right
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE
-	walk_in_place_fastest_left
-	end_movement
-
-LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
-	specialvar RESULT, sub_80C5044
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8
-	setvar VAR_SPECIAL_B, 8
-	setvar CONTEST_RANK, 3
-	call LilycoveCity_ContestLobby_EventScript_1A4E92
-	call LilycoveCity_ContestLobby_EventScript_158F86
-	special SetContestTrainerGfxIds
-	call LilycoveCity_ContestLobby_EventScript_15FBDB
-	setvar VAR_CONTEST_LOCATION, 4
-	call LilycoveCity_ContestLobby_EventScript_158F08
-	waitstate
-	end
-
-LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
-	giveitem ITEM_CONTEST_PASS, 1
-	setvar VAR_SPECIAL_B, 8
-	setvar CONTEST_RANK, 3
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
-	setflag FLAG_SYS_RIBBON_GET
-	end
-
-LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
-	switch CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_158F45
-	case 1, LilycoveCity_ContestLobby_EventScript_158F52
-	case 2, LilycoveCity_ContestLobby_EventScript_158F5F
-	case 3, LilycoveCity_ContestLobby_EventScript_158F6C
-	case 4, LilycoveCity_ContestLobby_EventScript_158F79
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45
-	setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52
-	setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F
-	setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C
-	setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79
-	setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
-	lockall
-	applymovement 1, LilycoveCity_ContestLobby_Movement_15900B
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 545, 1
-	setmetatile 4, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 1, LilycoveCity_ContestLobby_Movement_15900F
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 721, 1
-	setmetatile 4, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 1, LilycoveCity_ContestLobby_Movement_15901C
-	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_159008
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_1A6832, 4
-	closemessage
-	applymovement 1, LilycoveCity_ContestLobby_Movement_159013
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE
-	waitmovement 0
-	releaseall
-	return
-
-LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_159008:: @ 8159008
-	walk_in_place_fastest_left
-	walk_left
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B
-	walk_left
-	walk_left
-	walk_in_place_fastest_down
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_159013:: @ 8159013
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	set_invisible
-	end_movement
-
-LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C
-	walk_in_place_fastest_right
-	end_movement
-
-LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
-	msgbox LilycoveCity_ContestLobby_Text_188D3C, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
-	goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039
-	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159039:: @ 8159039
-	msgbox LilycoveCity_ContestLobby_Text_188E47, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159042:: @ 8159042
-	msgbox LilycoveCity_ContestLobby_Text_188F07, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_15904B:: @ 815904B
-	msgbox LilycoveCity_ContestLobby_Text_188F81, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159054:: @ 8159054
-	msgbox LilycoveCity_ContestLobby_Text_188FE3, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D
-	msgbox LilycoveCity_ContestLobby_Text_18904D, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066
-	lockall
-	fadescreen 1
-	drawcontestwinner 6
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D
-	lockall
-	fadescreen 1
-	drawcontestwinner 7
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074
-	lockall
-	fadescreen 1
-	drawcontestwinner 8
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_15907B:: @ 815907B
-	msgbox LilycoveCity_ContestLobby_Text_1B7225, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084
-	msgbox LilycoveCity_ContestLobby_Text_1B7241, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D
-SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D
-	lockall
-	special ShowBerryBlenderRecordWindow
-	waitbuttonpress
-	erasebox 0, 0, 29, 19
-	releaseall
-	end
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
deleted file mode 100644
index 06b982610..000000000
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
-	.byte 0
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
-	lock
-	faceplayer
-	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
-	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
-	specialvar RESULT, CompletedHoennPokedex
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0
-	release
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, 4
-	return
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
-	setflag FLAG_TEMP_2
-	playfanfare BGM_FANFA4
-	waitfanfare
-	goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
-	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
-	waitmessage
-	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
-	special ScrSpecial_ShowDiploma
-	waitstate
-	release
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE:: @ 81583EE
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7:: @ 81583F7
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_158400:: @ 8158400
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, 2
-	end
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
deleted file mode 100644
index 8b8500a9c..000000000
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD
-	.byte 0
-
-LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
-	lockall
-	applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO
-	switch RESULT
-	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE
-	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4
-	special SelectMonForNPCTrade
-	waitstate
-	compare VAR_SPECIAL_4, 255
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
-	special IsSelectedMonEgg
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71
-	special ScrSpecial_CountPokemonMoves
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
-	fadescreen 1
-	special SelectMove
-	fadescreen 0
-	compare VAR_SPECIAL_5, 4
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
-	special ScrSpecial_GetPokemonNicknameAndMoveName
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO
-	switch RESULT
-	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53
-	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
-	special DeleteMonMove
-	playfanfare BGM_ME_WASURE
-	waitfanfare
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
-	special ScrSpecial_GetPokemonNicknameAndMoveName
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B71:: @ 8159B71
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, 4
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
deleted file mode 100644
index 9f328bc4a..000000000
--- a/data/scripts/maps/LittlerootTown.inc
+++ /dev/null
@@ -1,877 +0,0 @@
-LittlerootTown_MapScripts:: @ 814D509
-	map_script 3, LittlerootTown_MapScript1_14D514
-	map_script 2, LittlerootTown_MapScript2_14D5D5
-	.byte 0
-
-LittlerootTown_MapScript1_14D514:: @ 814D514
-	setflag FLAG_VISITED_LITTLEROOT_TOWN
-	compare VAR_LITTLEROOT_INTRO_STATE, 2
-	call_if_eq LittlerootTown_EventScript_14D57B
-	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583
-	compare VAR_LITTLEROOT_STATE, 3
-	call_if_eq LittlerootTown_EventScript_14D5A6
-	compare VAR_LITTLEROOT_HOUSES_STATE, 4
-	call_if_eq LittlerootTown_EventScript_14D570
-	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
-	call_if_eq LittlerootTown_EventScript_14D570
-	compare VAR_OLDALE_STATE, 1
-	call_if_eq LittlerootTown_EventScript_14D567
-	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	call_if_eq LittlerootTown_EventScript_14D563
-	end
-
-LittlerootTown_EventScript_14D563:: @ 814D563
-	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
-	return
-
-LittlerootTown_EventScript_14D567:: @ 814D567
-	setvar VAR_OLDALE_STATE, 2
-	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	return
-
-LittlerootTown_EventScript_14D570:: @ 814D570
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 5
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5
-	return
-
-LittlerootTown_EventScript_14D57B:: @ 814D57B
-	setobjectxyperm 4, 14, 8
-	return
-
-LittlerootTown_EventScript_14D583:: @ 814D583
-	compare VAR_LITTLEROOT_STATE, 0
-	goto_if_eq LittlerootTown_EventScript_14D59A
-	setobjectxyperm 1, 10, 1
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_EventScript_14D59A:: @ 814D59A
-	setobjectxyperm 1, 7, 2
-	setobjectmovementtype 1, 8
-	return
-
-LittlerootTown_EventScript_14D5A6:: @ 814D5A6
-	clearflag FLAG_HIDE_MOM_LITTLEROOT
-	setobjectmovementtype 4, 8
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D5C5
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D5CD
-	return
-
-LittlerootTown_EventScript_14D5C5:: @ 814D5C5
-	setobjectxyperm 4, 5, 9
-	return
-
-LittlerootTown_EventScript_14D5CD:: @ 814D5CD
-	setobjectxyperm 4, 14, 9
-	return
-
-LittlerootTown_MapScript2_14D5D5:: @ 814D5D5
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5
-	.2byte 0
-
-LittlerootTown_EventScript_14D5EF:: @ 814D5EF
-	lockall
-	setvar VAR_SPECIAL_4, 5
-	setvar VAR_SPECIAL_5, 8
-	call LittlerootTown_EventScript_14D62B
-	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
-	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D60D:: @ 814D60D
-	lockall
-	setvar VAR_SPECIAL_4, 14
-	setvar VAR_SPECIAL_5, 8
-	call LittlerootTown_EventScript_14D62B
-	setflag FLAG_HIDE_MOVING_TRUCK_MAY
-	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D62B:: @ 814D62B
-	delay 15
-	playse SE_DANSA
-	applymovement 255, LittlerootTown_Movement_14D6C0
-	waitmovement 0
-	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	addobject 4
-	applymovement 4, LittlerootTown_Movement_14D6AC
-	waitmovement 0
-	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	delay 10
-	applymovement 4, LittlerootTown_Movement_14D6AE
-	waitmovement 0
-	msgbox LittlerootTown_Text_16A7C9, 4
-	closemessage
-	applymovement 4, LittlerootTown_Movement_14D6B1
-	applymovement 255, LittlerootTown_Movement_14D6B8
-	waitmovement 0
-	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14D6B5
-	applymovement 255, LittlerootTown_Movement_14D6BD
-	waitmovement 0
-	setflag FLAG_HIDE_MOM_LITTLEROOT
-	setvar VAR_LITTLEROOT_INTRO_STATE, 3
-	hideobjectat 255, MAP_PETALBURG_CITY
-	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
-	clearflag FLAG_SPECIAL_FLAG_0
-	return
-
-LittlerootTown_Movement_14D6AC:: @ 814D6AC
-	walk_down
-	end_movement
-
-LittlerootTown_Movement_14D6AE:: @ 814D6AE
-	walk_down
-	walk_in_place_fastest_left
-	end_movement
-
-LittlerootTown_Movement_14D6B1:: @ 814D6B1
-	delay_16
-	delay_8
-	walk_up
-	end_movement
-
-LittlerootTown_Movement_14D6B5:: @ 814D6B5
-	walk_up
-	set_invisible
-	end_movement
-
-LittlerootTown_Movement_14D6B8:: @ 814D6B8
-	delay_16
-	delay_8
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14D6BD:: @ 814D6BD
-	walk_up
-	walk_up
-	end_movement
-
-LittlerootTown_Movement_14D6C0:: @ 814D6C0
-	jump_right
-	delay_16
-	delay_16
-	delay_16
-	end_movement
-
-LittlerootTown_EventScript_14D6C5:: @ 814D6C5
-	lockall
-	setvar VAR_LITTLEROOT_INTRO_STATE, 8
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D6CD:: @ 814D6CD
-	msgbox LittlerootTown_Text_16AC00, 2
-	end
-
-LittlerootTown_EventScript_14D6D6:: @ 814D6D6
-	msgbox LittlerootTown_Text_16AC56, 2
-	end
-
-LittlerootTown_EventScript_14D6DF:: @ 814D6DF
-	lock
-	faceplayer
-	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F
-	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722
-	compare VAR_LITTLEROOT_STATE, 0
-	goto_if_ne LittlerootTown_EventScript_14D708
-	msgbox LittlerootTown_Text_16ACEB, 4
-	release
-	end
-
-LittlerootTown_EventScript_14D708:: @ 814D708
-	msgbox LittlerootTown_Text_16AD82, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_1A083D
-	waitmovement 0
-	setvar VAR_LITTLEROOT_STATE, 2
-	release
-	end
-
-LittlerootTown_EventScript_14D722:: @ 814D722
-	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_16ADF2, 4
-	release
-	end
-
-LittlerootTown_EventScript_14D72F:: @ 814D72F
-	msgbox LittlerootTown_Text_16AE25, 4
-	release
-	end
-
-LittlerootTown_EventScript_14D739:: @ 814D739
-	lockall
-	applymovement 1, LittlerootTown_Movement_14D779
-	waitmovement 0
-	call LittlerootTown_EventScript_14D755
-	applymovement 1, LittlerootTown_Movement_14D789
-	waitmovement 0
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D755:: @ 814D755
-	msgbox LittlerootTown_Text_16ACEB, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_14D787
-	applymovement 255, LittlerootTown_Movement_14D793
-	waitmovement 0
-	msgbox LittlerootTown_Text_16AD3C, 4
-	closemessage
-	return
-
-LittlerootTown_Movement_14D779:: @ 814D779
-	face_right
-	delay_8
-	disable_jump_landing_ground_effect
-	jump_in_place_right
-	delay_8
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_left
-	face_down
-	end_movement
-
-LittlerootTown_Movement_14D787:: @ 814D787
-	walk_down
-	end_movement
-
-LittlerootTown_Movement_14D789:: @ 814D789
-	walk_right
-	walk_down
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_in_place_fastest_down
-	end_movement
-
-LittlerootTown_Movement_14D793:: @ 814D793
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	end_movement
-
-LittlerootTown_EventScript_14D797:: @ 814D797
-	lockall
-	applymovement 1, LittlerootTown_Movement_14D7B3
-	waitmovement 0
-	call LittlerootTown_EventScript_14D755
-	applymovement 1, LittlerootTown_Movement_14D7C0
-	waitmovement 0
-	releaseall
-	end
-
-LittlerootTown_Movement_14D7B3:: @ 814D7B3
-	face_right
-	delay_8
-	disable_jump_landing_ground_effect
-	jump_in_place_right
-	delay_8
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	face_down
-	end_movement
-
-LittlerootTown_Movement_14D7C0:: @ 814D7C0
-	walk_left
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_down
-	end_movement
-
-LittlerootTown_EventScript_14D7C7:: @ 814D7C7
-	lockall
-	applymovement 1, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	msgbox LittlerootTown_Text_16AD82, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_1A083D
-	waitmovement 0
-	setvar VAR_LITTLEROOT_STATE, 2
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D7F6:: @ 814D7F6
-	msgbox LittlerootTown_Text_16AE50, 3
-	end
-
-LittlerootTown_EventScript_14D7FF:: @ 814D7FF
-	msgbox LittlerootTown_Text_16AE87, 3
-	end
-
-LittlerootTown_EventScript_14D808:: @ 814D808
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D822
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D82B
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D822:: @ 814D822
-	msgbox LittlerootTown_Text_16AEA1, 4
-	return
-
-LittlerootTown_EventScript_14D82B:: @ 814D82B
-	msgbox LittlerootTown_Text_16AEAC, 4
-	return
-
-LittlerootTown_EventScript_14D834:: @ 814D834
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D84E
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D857
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D84E:: @ 814D84E
-	msgbox LittlerootTown_Text_16AEAC, 4
-	return
-
-LittlerootTown_EventScript_14D857:: @ 814D857
-	msgbox LittlerootTown_Text_16AEA1, 4
-	return
-
-LittlerootTown_EventScript_14D860:: @ 814D860
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	setobjectxy 4, 10, 9
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D873:: @ 814D873
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	setobjectxy 4, 11, 9
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D886:: @ 814D886
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D892:: @ 814D892
-	lockall
-	setvar VAR_SPECIAL_8, 3
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D89E:: @ 814D89E
-	lockall
-	setvar VAR_SPECIAL_8, 4
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D8AA:: @ 814D8AA
-	lockall
-	setvar VAR_SPECIAL_8, 5
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D8B6:: @ 814D8B6
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D93C
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D947
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D926
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D931
-	msgbox LittlerootTown_Text_16A8EE, 4
-	closemessage
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D952
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D995
-	call LittlerootTown_EventScript_14DD38
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14DAAA
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14DAED
-	goto LittlerootTown_EventScript_14DD2B
-	end
-
-LittlerootTown_EventScript_14D926:: @ 814D926
-	setvar VAR_SPECIAL_9, 5
-	setvar VAR_SPECIAL_A, 8
-	return
-
-LittlerootTown_EventScript_14D931:: @ 814D931
-	setvar VAR_SPECIAL_9, 14
-	setvar VAR_SPECIAL_A, 8
-	return
-
-LittlerootTown_EventScript_14D93C:: @ 814D93C
-	applymovement 4, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14D947:: @ 814D947
-	applymovement 4, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14D952:: @ 814D952
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14D9D8
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14D9ED
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DA02
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DA17
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DA2C
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DA41
-	return
-
-LittlerootTown_EventScript_14D995:: @ 814D995
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14D9D8
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14D9ED
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DA56
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DA6B
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DA80
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DA95
-	return
-
-LittlerootTown_EventScript_14D9D8:: @ 814D9D8
-	applymovement 255, LittlerootTown_Movement_1A0845
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC76
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14D9ED:: @ 814D9ED
-	applymovement 255, LittlerootTown_Movement_1A0845
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC7D
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA02:: @ 814DA02
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC84
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA17:: @ 814DA17
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC89
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA2C:: @ 814DA2C
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC8F
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA41:: @ 814DA41
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC92
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA56:: @ 814DA56
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC96
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA6B:: @ 814DA6B
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC9A
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA80:: @ 814DA80
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC9D
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA95:: @ 814DA95
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DCA3
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DAAA:: @ 814DAAA
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14DB30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14DB3B
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DB46
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DB6C
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DB92
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DBB8
-	return
-
-LittlerootTown_EventScript_14DAED:: @ 814DAED
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14DB30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14DB3B
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DBDE
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DC04
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DC2A
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DC50
-	return
-
-LittlerootTown_EventScript_14DB30:: @ 814DB30
-	applymovement 4, LittlerootTown_Movement_14DCA8
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DB3B:: @ 814DB3B
-	applymovement 4, LittlerootTown_Movement_14DCAE
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DB46:: @ 814DB46
-	applymovement 4, LittlerootTown_Movement_14DCB4
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DB6C:: @ 814DB6C
-	applymovement 4, LittlerootTown_Movement_14DCBA
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DB92:: @ 814DB92
-	applymovement 4, LittlerootTown_Movement_14DCC1
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DBB8:: @ 814DBB8
-	applymovement 4, LittlerootTown_Movement_14DCC5
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DBDE:: @ 814DBDE
-	applymovement 4, LittlerootTown_Movement_14DCCA
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DC04:: @ 814DC04
-	applymovement 4, LittlerootTown_Movement_14DCCF
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DC2A:: @ 814DC2A
-	applymovement 4, LittlerootTown_Movement_14DCD3
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DC50:: @ 814DC50
-	applymovement 4, LittlerootTown_Movement_14DCDA
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_Movement_14DC76:: @ 814DC76
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-LittlerootTown_Movement_14DC7D:: @ 814DC7D
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-LittlerootTown_Movement_14DC84:: @ 814DC84
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-LittlerootTown_Movement_14DC89:: @ 814DC89
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-LittlerootTown_Movement_14DC8F:: @ 814DC8F
-	walk_right
-	walk_right
-	end_movement
-
-LittlerootTown_Movement_14DC92:: @ 814DC92
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-LittlerootTown_Movement_14DC96:: @ 814DC96
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-LittlerootTown_Movement_14DC9A:: @ 814DC9A
-	walk_left
-	walk_left
-	end_movement
-
-LittlerootTown_Movement_14DC9D:: @ 814DC9D
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-LittlerootTown_Movement_14DCA3:: @ 814DCA3
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-LittlerootTown_Movement_14DCA8:: @ 814DCA8
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-LittlerootTown_Movement_14DCAE:: @ 814DCAE
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-LittlerootTown_Movement_14DCB4:: @ 814DCB4
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCBA:: @ 814DCBA
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCC1:: @ 814DCC1
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCC5:: @ 814DCC5
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCCA:: @ 814DCCA
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCCF:: @ 814DCCF
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCD3:: @ 814DCD3
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCDA:: @ 814DCDA
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-LittlerootTown_Movement_14DCE0:: @ 814DCE0
-	walk_up
-	end_movement
-
-LittlerootTown_EventScript_14DCE2:: @ 814DCE2
-	lock
-	faceplayer
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D926
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D931
-	call LittlerootTown_EventScript_14DD38
-	applymovement 4, LittlerootTown_Movement_1A0841
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	goto LittlerootTown_EventScript_14DD2B
-	end
-
-LittlerootTown_EventScript_14DD2B:: @ 814DD2B
-	removeobject 4
-	setflag FLAG_SYS_B_DASH
-	setvar VAR_LITTLEROOT_STATE, 4
-	release
-	end
-
-LittlerootTown_EventScript_14DD38:: @ 814DD38
-	msgbox LittlerootTown_Text_16A8FD, 4
-	playfanfare BGM_FANFA4
-	message LittlerootTown_Text_16AA32
-	waitfanfare
-	waitmessage
-	setflag FLAG_RECEIVED_RUNNING_SHOES
-	msgbox LittlerootTown_Text_16AA5C, 4
-	msgbox LittlerootTown_Text_16AB10, 4
-	closemessage
-	delay 30
-	return
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
deleted file mode 100644
index e716962b7..000000000
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ /dev/null
@@ -1,219 +0,0 @@
-LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
-	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_152A5B
-	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_152A86
-	.byte 0
-
-LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
-	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A
-	compare VAR_LITTLEROOT_INTRO_STATE, 4
-	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950
-	call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D
-	setvar VAR_0x4089, 0
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A
-	setobjectxyperm 1, 7, 2
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86
-	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90
-	.2byte 0
-
-LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
-	checkplayergender
-	compare RESULT, 1
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
-LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
-	lockall
-	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4
-	compare RESULT, 1
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A
-	playse SE_KAIDAN
-	removeobject LAST_TALKED
-	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
-	setvar VAR_LITTLEROOT_STATE, 1
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4
-	msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4
-	playbgm BGM_GIRL_SUP, TRUE
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4
-	closemessage
-	compare FACING, 4
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29
-	compare FACING, 2
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34
-	compare FACING, 3
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4
-	playbgm BGM_BOY_SUP, TRUE
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4
-	closemessage
-	compare FACING, 4
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
-	compare FACING, 2
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
-	compare FACING, 3
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
-	waitmovement 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB
-	compare RESULT, 1
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED
-	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
-	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
-	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BFF:: @ 8152BFF
-	msgbox LittlerootTown_BrendansHouse_2F_Text_173883, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	delay_8
-	end_movement
-
-LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	delay_8
-	end_movement
-
-LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	delay_8
-	end_movement
-
-LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	delay_8
-	end_movement
-
-gUnknown_08152C39:: @ 8152C39
-
-LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52
-	compare RESULT, 1
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
-	setvar VAR_SPECIAL_4, 2
-	special DoPCTurnOnEffect
-	playse SE_PC_ON
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
-	special BedroomPC
-	waitstate
-	releaseall
-	end
-
-gMayHouse_TurnPCOff:: @ 8152C75
-	setvar VAR_SPECIAL_4, 2
-	playse SE_PC_OFF
-	special DoPCTurnOffEffect
-	releaseall
-	end
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
deleted file mode 100644
index 6b2867f54..000000000
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ /dev/null
@@ -1,214 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82
-	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92
-	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D
-	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC
-	.byte 0
-
-LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A014E
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4
-	end
-
-LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D
-	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7
-	.2byte 0
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7
-	turnobject 255, 2
-	end
-
-LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC
-	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE
-	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A
-	.2byte 0
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
-	lockall
-	bufferleadmonspeciesname 0
-	message LittlerootTown_ProfessorBirchsLab_Text_173D94
-	waitmessage
-	playfanfare BGM_FANFA4
-	waitfanfare
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA
-	compare RESULT, NO
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA
-	setvar VAR_SPECIAL_4, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
-	compare RESULT, NO
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
-	clearflag FLAG_HIDE_BOY_ROUTE101
-	setvar VAR_BIRCH_LAB_STATE, 3
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
-	compare RESULT, NO
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A
-	lockall
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B
-	waitmovement 0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA
-	end
-
-LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
-	lock
-	faceplayer
-	compare VAR_BIRCH_LAB_STATE, 3
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90
-	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
-	setflag FLAG_BIRCH_AIDE_MET
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D86:: @ 8152D86
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
-	lock
-	faceplayer
-	goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
-	compare VAR_BIRCH_LAB_STATE, 5
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4
-	call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97
-	waitmovement 0
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843
-	waitmovement 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13
-	compare RESULT, 1
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40
-	setvar VAR_BIRCH_LAB_STATE, 5
-	setflag FLAG_ADVENTURE_STARTED
-	setvar VAR_ROUTE102_ACCESSIBLE, 1
-	setvar VAR_LITTLEROOT_RIVAL_STATE, 4
-	setvar VAR_LITTLEROOT_STATE, 3
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4
-	giveitem_std ITEM_POKE_BALL, 5
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4
-	setvar RESULT, 0
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4
-	giveitem_std ITEM_POKE_BALL, 5
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4
-	setvar RESULT, 1
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
-	playfanfare BGM_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_17422F
-	waitfanfare
-	waitmessage
-	setflag FLAG_SYS_POKEDEX_GET
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E85:: @ 8152E85
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97
-	walk_down
-	walk_in_place_fastest_left
-	end_movement
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3
-	lock
-	faceplayer
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE
-	compare RESULT, 1
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EBE:: @ 8152EBE
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EC7:: @ 8152EC7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152ED0:: @ 8152ED0
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, 3
-	end
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
deleted file mode 100644
index d415e7fc9..000000000
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
-	map_script 1, MossdeepCity_StevensHouse_MapScript1_15A9D5
-	map_script 3, MossdeepCity_StevensHouse_MapScript1_15A9E9
-	map_script 2, MossdeepCity_StevensHouse_MapScript2_15AA01
-	.byte 0
-
-MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
-	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF
-	end
-
-MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF
-	setmetatile 6, 4, 753, 1
-	return
-
-MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9
-	compare VAR_STEVENS_HOUSE_STATE, 1
-	call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5
-	end
-
-MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5
-	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 7
-	return
-
-MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01
-	map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B
-	.2byte 0
-
-MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
-	lockall
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833
-	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835
-	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E
-	waitmovement 0
-	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
-	giveitem_std ITEM_HM08_DIVE
-	setflag FLAG_RECEIVED_HM08
-	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
-	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
-	closemessage
-	delay 20
-	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76
-	waitmovement 0
-	setvar VAR_STEVENS_HOUSE_STATE, 1
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_in_place_fastest_down
-	end_movement
-
-MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
-	lockall
-	msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC
-	copyvar VAR_SPECIAL_4, RESULT
-	removeobject 2
-	playfanfare BGM_FANFA4
-	message MossdeepCity_StevensHouse_Text_18DD61
-	waitfanfare
-	waitmessage
-	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
-	bufferspeciesname 1, SPECIES_BELDUM
-	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
-	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	setflag FLAG_RECEIVED_BELDUM
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AADC:: @ 815AADC
-	msgbox MossdeepCity_StevensHouse_Text_18DD77, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AAE6:: @ 815AAE6
-	msgbox MossdeepCity_StevensHouse_Text_18DD9E, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AAF0:: @ 815AAF0
-	msgbox MossdeepCity_StevensHouse_Text_18E0A3, 3
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
-	msgbox MossdeepCity_StevensHouse_Text_18DC25, 2
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
-	lockall
-	goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16
-	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
-	msgbox MossdeepCity_StevensHouse_Text_18DDC2, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
-	giveitem_std ITEM_HM08_DIVE, 1, 1
-	setflag FLAG_RECEIVED_HM08
-	end
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
deleted file mode 100644
index 5385272b8..000000000
--- a/data/scripts/maps/OldaleTown.inc
+++ /dev/null
@@ -1,318 +0,0 @@
-OldaleTown_MapScripts:: @ 814DD62
-	map_script 3, OldaleTown_MapScript1_14DD68
-	.byte 0
-
-OldaleTown_MapScript1_14DD68:: @ 814DD68
-	call OldaleTown_EventScript_1A014E
-	setflag FLAG_VISITED_OLDALE_TOWN
-	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92
-	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E
-	call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C
-	end
-
-OldaleTown_EventScript_14DD8C:: @ 814DD8C
-	setvar VAR_ROUTE102_ACCESSIBLE, 1
-	return
-
-OldaleTown_EventScript_14DD92:: @ 814DD92
-	setobjectxyperm 3, 1, 11
-	setobjectmovementtype 3, 9
-	return
-
-OldaleTown_EventScript_14DD9E:: @ 814DD9E
-	setobjectxyperm 2, 13, 14
-	setobjectmovementtype 2, 8
-	return
-
-OldaleTown_EventScript_14DDAA:: @ 814DDAA
-	msgbox OldaleTown_Text_16B20E, 3
-	end
-
-OldaleTown_EventScript_14DDB3:: @ 814DDB3
-	msgbox OldaleTown_Text_16AEC0, 2
-	end
-
-OldaleTown_EventScript_14DDBC:: @ 814DDBC
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79
-	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79
-	setflag FLAG_TEMP_1
-	playbgm BGM_TSURETEK, FALSE
-	msgbox OldaleTown_Text_16AEF2, 4
-	closemessage
-	switch FACING
-	case 1, OldaleTown_EventScript_14DE07
-	case 2, OldaleTown_EventScript_14DE1E
-	case 4, OldaleTown_EventScript_14DE35
-	end
-
-OldaleTown_EventScript_14DE07:: @ 814DE07
-	applymovement 2, OldaleTown_Movement_14DE97
-	applymovement 255, OldaleTown_Movement_14DEC1
-	waitmovement 0
-	goto OldaleTown_EventScript_14DE4C
-	end
-
-OldaleTown_EventScript_14DE1E:: @ 814DE1E
-	applymovement 2, OldaleTown_Movement_14DEA2
-	applymovement 255, OldaleTown_Movement_14DECB
-	waitmovement 0
-	goto OldaleTown_EventScript_14DE4C
-	end
-
-OldaleTown_EventScript_14DE35:: @ 814DE35
-	applymovement 255, OldaleTown_Movement_14DEB9
-	applymovement 2, OldaleTown_Movement_14DE8E
-	waitmovement 0
-	goto OldaleTown_EventScript_14DE4C
-	end
-
-OldaleTown_EventScript_14DE4C:: @ 814DE4C
-	msgbox OldaleTown_Text_16AF2F, 4
-	giveitem_std ITEM_POTION
-	compare RESULT, 0
-	goto_if_eq OldaleTown_EventScript_14DE83
-	msgbox OldaleTown_Text_16AFE1, 4
-	setflag FLAG_RECEIVED_POTION_OLDALE
-	fadedefaultbgm
-	release
-	end
-
-OldaleTown_EventScript_14DE79:: @ 814DE79
-	msgbox OldaleTown_Text_16AFE1, 4
-	release
-	end
-
-OldaleTown_EventScript_14DE83:: @ 814DE83
-	msgbox OldaleTown_Text_1A0CC2, 4
-	fadedefaultbgm
-	release
-	end
-
-OldaleTown_Movement_14DE8E:: @ 814DE8E
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	end_movement
-
-OldaleTown_Movement_14DE97:: @ 814DE97
-	walk_left
-	walk_up
-	walk_up
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	end_movement
-
-OldaleTown_Movement_14DEA2:: @ 814DEA2
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_down
-	end_movement
-
-@ 814DEAB
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	delay_8
-	walk_in_place_fastest_down
-	end_movement
-
-OldaleTown_Movement_14DEB9:: @ 814DEB9
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-OldaleTown_Movement_14DEC1:: @ 814DEC1
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-OldaleTown_Movement_14DECB:: @ 814DECB
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-@ 814DED3
-	walk_left
-	walk_up
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-OldaleTown_EventScript_14DEDF:: @ 814DEDF
-	lock
-	faceplayer
-	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26
-	msgbox OldaleTown_Text_16B0CC, 4
-	closemessage
-	applymovement 3, OldaleTown_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-OldaleTown_EventScript_14DEFF:: @ 814DEFF
-	lockall
-	applymovement 255, OldaleTown_Movement_14DFEC
-	applymovement 3, OldaleTown_Movement_14DFEF
-	waitmovement 0
-	msgbox OldaleTown_Text_16B045, 4
-	closemessage
-	applymovement 3, OldaleTown_Movement_14DFF5
-	waitmovement 0
-	releaseall
-	end
-
-OldaleTown_EventScript_14DF26:: @ 814DF26
-	msgbox OldaleTown_Text_16B12A, 4
-	release
-	end
-
-OldaleTown_EventScript_14DF30:: @ 814DF30
-	lockall
-	applymovement 4, OldaleTown_Movement_1A0839
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF41:: @ 814DF41
-	lockall
-	applymovement 4, OldaleTown_Movement_14DFDE
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF5C:: @ 814DF5C
-	lockall
-	applymovement 4, OldaleTown_Movement_14DFE1
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF77:: @ 814DF77
-	lockall
-	applymovement 4, OldaleTown_Movement_14DFE3
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF92:: @ 814DF92
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq OldaleTown_EventScript_14DFAA
-	compare RESULT, 1
-	goto_if_eq OldaleTown_EventScript_14DFB8
-	end
-
-OldaleTown_EventScript_14DFAA:: @ 814DFAA
-	msgbox OldaleTown_Text_16B196, 4
-	goto OldaleTown_EventScript_14DFC6
-	end
-
-OldaleTown_EventScript_14DFB8:: @ 814DFB8
-	msgbox OldaleTown_Text_16B1BE, 4
-	goto OldaleTown_EventScript_14DFC6
-	end
-
-OldaleTown_EventScript_14DFC6:: @ 814DFC6
-	closemessage
-	applymovement 4, OldaleTown_Movement_14DFE5
-	waitmovement 0
-	removeobject 4
-	setvar VAR_OLDALE_STATE, 2
-	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	releaseall
-	end
-
-OldaleTown_Movement_14DFDE:: @ 814DFDE
-	walk_left
-	walk_left
-	end_movement
-
-OldaleTown_Movement_14DFE1:: @ 814DFE1
-	walk_left
-	end_movement
-
-OldaleTown_Movement_14DFE3:: @ 814DFE3
-	face_left
-	end_movement
-
-OldaleTown_Movement_14DFE5:: @ 814DFE5
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-OldaleTown_Movement_14DFEC:: @ 814DFEC
-	delay_8
-	walk_right
-	end_movement
-
-OldaleTown_Movement_14DFEF:: @ 814DFEF
-	walk_fast_up
-	walk_in_place_fastest_left
-	lock_facing_direction
-	walk_right
-	unlock_facing_direction
-	end_movement
-
-OldaleTown_Movement_14DFF5:: @ 814DFF5
-	walk_down
-	walk_left
-	end_movement
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
deleted file mode 100644
index 03013f66c..000000000
--- a/data/scripts/maps/PetalburgCity.inc
+++ /dev/null
@@ -1,428 +0,0 @@
-PetalburgCity_MapScripts:: @ 814B70C
-	map_script 3, PetalburgCity_MapScript1_14B717
-	map_script 2, PetalburgCity_MapScript2_14B73D
-	.byte 0
-
-PetalburgCity_MapScript1_14B717:: @ 814B717
-	setflag FLAG_VISITED_PETALBURG_CITY
-	compare VAR_PETALBURG_STATE, 0
-	call_if_eq PetalburgCity_EventScript_14B731
-	compare VAR_PETALBURG_STATE, 2
-	call_if_eq PetalburgCity_EventScript_14B739
-	end
-
-PetalburgCity_EventScript_14B731:: @ 814B731
-	setobjectxyperm 9, 5, 11
-	return
-
-PetalburgCity_EventScript_14B739:: @ 814B739
-	savebgm BGM_TSURETEK
-	return
-
-PetalburgCity_MapScript2_14B73D:: @ 814B73D
-	map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747
-	.2byte 0
-
-PetalburgCity_EventScript_14B747:: @ 814B747
-	lockall
-	setflag FLAG_SPECIAL_FLAG_0
-	special SavePlayerParty
-	special PutZigzagoonInPlayerParty
-	applymovement 2, PetalburgCity_Movement_14B7ED
-	applymovement 255, PetalburgCity_Movement_14B7CC
-	waitmovement 0
-	msgbox PetalburgCity_Text_16D361, 4
-	special ScrSpecial_StartWallyTutorialBattle
-	waitstate
-	msgbox PetalburgCity_Text_16D3DE, 4
-	applymovement 2, PetalburgCity_Movement_1A083F, 0, 0
-	waitmovement 0, 0, 2
-	msgbox PetalburgCity_Text_16D408, 4
-	closemessage
-	clearflag FLAG_SPECIAL_FLAG_0
-	setvar VAR_PETALBURG_STATE, 3
-	fadedefaultbgm
-	clearflag FLAG_SPECIAL_FLAG_1
-	special LoadPlayerParty
-	setvar VAR_PETALBURG_GYM_STATE, 1
-	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
-	waitstate
-	releaseall
-	end
-
-PetalburgCity_EventScript_14B7AC:: @ 814B7AC
-	lock
-	faceplayer
-	msgbox PetalburgCity_Text_164490, 4
-	closemessage
-	applymovement 3, PetalburgCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-PetalburgCity_EventScript_14B7C3:: @ 814B7C3
-	msgbox PetalburgCity_Text_16433E, 2
-	end
-
-PetalburgCity_Movement_14B7CC:: @ 814B7CC
-	delay_8
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_in_place_fastest_right
-	end_movement
-
-PetalburgCity_Movement_14B7ED:: @ 814B7ED
-	delay_8
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_right
-	delay_16
-	walk_in_place_fastest_up
-	delay_16
-	delay_16
-	walk_in_place_fastest_right
-	end_movement
-
-PetalburgCity_EventScript_14B812:: @ 814B812
-	msgbox PetalburgCity_Text_1645BB, 3
-	end
-
-PetalburgCity_EventScript_14B81B:: @ 814B81B
-	msgbox PetalburgCity_Text_164602, 3
-	end
-
-PetalburgCity_EventScript_14B824:: @ 814B824
-	msgbox PetalburgCity_Text_16453F, 2
-	end
-
-PetalburgCity_EventScript_14B82D:: @ 814B82D
-	msgbox PetalburgCity_Text_164634, 3
-	end
-
-PetalburgCity_EventScript_14B836:: @ 814B836
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B842:: @ 814B842
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B84E:: @ 814B84E
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B85A:: @ 814B85A
-	lockall
-	setvar VAR_SPECIAL_8, 3
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B866:: @ 814B866
-	applymovement 9, PetalburgCity_Movement_1A0839
-	waitmovement 0
-	playbgm BGM_TSURETEK, FALSE
-	playse SE_PIN
-	applymovement 9, PetalburgCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, PetalburgCity_Movement_1A0835
-	waitmovement 0
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_EventScript_14B91B
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_EventScript_14B930
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_EventScript_14B93B
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_EventScript_14B950
-	msgbox PetalburgCity_Text_16438A, 4
-	closemessage
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_EventScript_14B965
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_EventScript_14B977
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_EventScript_14B989
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_EventScript_14B99B
-	msgbox PetalburgCity_Text_164426, 4
-	applymovement 9, PetalburgCity_Movement_1A0843
-	applymovement 255, PetalburgCity_Movement_1A0843
-	waitmovement 0
-	msgbox PetalburgCity_Text_164449, 4
-	closemessage
-	applymovement 9, PetalburgCity_Movement_14B9F4
-	waitmovement 0
-	fadedefaultbgm
-	releaseall
-	end
-
-PetalburgCity_EventScript_14B91B:: @ 814B91B
-	applymovement 9, PetalburgCity_Movement_14B9B1
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B930:: @ 814B930
-	applymovement 9, PetalburgCity_Movement_14B9B6
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B93B:: @ 814B93B
-	applymovement 9, PetalburgCity_Movement_14B9B9
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B950:: @ 814B950
-	applymovement 9, PetalburgCity_Movement_14B9BE
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B965:: @ 814B965
-	applymovement 9, PetalburgCity_Movement_14B9C4
-	applymovement 255, PetalburgCity_Movement_14BA01
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B977:: @ 814B977
-	applymovement 9, PetalburgCity_Movement_14B9CF
-	applymovement 255, PetalburgCity_Movement_14BA0B
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B989:: @ 814B989
-	applymovement 9, PetalburgCity_Movement_14B9DD
-	applymovement 255, PetalburgCity_Movement_14BA18
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B99B:: @ 814B99B
-	applymovement 9, PetalburgCity_Movement_14B9E8
-	applymovement 255, PetalburgCity_Movement_14BA22
-	waitmovement 0
-	return
-
-@ 814B9AD
-	delay_16
-	delay_16
-	delay_16
-	end_movement
-
-PetalburgCity_Movement_14B9B1:: @ 814B9B1
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-PetalburgCity_Movement_14B9B6:: @ 814B9B6
-	walk_right
-	walk_right
-	end_movement
-
-PetalburgCity_Movement_14B9B9:: @ 814B9B9
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	end_movement
-
-PetalburgCity_Movement_14B9BE:: @ 814B9BE
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_down
-	end_movement
-
-PetalburgCity_Movement_14B9C4:: @ 814B9C4
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-PetalburgCity_Movement_14B9CF:: @ 814B9CF
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-PetalburgCity_Movement_14B9DD:: @ 814B9DD
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-PetalburgCity_Movement_14B9E8:: @ 814B9E8
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-PetalburgCity_Movement_14B9F4:: @ 814B9F4
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-PetalburgCity_Movement_14BA01:: @ 814BA01
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	end_movement
-
-PetalburgCity_Movement_14BA0B:: @ 814BA0B
-	delay_16
-	delay_16
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	end_movement
-
-PetalburgCity_Movement_14BA18:: @ 814BA18
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	end_movement
-
-PetalburgCity_Movement_14BA22:: @ 814BA22
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_up
-	walk_up
-	end_movement
-
-PetalburgCity_EventScript_14BA2D:: @ 814BA2D
-	msgbox PetalburgCity_Text_16438A, 2
-	end
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
deleted file mode 100644
index 259d59390..000000000
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ /dev/null
@@ -1,1027 +0,0 @@
-PetalburgCity_Gym_MapScripts:: @ 8154477
-	map_script 1, PetalburgCity_Gym_MapScript1_15448C
-	map_script 3, PetalburgCity_Gym_MapScript1_15451B
-	map_script 4, PetalburgCity_Gym_MapScript2_154553
-	map_script 2, PetalburgCity_Gym_MapScript2_154562
-	.byte 0
-
-PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
-	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if_eq PetalburgCity_Gym_EventScript_1544A3
-	compare VAR_PETALBURG_GYM_STATE, 7
-	call_if_ge PetalburgCity_Gym_EventScript_1544ED
-	end
-
-PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3
-	setvar VAR_SPECIAL_5, 1
-	call PetalburgCity_Gym_EventScript_154F9A
-	call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB
-	call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC
-	call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD
-	call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E
-	call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F
-	call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060
-	call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081
-	end
-
-PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
-	setvar VAR_SPECIAL_5, 1
-	call PetalburgCity_Gym_EventScript_154F9A
-	call PetalburgCity_Gym_EventScript_154FBB
-	call PetalburgCity_Gym_EventScript_154FDC
-	call PetalburgCity_Gym_EventScript_154FFD
-	call PetalburgCity_Gym_EventScript_15501E
-	call PetalburgCity_Gym_EventScript_15503F
-	call PetalburgCity_Gym_EventScript_155060
-	call PetalburgCity_Gym_EventScript_155081
-	return
-
-PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
-	compare VAR_PETALBURG_GYM_STATE, 1
-	call_if_eq PetalburgCity_Gym_EventScript_15453B
-	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_lt PetalburgCity_Gym_EventScript_154543
-	call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B
-	end
-
-PetalburgCity_Gym_EventScript_15453B:: @ 815453B
-	setobjectxyperm 10, 5, 108
-	return
-
-PetalburgCity_Gym_EventScript_154543:: @ 8154543
-	setobjectxyperm 1, 4, 107
-	return
-
-PetalburgCity_Gym_EventScript_15454B:: @ 815454B
-	setobjectxyperm 1, 4, 107
-	return
-
-PetalburgCity_Gym_MapScript2_154553:: @ 8154553
-	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D
-	.2byte 0
-
-PetalburgCity_Gym_EventScript_15455D:: @ 815455D
-	turnobject 255, 2
-	end
-
-PetalburgCity_Gym_MapScript2_154562:: @ 8154562
-	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C
-	.2byte 0
-
-PetalburgCity_Gym_EventScript_15456C:: @ 815456C
-	lockall
-	msgbox PetalburgCity_Gym_Text_17A196, 4
-	msgbox PetalburgCity_Gym_Text_17A1B0, 4
-	closemessage
-	applymovement 255, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_1545B4
-	waitmovement 0
-	playse SE_KAIDAN
-	removeobject 10
-	setflag FLAG_HIDE_WALLY_PETALBURG
-	delay 30
-	applymovement 255, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgCity_Gym_Text_17A2A4, 4
-	setvar VAR_PETALBURG_GYM_STATE, 2
-	releaseall
-	end
-
-PetalburgCity_Gym_Movement_1545B4:: @ 81545B4
-	walk_down
-	walk_down
-	walk_down
-	delay_16
-	end_movement
-
-PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
-	lock
-	faceplayer
-	switch VAR_PETALBURG_GYM_STATE
-	case 2, PetalburgCity_Gym_EventScript_154907
-	case 3, PetalburgCity_Gym_EventScript_154911
-	case 4, PetalburgCity_Gym_EventScript_15491B
-	case 5, PetalburgCity_Gym_EventScript_154925
-	case 6, PetalburgCity_Gym_EventScript_1549D6
-	case 7, PetalburgCity_Gym_EventScript_15493D
-	msgbox PetalburgCity_Gym_Text_179DF6, 4
-	closemessage
-	switch FACING
-	case 1, PetalburgCity_Gym_EventScript_15463D
-	case 2, PetalburgCity_Gym_EventScript_154648
-	case 3, PetalburgCity_Gym_EventScript_154653
-	case 4, PetalburgCity_Gym_EventScript_15465E
-	end
-
-PetalburgCity_Gym_EventScript_15463D:: @ 815463D
-	setvar VAR_SPECIAL_8, 0
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_154648:: @ 8154648
-	setvar VAR_SPECIAL_8, 1
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_154653:: @ 8154653
-	setvar VAR_SPECIAL_8, 2
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_15465E:: @ 815465E
-	setvar VAR_SPECIAL_8, 3
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_154669:: @ 8154669
-	addobject 10
-	playse SE_DOOR
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_1547EE
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154800
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_15481C
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_15481C
-	msgbox PetalburgCity_Gym_Text_179F07, 4
-	msgbox PetalburgCity_Gym_Text_179F37, 4
-	msgbox PetalburgCity_Gym_Text_179F70, 4
-	msgbox PetalburgCity_Gym_Text_17A03A, 4
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_154884
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_15488F
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_1548A1
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_1548B3
-	msgbox PetalburgCity_Gym_Text_17A04A, 4
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_1548C5
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_1548D0
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_1548DB
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_1548E6
-	msgbox PetalburgCity_Gym_Text_17A0A8, 4
-	msgbox PetalburgCity_Gym_Text_17A0EB, 4
-	msgbox PetalburgCity_Gym_Text_17A156, 4
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_15492F
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154930
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_15493B
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_15493C
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_1548F1
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_1548FC
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_1548F1
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_1548F1
-	msgbox PetalburgCity_Gym_Text_17A171, 4
-	closemessage
-	setflag FLAG_SPECIAL_FLAG_1
-	playbgm BGM_TSURETEK, FALSE
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_154835
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_15484E
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_154860
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_154872
-	removeobject 10
-	setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1
-	setvar VAR_PETALBURG_GYM_STATE, 1
-	setvar VAR_PETALBURG_STATE, 2
-	clearflag FLAG_HIDE_WALLY_PETALBURG
-	clearflag FLAG_HIDE_WALLY_PETALBURG_GYM
-	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
-	special InitBirchState
-	warp MAP_PETALBURG_CITY, 255, 15, 8
-	waitstate
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_154B27
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154800:: @ 8154800
-	applymovement 10, PetalburgCity_Gym_Movement_154B1D
-	waitmovement 0
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	applymovement 255, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15481C:: @ 815481C
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 255, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_154B27
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154835:: @ 8154835
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_154B3E
-	applymovement 255, PetalburgCity_Gym_Movement_154B4D
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15484E:: @ 815484E
-	applymovement 10, PetalburgCity_Gym_Movement_154B2E
-	applymovement 255, PetalburgCity_Gym_Movement_154B45
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154860:: @ 8154860
-	applymovement 10, PetalburgCity_Gym_Movement_154B3E
-	applymovement 255, PetalburgCity_Gym_Movement_154B57
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154872:: @ 8154872
-	applymovement 10, PetalburgCity_Gym_Movement_154B36
-	applymovement 255, PetalburgCity_Gym_Movement_154B5F
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154884:: @ 8154884
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15488F:: @ 815488F
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 255, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	applymovement 255, PetalburgCity_Gym_Movement_1A083F
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
-	applymovement 255, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1
-	applymovement 10, PetalburgCity_Gym_Movement_1A0839
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC
-	applymovement 10, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154907:: @ 8154907
-	msgbox PetalburgCity_Gym_Text_17A41E, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154911:: @ 8154911
-	msgbox PetalburgCity_Gym_Text_17A518, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_15491B:: @ 815491B
-	msgbox PetalburgCity_Gym_Text_17A5F3, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154925:: @ 8154925
-	msgbox PetalburgCity_Gym_Text_17A5F3, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_15492F:: @ 815492F
-	return
-
-PetalburgCity_Gym_EventScript_154930:: @ 8154930
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15493B:: @ 815493B
-	return
-
-PetalburgCity_Gym_EventScript_15493C:: @ 815493C
-	return
-
-PetalburgCity_Gym_EventScript_15493D:: @ 815493D
-	call PetalburgCity_Gym_EventScript_154969
-	compare RESULT, 1
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
-	goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C
-	goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69
-	msgbox PetalburgCity_Gym_Text_17AA6B, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154969:: @ 8154969
-	specialvar RESULT, IsEnigmaBerryValid
-	compare RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	checkitem ITEM_ENIGMA_BERRY, 1
-	compare RESULT, 1
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	checkpcitem ITEM_ENIGMA_BERRY, 1
-	compare RESULT, 1
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	msgbox PetalburgCity_Gym_Text_1C5570, 4
-	setvar RESULT, 1
-	return
-
-PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2
-	setvar RESULT, 0
-	return
-
-PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8
-	giveitem_std ITEM_ENIGMA_BERRY
-	compare RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
-	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
-	msgbox PetalburgCity_Gym_Text_17A653, 4
-	trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A
-	message PetalburgCity_Gym_Text_17A7DD
-	waitmessage
-	call PetalburgCity_Gym_EventScript_1A02C5
-	msgbox PetalburgCity_Gym_Text_17A805, 4
-	setflag FLAG_DEFEATED_PETALBURG_GYM
-	setvar VAR_PETALBURG_GYM_STATE, 7
-	setflag FLAG_BADGE05_GET
-	call PetalburgCity_Gym_EventScript_1A0424
-	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
-	clearflag FLAG_HIDE_WATTSON_MAUVILLE
-	setvar VAR_SPECIAL_8, 5
-	call PetalburgCity_Gym_EventScript_1A01C0
-	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
-	call PetalburgCity_Gym_EventScript_1544ED
-	special DrawWholeMapView
-	goto PetalburgCity_Gym_EventScript_154A2C
-	end
-
-PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
-	giveitem_std ITEM_TM42_FACADE
-	compare RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
-	setflag FLAG_RECEIVED_TM42
-	msgbox PetalburgCity_Gym_Text_17A8CF, 4
-	msgbox PetalburgCity_Gym_Text_17A976, 4
-	closemessage
-	compare FACING, 2
-	call_if_eq PetalburgCity_Gym_EventScript_154ABC
-	compare FACING, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154AC7
-	compare FACING, 3
-	call_if_eq PetalburgCity_Gym_EventScript_154AD2
-	compare FACING, 4
-	call_if_eq PetalburgCity_Gym_EventScript_154ADD
-	delay 70
-	compare FACING, 2
-	call_if_eq PetalburgCity_Gym_EventScript_154AE8
-	compare FACING, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154AF3
-	compare FACING, 3
-	call_if_eq PetalburgCity_Gym_EventScript_154AFE
-	compare FACING, 4
-	call_if_eq PetalburgCity_Gym_EventScript_154B09
-	msgbox PetalburgCity_Gym_Text_17A9F6, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
-	waitmovement 0
-	return
-
-@ 8154B14
-	walk_in_place_fastest_up
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_8
-	walk_in_place_fastest_down
-	end_movement
-
-PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
-	delay_16
-	walk_up
-	delay_16
-	delay_8
-	walk_up
-	walk_right
-	walk_up
-	walk_up
-	walk_in_place_fastest_left
-	end_movement
-
-PetalburgCity_Gym_Movement_154B27:: @ 8154B27
-	delay_16
-	walk_up
-	delay_16
-	delay_8
-	walk_up
-	walk_up
-	end_movement
-
-PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_down
-	end_movement
-
-PetalburgCity_Gym_Movement_154B36:: @ 8154B36
-	walk_down
-	walk_down
-	walk_right
-	walk_down
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_down
-	end_movement
-
-PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_down
-	end_movement
-
-PetalburgCity_Gym_Movement_154B45:: @ 8154B45
-	delay_16
-	delay_16
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	delay_8
-	end_movement
-
-PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D
-	delay_16
-	delay_16
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	delay_8
-	end_movement
-
-PetalburgCity_Gym_Movement_154B57:: @ 8154B57
-	delay_16
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	delay_8
-	end_movement
-
-PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F
-	walk_in_place_fastest_down
-	delay_16
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_down
-	delay_8
-	end_movement
-
-PetalburgCity_Gym_EventScript_154B69:: @ 8154B69
-	msgbox PetalburgCity_Gym_Text_17AB17, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154B73:: @ 8154B73
-	lockall
-	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 85
-	msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8
-	closemessage
-	delay 30
-	warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777
-	waitstate
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_154BB7:: @ 8154BB7
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9
-	msgbox PetalburgCity_Gym_Text_17B844, 4
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
-	lockall
-	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 98
-	msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 46
-	msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 59
-	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 59
-	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 72
-	msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 20
-	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 20
-	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 33
-	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 33
-	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 7
-	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 7
-	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
-	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29
-	msgbox PetalburgCity_Gym_Text_17AE30, 6
-	end
-
-PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_154FBB
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
-	msgbox PetalburgCity_Gym_Text_17AEBB, 2
-	end
-
-PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
-	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65
-	msgbox PetalburgCity_Gym_Text_17AFD3, 6
-	end
-
-PetalburgCity_Gym_EventScript_154E56:: @ 8154E56
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_154FFD
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
-	msgbox PetalburgCity_Gym_Text_17B016, 2
-	end
-
-PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
-	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1
-	msgbox PetalburgCity_Gym_Text_17B12C, 6
-	end
-
-PetalburgCity_Gym_EventScript_154E92:: @ 8154E92
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_15503F
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
-	msgbox PetalburgCity_Gym_Text_17B1F4, 2
-	end
-
-PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
-	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD
-	msgbox PetalburgCity_Gym_Text_17B2E4, 6
-	end
-
-PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_155081
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
-	msgbox PetalburgCity_Gym_Text_17B39B, 2
-	end
-
-PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
-	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19
-	msgbox PetalburgCity_Gym_Text_17B46F, 6
-	end
-
-PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_154FDC
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
-	msgbox PetalburgCity_Gym_Text_17B521, 2
-	end
-
-PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
-	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55
-	msgbox PetalburgCity_Gym_Text_17B5EA, 6
-	end
-
-PetalburgCity_Gym_EventScript_154F46:: @ 8154F46
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_15501E
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
-	msgbox PetalburgCity_Gym_Text_17B6B5, 2
-	end
-
-PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
-	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91
-	msgbox PetalburgCity_Gym_Text_17B749, 6
-	end
-
-PetalburgCity_Gym_EventScript_154F82:: @ 8154F82
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_155060
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154F91:: @ 8154F91
-	msgbox PetalburgCity_Gym_Text_17B7C0, 2
-	end
-
-PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A
-	setvar VAR_SPECIAL_4, 1
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_1550A2
-	return
-
-PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB
-	setvar VAR_SPECIAL_4, 2
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_1550C7
-	return
-
-PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC
-	setvar VAR_SPECIAL_4, 3
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_1550EC
-	return
-
-PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD
-	setvar VAR_SPECIAL_4, 4
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_155111
-	return
-
-PetalburgCity_Gym_EventScript_15501E:: @ 815501E
-	setvar VAR_SPECIAL_4, 5
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_155124
-	return
-
-PetalburgCity_Gym_EventScript_15503F:: @ 815503F
-	setvar VAR_SPECIAL_4, 6
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_155149
-	return
-
-PetalburgCity_Gym_EventScript_155060:: @ 8155060
-	setvar VAR_SPECIAL_4, 7
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_15515C
-	return
-
-PetalburgCity_Gym_EventScript_155081:: @ 8155081
-	setvar VAR_SPECIAL_4, 8
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_15516F
-	return
-
-PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2
-	setmetatile 6, 85, 528, 0
-	setmetatile 7, 85, 529, 0
-	setmetatile 1, 98, 528, 0
-	setmetatile 2, 98, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7
-	setmetatile 6, 46, 528, 0
-	setmetatile 7, 46, 529, 0
-	setmetatile 1, 59, 528, 0
-	setmetatile 2, 59, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC
-	setmetatile 6, 59, 528, 0
-	setmetatile 7, 59, 529, 0
-	setmetatile 1, 72, 528, 0
-	setmetatile 2, 72, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155111:: @ 8155111
-	setmetatile 1, 20, 528, 0
-	setmetatile 2, 20, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155124:: @ 8155124
-	setmetatile 6, 20, 528, 0
-	setmetatile 7, 20, 529, 0
-	setmetatile 1, 33, 528, 0
-	setmetatile 2, 33, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155149:: @ 8155149
-	setmetatile 6, 33, 528, 0
-	setmetatile 7, 33, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_15515C:: @ 815515C
-	setmetatile 1, 7, 528, 0
-	setmetatile 2, 7, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_15516F:: @ 815516F
-	setmetatile 6, 7, 528, 0
-	setmetatile 7, 7, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155182:: @ 8155182
-	special PetalburgGymSlideOpenDoors
-	waitstate
-	return
-
-PetalburgCity_Gym_EventScript_155187:: @ 8155187
-	special PetalburgGymOpenDoorsInstantly
-	return
-
-PetalburgCity_Gym_EventScript_15518B:: @ 815518B
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0
-	msgbox PetalburgCity_Gym_Text_17AB96, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
-	msgbox PetalburgCity_Gym_Text_17AD49, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
-	lockall
-	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
-	goto PetalburgCity_Gym_EventScript_1551D4
-	end
-
-PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
-	lockall
-	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
-	goto PetalburgCity_Gym_EventScript_1551D4
-	end
-
-PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA
-	msgbox PetalburgCity_Gym_Text_17BAC0, 4
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4
-	msgbox PetalburgCity_Gym_Text_17BAA5, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
deleted file mode 100644
index 1d5fbeaf2..000000000
--- a/data/scripts/maps/PetalburgWoods.inc
+++ /dev/null
@@ -1,282 +0,0 @@
-PetalburgWoods_MapScripts:: @ 815CC9C
-	map_script 3, PetalburgWoods_MapScript1_15CCA2
-	.byte 0
-
-PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2
-	call PetalburgWoods_EventScript_1A0196
-	end
-
-PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
-	lockall
-	call PetalburgWoods_EventScript_15CDE6
-	applymovement 4, PetalburgWoods_Movement_15CE89
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194D92, 4
-	closemessage
-	playbgm BGM_EVIL_TEAM, FALSE
-	applymovement 3, PetalburgWoods_Movement_15CEC3
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194DED, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_15CEB0
-	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E6B, 4
-	closemessage
-	applymovement 4, PetalburgWoods_Movement_15CE9E
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E9A, 4
-	applymovement 3, PetalburgWoods_Movement_15CEC8
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
-	applymovement 3, PetalburgWoods_Movement_15CEB3
-	waitmovement 0
-	call PetalburgWoods_EventScript_15CDFA
-	applymovement 4, PetalburgWoods_Movement_15CE80
-	waitmovement 0
-	goto PetalburgWoods_EventScript_15CE69
-	end
-
-PetalburgWoods_EventScript_15CD42:: @ 815CD42
-	lockall
-	call PetalburgWoods_EventScript_15CDE6
-	applymovement 4, PetalburgWoods_Movement_15CE8E
-	waitmovement 0
-	applymovement 255, PetalburgWoods_Movement_1A083F
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194D92, 4
-	closemessage
-	playbgm BGM_EVIL_TEAM, FALSE
-	applymovement 3, PetalburgWoods_Movement_15CEC3
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194DED, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_15CEBF
-	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E6B, 4
-	closemessage
-	applymovement 4, PetalburgWoods_Movement_15CEA4
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E9A, 4
-	applymovement 255, PetalburgWoods_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
-	applymovement 3, PetalburgWoods_Movement_15CEB3
-	waitmovement 0
-	call PetalburgWoods_EventScript_15CDFA
-	applymovement 4, PetalburgWoods_Movement_15CE95
-	waitmovement 0
-	goto PetalburgWoods_EventScript_15CE69
-	end
-
-PetalburgWoods_EventScript_15CDE6:: @ 815CDE6
-	applymovement 4, PetalburgWoods_Movement_15CE73
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194D71, 4
-	closemessage
-	return
-
-PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
-	msgbox PetalburgWoods_Text_194FA4, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_15CEB7
-	waitmovement 0
-	removeobject 3
-	applymovement 255, PetalburgWoods_Movement_1A0845
-	waitmovement 0
-	msgbox PetalburgWoods_Text_19507E, 4
-	giveitem_std ITEM_GREAT_BALL
-	compare RESULT, 0
-	goto_if_eq PetalburgWoods_EventScript_15CE3F
-	goto PetalburgWoods_EventScript_15CE4D
-	end
-
-PetalburgWoods_EventScript_15CE3F:: @ 815CE3F
-	msgbox PetalburgWoods_Text_195182, 4
-	goto PetalburgWoods_EventScript_15CE4D
-	end
-
-PetalburgWoods_EventScript_15CE4D:: @ 815CE4D
-	msgbox PetalburgWoods_Text_19510A, 4
-	applymovement 4, PetalburgWoods_Movement_15CEA8
-	waitmovement 0
-	msgbox PetalburgWoods_Text_195153, 4
-	closemessage
-	return
-
-PetalburgWoods_EventScript_15CE69:: @ 815CE69
-	removeobject 4
-	setvar VAR_PETALBURG_WOODS_STATE, 1
-	releaseall
-	end
-
-PetalburgWoods_Movement_15CE73:: @ 815CE73
-	face_up
-	delay_16
-	face_right
-	delay_16
-	face_left
-	delay_16
-	face_down
-	delay_16
-	face_right
-	delay_16
-	face_up
-	delay_16
-	end_movement
-
-PetalburgWoods_Movement_15CE80:: @ 815CE80
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-PetalburgWoods_Movement_15CE89:: @ 815CE89
-	delay_16
-	face_player
-	walk_down
-	walk_down
-	end_movement
-
-PetalburgWoods_Movement_15CE8E:: @ 815CE8E
-	delay_16
-	face_player
-	walk_down
-	walk_down
-	walk_down
-	walk_in_place_fastest_right
-	end_movement
-
-PetalburgWoods_Movement_15CE95:: @ 815CE95
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-PetalburgWoods_Movement_15CE9E:: @ 815CE9E
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_in_place_fastest_up
-	end_movement
-
-PetalburgWoods_Movement_15CEA4:: @ 815CEA4
-	walk_fast_down
-	walk_fast_right
-	walk_in_place_fastest_up
-	end_movement
-
-PetalburgWoods_Movement_15CEA8:: @ 815CEA8
-	walk_in_place_fastest_down
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	face_up
-	end_movement
-
-PetalburgWoods_Movement_15CEB0:: @ 815CEB0
-	walk_fast_down
-	walk_fast_down
-	end_movement
-
-PetalburgWoods_Movement_15CEB3:: @ 815CEB3
-	lock_facing_direction
-	walk_up
-	unlock_facing_direction
-	end_movement
-
-PetalburgWoods_Movement_15CEB7:: @ 815CEB7
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	delay_16
-	delay_16
-	end_movement
-
-PetalburgWoods_Movement_15CEBF:: @ 815CEBF
-	walk_fast_down
-	walk_fast_down
-	walk_fast_down
-	end_movement
-
-PetalburgWoods_Movement_15CEC3:: @ 815CEC3
-	walk_down
-	walk_down
-	delay_16
-	delay_16
-	end_movement
-
-PetalburgWoods_Movement_15CEC8:: @ 815CEC8
-	walk_down
-	end_movement
-
-PetalburgWoods_EventScript_15CECA:: @ 815CECA
-	msgbox PetalburgWoods_Text_1953AC, 2
-	end
-
-PetalburgWoods_EventScript_15CED3:: @ 815CED3
-	msgbox PetalburgWoods_Text_19542B, 2
-	end
-
-PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B
-	msgbox PetalburgWoods_Text_19549E, 4
-	giveitem_std ITEM_MIRACLE_SEED
-	compare RESULT, 0
-	goto_if_eq PetalburgWoods_EventScript_1A029B
-	setflag FLAG_RECEIVED_MIRACLE_SEED
-	release
-	end
-
-PetalburgWoods_EventScript_15CF0B:: @ 815CF0B
-	msgbox PetalburgWoods_Text_195503, 4
-	release
-	end
-
-PetalburgWoods_EventScript_15CF15:: @ 815CF15
-	msgbox PetalburgWoods_Text_1955B0, 3
-	end
-
-PetalburgWoods_EventScript_15CF1E:: @ 815CF1E
-	msgbox PetalburgWoods_Text_1956A6, 3
-	end
-
-PetalburgWoods_EventScript_15CF27:: @ 815CF27
-	trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202
-	msgbox PetalburgWoods_Text_195232, 6
-	end
-
-PetalburgWoods_EventScript_15CF3E:: @ 815CF3E
-	trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq PetalburgWoods_EventScript_15CF65
-	msgbox PetalburgWoods_Text_1952CC, 6
-	end
-
-PetalburgWoods_EventScript_15CF65:: @ 815CF65
-	trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338
-	msgbox PetalburgWoods_Text_195356, 6
-	end
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
deleted file mode 100644
index a4af7ceb4..000000000
--- a/data/scripts/maps/Route101.inc
+++ /dev/null
@@ -1,246 +0,0 @@
-Route101_MapScripts:: @ 814E924
-	map_script 3, Route101_MapScript1_14E92F
-	map_script 2, Route101_MapScript2_14E935
-	.byte 0
-
-Route101_MapScript1_14E92F:: @ 814E92F
-	call Route101_EventScript_1A02F4
-	end
-
-Route101_MapScript2_14E935:: @ 814E935
-	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F
-	.2byte 0
-
-Route101_EventScript_14E93F:: @ 814E93F
-	setflag FLAG_SPECIAL_FLAG_0
-	setvar VAR_ROUTE101_STATE, 1
-	end
-
-Route101_EventScript_14E948:: @ 814E948
-	lockall
-	playbgm BGM_EVENT0, TRUE
-	msgbox Route101_Text_16D10E, 4
-	closemessage
-	setobjectxy 2, 0, 15
-	setobjectxy 4, 0, 16
-	applymovement 255, Route101_Movement_14EA2C
-	applymovement 2, Route101_Movement_14EA50
-	applymovement 4, Route101_Movement_14EA1F
-	waitmovement 0
-	applymovement 4, Route101_Movement_14EA00
-	applymovement 2, Route101_Movement_14EA31
-	waitmovement 0
-	applymovement 2, Route101_Movement_1A0843
-	waitmovement 0
-	applymovement 4, Route101_Movement_14EA27
-	applymovement 2, Route101_Movement_14EA58
-	waitmovement 0
-	msgbox Route101_Text_16D119, 4
-	closemessage
-	setvar VAR_ROUTE101_STATE, 2
-	releaseall
-	end
-
-Route101_EventScript_14E9B8:: @ 814E9B8
-	lockall
-	msgbox Route101_Text_16D15E, 4
-	closemessage
-	applymovement 255, Route101_Movement_14E9FA
-	waitmovement 0
-	releaseall
-	end
-
-Route101_EventScript_14E9CE:: @ 814E9CE
-	lockall
-	msgbox Route101_Text_16D15E, 4
-	closemessage
-	applymovement 255, Route101_Movement_14E9FC
-	waitmovement 0
-	releaseall
-	end
-
-Route101_EventScript_14E9E4:: @ 814E9E4
-	lockall
-	msgbox Route101_Text_16D15E, 4
-	closemessage
-	applymovement 255, Route101_Movement_14E9FE
-	waitmovement 0
-	releaseall
-	end
-
-Route101_Movement_14E9FA:: @ 814E9FA
-	walk_up
-	end_movement
-
-Route101_Movement_14E9FC:: @ 814E9FC
-	walk_right
-	end_movement
-
-Route101_Movement_14E9FE:: @ 814E9FE
-	walk_down
-	end_movement
-
-Route101_Movement_14EA00:: @ 814EA00
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	end_movement
-
-Route101_Movement_14EA1F:: @ 814EA1F
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	end_movement
-
-@ 814EA26
-	end_movement
-
-Route101_Movement_14EA27:: @ 814EA27
-	walk_in_place_fast_left
-	walk_in_place_fast_left
-	walk_in_place_fast_left
-	walk_in_place_fast_left
-	end_movement
-
-Route101_Movement_14EA2C:: @ 814EA2C
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-Route101_Movement_14EA31:: @ 814EA31
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_down
-	walk_fast_down
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	end_movement
-
-Route101_Movement_14EA50:: @ 814EA50
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-@ 814EA57
-	end_movement
-
-Route101_Movement_14EA58:: @ 814EA58
-	walk_in_place_fast_right
-	walk_in_place_fast_right
-	walk_in_place_fast_right
-	walk_in_place_fast_right
-	end_movement
-
-@ 814EA5D
-	walk_up
-	walk_up
-	end_movement
-
-@ 814EA60
-	walk_up
-	walk_left
-	walk_up
-	end_movement
-
-Route101_EventScript_14EA64:: @ 814EA64
-	msgbox Route101_Text_16D25E, 2
-	end
-
-Route101_EventScript_14EA6D:: @ 814EA6D
-	msgbox Route101_Text_16D2CB, 2
-	end
-
-Route101_EventScript_14EA76:: @ 814EA76
-	msgbox Route101_Text_16D349, 3
-	end
-
-Route101_EventScript_14EA7F:: @ 814EA7F
-	lock
-	faceplayer
-	setflag FLAG_SYS_POKEMON_GET
-	setflag FLAG_RESCUED_BIRCH
-	fadescreen 1
-	removeobject 4
-	setobjectxy 255, 6, 13
-	applymovement 255, Route101_Movement_1A083F
-	waitmovement 0
-	special ScrSpecial_ChooseStarter
-	waitstate
-	applymovement 2, Route101_Movement_14EAD7
-	waitmovement 0
-	msgbox Route101_Text_16D191, 4
-	special ScrSpecial_HealPlayerParty
-	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
-	clearflag FLAG_HIDE_BIRCH_IN_LAB
-	setflag FLAG_HIDE_BIRCH_STARTERS_BAG
-	setvar VAR_BIRCH_LAB_STATE, 2
-	setvar VAR_ROUTE101_STATE, 3
-	clearflag FLAG_SPECIAL_FLAG_0
-	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
-	waitstate
-	release
-	end
-
-Route101_Movement_14EAD7:: @ 814EAD7
-	walk_right
-	end_movement
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
deleted file mode 100644
index 94d0aa8d6..000000000
--- a/data/scripts/maps/Route103.inc
+++ /dev/null
@@ -1,216 +0,0 @@
-Route103_MapScripts:: @ 814EB81
-	map_script 3, Route103_MapScript1_14EB87
-	.byte 0
-
-Route103_MapScript1_14EB87:: @ 814EB87
-	call Route103_EventScript_1A014E
-	call Route103_EventScript_1A02F4
-	end
-
-Route103_EventScript_14EB92:: @ 814EB92
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq Route103_EventScript_14EBAB
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EC04
-	end
-
-Route103_EventScript_14EBAB:: @ 814EBAB
-	msgbox Route103_Text_16D57A, 4
-	playbgm BGM_GIRL_SUP, TRUE
-	applymovement 2, Route103_Movement_1A0839
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0833
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0835
-	waitmovement 0
-	msgbox Route103_Text_16D5B6, 4
-	switch VAR_STARTER_MON
-	case 0, Route103_EventScript_14EC5D
-	case 1, Route103_EventScript_14EC6D
-	case 2, Route103_EventScript_14EC7D
-	end
-
-Route103_EventScript_14EC04:: @ 814EC04
-	msgbox Route103_Text_16D762, 4
-	playbgm BGM_BOY_SUP, TRUE
-	applymovement 2, Route103_Movement_1A0839
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0833
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0835
-	waitmovement 0
-	msgbox Route103_Text_16D7A9, 4
-	switch VAR_STARTER_MON
-	case 0, Route103_EventScript_14EC8D
-	case 1, Route103_EventScript_14EC9D
-	case 2, Route103_EventScript_14ECAD
-	end
-
-Route103_EventScript_14EC5D:: @ 814EC5D
-	trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B
-	goto Route103_EventScript_14ECBD
-	end
-
-Route103_EventScript_14EC6D:: @ 814EC6D
-	trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B
-	goto Route103_EventScript_14ECBD
-	end
-
-Route103_EventScript_14EC7D:: @ 814EC7D
-	trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B
-	goto Route103_EventScript_14ECBD
-	end
-
-Route103_EventScript_14EC8D:: @ 814EC8D
-	trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836
-	goto Route103_EventScript_14ECCB
-	end
-
-Route103_EventScript_14EC9D:: @ 814EC9D
-	trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836
-	goto Route103_EventScript_14ECCB
-	end
-
-Route103_EventScript_14ECAD:: @ 814ECAD
-	trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836
-	goto Route103_EventScript_14ECCB
-	end
-
-Route103_EventScript_14ECBD:: @ 814ECBD
-	msgbox Route103_Text_16D688, 4
-	goto Route103_EventScript_14ECD9
-	end
-
-Route103_EventScript_14ECCB:: @ 814ECCB
-	msgbox Route103_Text_16D856, 4
-	goto Route103_EventScript_14ECD9
-	end
-
-Route103_EventScript_14ECD9:: @ 814ECD9
-	closemessage
-	switch FACING
-	case 1, Route103_EventScript_14ED29
-	case 2, Route103_EventScript_14ED0C
-	case 3, Route103_EventScript_14ED29
-	case 4, Route103_EventScript_14ED29
-	end
-
-Route103_EventScript_14ED0C:: @ 814ED0C
-	applymovement 2, Route103_Movement_14ED67
-	waitmovement 0
-	playse SE_DANSA
-	applymovement 2, Route103_Movement_14ED6B
-	waitmovement 0
-	goto Route103_EventScript_14ED46
-	end
-
-Route103_EventScript_14ED29:: @ 814ED29
-	applymovement 2, Route103_Movement_14ED71
-	waitmovement 0
-	playse SE_DANSA
-	applymovement 2, Route103_Movement_14ED74
-	waitmovement 0
-	goto Route103_EventScript_14ED46
-	end
-
-Route103_EventScript_14ED46:: @ 814ED46
-	removeobject 2
-	setvar VAR_ROUTE103_STATE, 1
-	setvar VAR_BIRCH_LAB_STATE, 4
-	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
-	setflag FLAG_DEFEATED_RIVAL_ROUTE103
-	setvar VAR_OLDALE_STATE, 1
-	clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-Route103_Movement_14ED67:: @ 814ED67
-	walk_left
-	walk_down
-	walk_down
-	end_movement
-
-Route103_Movement_14ED6B:: @ 814ED6B
-	jump_2_down
-	delay_16
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-Route103_Movement_14ED71:: @ 814ED71
-	walk_down
-	walk_down
-	end_movement
-
-Route103_Movement_14ED74:: @ 814ED74
-	jump_2_down
-	delay_16
-	walk_down
-	walk_down
-	end_movement
-
-Route103_EventScript_14ED79:: @ 814ED79
-	msgbox Route103_Text_16D950, 2
-	end
-
-Route103_EventScript_14ED82:: @ 814ED82
-	msgbox Route103_Text_16D996, 2
-	end
-
-Route103_EventScript_14ED8B:: @ 814ED8B
-	msgbox Route103_Text_16D9FB, 3
-	end
-
-Route103_EventScript_14ED94:: @ 814ED94
-	trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B
-	msgbox Route103_Text_1B7DB2, 6
-	end
-
-Route103_EventScript_14EDAB:: @ 814EDAB
-	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EDD6
-	msgbox Route103_Text_1B7E50, 6
-	end
-
-Route103_EventScript_14EDD6:: @ 814EDD6
-	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
-	msgbox Route103_Text_1B8053, 6
-	end
-
-Route103_EventScript_14EDF1:: @ 814EDF1
-	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EE1C
-	msgbox Route103_Text_1B7F40, 6
-	end
-
-Route103_EventScript_14EE1C:: @ 814EE1C
-	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
-	msgbox Route103_Text_1B814D, 6
-	end
-
-Route103_EventScript_14EE37:: @ 814EE37
-	trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258
-	msgbox Route103_Text_1B8281, 6
-	end
-
-Route103_EventScript_14EE4E:: @ 814EE4E
-	trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EE75
-	msgbox Route103_Text_1B830D, 6
-	end
-
-Route103_EventScript_14EE75:: @ 814EE75
-	trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C
-	msgbox Route103_Text_1B83A4, 6
-	end
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
deleted file mode 100644
index 8245b3107..000000000
--- a/data/scripts/maps/Route110.inc
+++ /dev/null
@@ -1,539 +0,0 @@
-Route110_MapScripts:: @ 814F900
-	map_script 5, Route110_MapScript1_14F910
-	map_script 3, Route110_MapScript1_14F914
-	map_script 2, Route110_MapScript2_14F933
-	.byte 0
-
-Route110_MapScript1_14F910:: @ 814F910
-	special UpdateCyclingRoadState
-	end
-
-Route110_MapScript1_14F914:: @ 814F914
-	call Route110_EventScript_1A0196
-	call Route110_EventScript_1A014E
-	call Route110_EventScript_1A0172
-	compare VAR_CYCLING_CHALLENGE_STATE, 1
-	call_if_eq Route110_EventScript_14F92F
-	end
-
-Route110_EventScript_14F92F:: @ 814F92F
-	savebgm BGM_CYCLING
-	return
-
-Route110_MapScript2_14F933:: @ 814F933
-	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D
-	.2byte 0
-
-Route110_EventScript_14F93D:: @ 814F93D
-	special ScrSpecial_BeginCyclingRoadChallenge
-	setvar VAR_CYCLING_CHALLENGE_STATE, 2
-	return
-
-Route110_EventScript_14F946:: @ 814F946
-	lock
-	faceplayer
-	msgbox Route110_Text_16E6C0, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F95C:: @ 814F95C
-	lock
-	faceplayer
-	msgbox Route110_Text_16E6F2, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F972:: @ 814F972
-	lock
-	faceplayer
-	msgbox Route110_Text_16E729, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F988:: @ 814F988
-	lock
-	faceplayer
-	msgbox Route110_Text_16E76A, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F99E:: @ 814F99E
-	msgbox Route110_Text_16EB22, 2
-	end
-
-Route110_EventScript_14F9A7:: @ 814F9A7
-	msgbox Route110_Text_16EB65, 2
-	end
-
-Route110_EventScript_14F9B0:: @ 814F9B0
-	msgbox Route110_Text_16EBC9, 2
-	end
-
-Route110_EventScript_14F9B9:: @ 814F9B9
-	msgbox Route110_Text_16EDC5, 2
-	end
-
-Route110_EventScript_14F9C2:: @ 814F9C2
-	msgbox Route110_Text_16EE30, 2
-	end
-
-Route110_EventScript_14F9CB:: @ 814F9CB
-	msgbox Route110_Text_16EE74, 2
-	end
-
-Route110_EventScript_14F9D4:: @ 814F9D4
-	msgbox Route110_Text_16EEF6, 2
-	end
-
-Route110_EventScript_14F9DD:: @ 814F9DD
-	msgbox Route110_Text_16F381, 3
-	end
-
-Route110_EventScript_14F9E6:: @ 814F9E6
-	msgbox Route110_Text_16F39C, 3
-	end
-
-Route110_EventScript_14F9EF:: @ 814F9EF
-	msgbox Route110_Text_16F3B1, 3
-	end
-
-Route110_EventScript_14F9F8:: @ 814F9F8
-	msgbox Route110_Text_16F3E9, 3
-	end
-
-Route110_EventScript_14FA01:: @ 814FA01
-	msgbox Route110_Text_16F3FF, 3
-	end
-
-Route110_EventScript_14FA0A:: @ 814FA0A
-	msgbox Route110_Text_16F40F, 3
-	end
-
-Route110_EventScript_14FA13:: @ 814FA13
-	msgbox Route110_Text_16F429, 3
-	end
-
-Route110_EventScript_14FA1C:: @ 814FA1C
-	msgbox Route110_Text_16F4AE, 3
-	end
-
-Route110_EventScript_14FA25:: @ 814FA25
-	msgbox Route110_Text_16F4F7, 3
-	end
-
-Route110_EventScript_14FA2E:: @ 814FA2E
-	lockall
-	specialvar RESULT, GetRecordedCyclingRoadResults
-	compare RESULT, 0
-	goto_if_eq Route110_EventScript_14FA49
-	msgbox Route110_Text_16F53A, 4
-	releaseall
-	end
-
-Route110_EventScript_14FA49:: @ 814FA49
-	msgbox Route110_Text_16F57C, 4
-	releaseall
-	end
-
-Route110_EventScript_14FA53:: @ 814FA53
-	lock
-	faceplayer
-	specialvar RESULT, GetPlayerAvatarBike
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FA84
-	compare VAR_CYCLING_CHALLENGE_STATE, 0
-	goto_if_eq Route110_EventScript_14FA7A
-	msgbox Route110_Text_16F26A, 4
-	release
-	end
-
-Route110_EventScript_14FA7A:: @ 814FA7A
-	msgbox Route110_Text_16F1D0, 4
-	release
-	end
-
-Route110_EventScript_14FA84:: @ 814FA84
-	msgbox Route110_Text_16F2C4, 4
-	release
-	end
-
-Route110_EventScript_14FA8E:: @ 814FA8E
-	trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2
-	msgbox Route110_Text_1BA6F8, 6
-	end
-
-Route110_EventScript_14FAA5:: @ 814FAA5
-	trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759
-	msgbox Route110_Text_1BA76C, 6
-	end
-
-Route110_EventScript_14FABC:: @ 814FABC
-	trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FAE3
-	msgbox Route110_Text_1BA829, 6
-	end
-
-Route110_EventScript_14FAE3:: @ 814FAE3
-	trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD
-	msgbox Route110_Text_1BA8E9, 6
-	end
-
-Route110_EventScript_14FAFA:: @ 814FAFA
-	trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C
-	msgbox Route110_Text_1BA94A, 6
-	end
-
-Route110_EventScript_14FB11:: @ 814FB11
-	trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264
-	msgbox Route110_Text_1BA27C, 6
-	end
-
-Route110_EventScript_14FB28:: @ 814FB28
-	trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC
-	msgbox Route110_Text_1BA30C, 6
-	end
-
-Route110_EventScript_14FB3F:: @ 814FB3F
-	trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FB66
-	msgbox Route110_Text_1BA3A5, 6
-	end
-
-Route110_EventScript_14FB66:: @ 814FB66
-	trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432
-	msgbox Route110_Text_1BA456, 6
-	end
-
-Route110_EventScript_14FB7D:: @ 814FB7D
-	trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C
-	msgbox Route110_Text_1BA65F, 6
-	end
-
-Route110_EventScript_14FB94:: @ 814FB94
-	trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FBBB
-	msgbox Route110_Text_1BA52E, 6
-	end
-
-Route110_EventScript_14FBBB:: @ 814FBBB
-	trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1
-	msgbox Route110_Text_1BA5C4, 6
-	end
-
-Route110_EventScript_14FBD2:: @ 814FBD2
-	trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FBF9
-	msgbox Route110_Text_1BA9E9, 6
-	end
-
-Route110_EventScript_14FBF9:: @ 814FBF9
-	trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76
-	msgbox Route110_Text_1BAA8F, 6
-	end
-
-Route110_EventScript_14FC10:: @ 814FC10
-	trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7
-	msgbox Route110_Text_1BAB19, 6
-	end
-
-Route110_EventScript_14FC27:: @ 814FC27
-	lockall
-	applymovement 21, Route110_Movement_1A0843
-	waitmovement 0
-	call Route110_EventScript_14FC39
-	releaseall
-	end
-
-Route110_EventScript_14FC39:: @ 814FC39
-	special FinishCyclingRoadChallenge
-	msgbox Route110_Text_16EF65, 4
-	switch RESULT
-	case 10, Route110_EventScript_14FCC3
-	case 9, Route110_EventScript_14FCD1
-	case 8, Route110_EventScript_14FCD1
-	case 7, Route110_EventScript_14FCD1
-	case 6, Route110_EventScript_14FCDF
-	case 5, Route110_EventScript_14FCDF
-	case 4, Route110_EventScript_14FCDF
-	case 3, Route110_EventScript_14FCED
-	case 2, Route110_EventScript_14FCED
-	case 1, Route110_EventScript_14FCED
-	case 0, Route110_EventScript_14FCFB
-	end
-
-Route110_EventScript_14FCC3:: @ 814FCC3
-	msgbox Route110_Text_16EF9F, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCD1:: @ 814FCD1
-	msgbox Route110_Text_16F012, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCDF:: @ 814FCDF
-	msgbox Route110_Text_16F069, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCED:: @ 814FCED
-	msgbox Route110_Text_16F0D0, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCFB:: @ 814FCFB
-	msgbox Route110_Text_16F139, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FD09:: @ 814FD09
-	setvar VAR_CYCLING_CHALLENGE_STATE, 3
-	savebgm 0
-	fadedefaultbgm
-	return
-
-Route110_EventScript_14FD13:: @ 814FD13
-	setvar VAR_SPECIAL_8, 1
-	goto Route110_EventScript_14FD34
-	end
-
-Route110_EventScript_14FD1E:: @ 814FD1E
-	setvar VAR_SPECIAL_8, 2
-	goto Route110_EventScript_14FD34
-	end
-
-Route110_EventScript_14FD29:: @ 814FD29
-	setvar VAR_SPECIAL_8, 3
-	goto Route110_EventScript_14FD34
-	end
-
-Route110_EventScript_14FD34:: @ 814FD34
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq Route110_EventScript_14FDA7
-	compare RESULT, 1
-	call_if_eq Route110_EventScript_14FDAC
-	applymovement 28, Route110_Movement_1A0845
-	waitmovement 0
-	applymovement 28, Route110_Movement_1A0833
-	waitmovement 0
-	applymovement 28, Route110_Movement_1A0835
-	waitmovement 0
-	delay 30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq Route110_EventScript_14FF14
-	compare VAR_SPECIAL_8, 2
-	call_if_eq Route110_EventScript_14FF1F
-	compare VAR_SPECIAL_8, 3
-	call_if_eq Route110_EventScript_14FF2A
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq Route110_EventScript_14FDB1
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FE2B
-	releaseall
-	end
-
-Route110_EventScript_14FDA7:: @ 814FDA7
-	playbgm BGM_GIRL_SUP, TRUE
-	return
-
-Route110_EventScript_14FDAC:: @ 814FDAC
-	playbgm BGM_BOY_SUP, TRUE
-	return
-
-Route110_EventScript_14FDB1:: @ 814FDB1
-	msgbox Route110_Text_16E7A1, 4
-	switch VAR_STARTER_MON
-	case 0, Route110_EventScript_14FDE0
-	case 1, Route110_EventScript_14FDF0
-	case 2, Route110_EventScript_14FE00
-	end
-
-Route110_EventScript_14FDE0:: @ 814FDE0
-	trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826
-	goto Route110_EventScript_14FE10
-	end
-
-Route110_EventScript_14FDF0:: @ 814FDF0
-	trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826
-	goto Route110_EventScript_14FE10
-	end
-
-Route110_EventScript_14FE00:: @ 814FE00
-	trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826
-	goto Route110_EventScript_14FE10
-	end
-
-Route110_EventScript_14FE10:: @ 814FE10
-	msgbox Route110_Text_16E84C, 4
-	call Route110_EventScript_14FEA5
-	msgbox Route110_Text_16E8B3, 4
-	goto Route110_EventScript_14FEB2
-	end
-
-Route110_EventScript_14FE2B:: @ 814FE2B
-	msgbox Route110_Text_16E99A, 4
-	switch VAR_STARTER_MON
-	case 0, Route110_EventScript_14FE5A
-	case 1, Route110_EventScript_14FE6A
-	case 2, Route110_EventScript_14FE7A
-	end
-
-Route110_EventScript_14FE5A:: @ 814FE5A
-	trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F
-	goto Route110_EventScript_14FE8A
-	end
-
-Route110_EventScript_14FE6A:: @ 814FE6A
-	trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F
-	goto Route110_EventScript_14FE8A
-	end
-
-Route110_EventScript_14FE7A:: @ 814FE7A
-	trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F
-	goto Route110_EventScript_14FE8A
-	end
-
-Route110_EventScript_14FE8A:: @ 814FE8A
-	msgbox Route110_Text_16EA2A, 4
-	call Route110_EventScript_14FEA5
-	msgbox Route110_Text_16EA7B, 4
-	goto Route110_EventScript_14FEB2
-	end
-
-Route110_EventScript_14FEA5:: @ 814FEA5
-	giveitem_std ITEM_ITEMFINDER
-	return
-
-Route110_EventScript_14FEB2:: @ 814FEB2
-	closemessage
-	compare VAR_SPECIAL_8, 1
-	call_if_eq Route110_EventScript_14FF56
-	compare VAR_SPECIAL_8, 2
-	call_if_eq Route110_EventScript_14FF5E
-	compare VAR_SPECIAL_8, 3
-	call_if_eq Route110_EventScript_14FF66
-	setobjectmovementtype 28, 10
-	setobjectmovementtype 29, 10
-	removeobject 28
-	addobject 29
-	delay 45
-	compare VAR_SPECIAL_8, 1
-	call_if_eq Route110_EventScript_14FF35
-	compare VAR_SPECIAL_8, 2
-	call_if_eq Route110_EventScript_14FF40
-	compare VAR_SPECIAL_8, 3
-	call_if_eq Route110_EventScript_14FF4B
-	removeobject 29
-	setvar VAR_ROUTE110_STATE, 1
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-Route110_EventScript_14FF14:: @ 814FF14
-	applymovement 28, Route110_Movement_14FF6E
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF1F:: @ 814FF1F
-	applymovement 28, Route110_Movement_14FF72
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF2A:: @ 814FF2A
-	applymovement 28, Route110_Movement_14FF74
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF35:: @ 814FF35
-	applymovement 29, Route110_Movement_14FF78
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF40:: @ 814FF40
-	applymovement 29, Route110_Movement_14FF80
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF4B:: @ 814FF4B
-	applymovement 29, Route110_Movement_14FF89
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF56:: @ 814FF56
-	setobjectxyperm 29, 33, 55
-	return
-
-Route110_EventScript_14FF5E:: @ 814FF5E
-	setobjectxyperm 29, 34, 55
-	return
-
-Route110_EventScript_14FF66:: @ 814FF66
-	setobjectxyperm 29, 35, 55
-	return
-
-Route110_Movement_14FF6E:: @ 814FF6E
-	walk_down
-	walk_left
-	walk_in_place_fastest_down
-	end_movement
-
-Route110_Movement_14FF72:: @ 814FF72
-	walk_down
-	end_movement
-
-Route110_Movement_14FF74:: @ 814FF74
-	walk_down
-	walk_right
-	walk_in_place_fastest_down
-	end_movement
-
-Route110_Movement_14FF78:: @ 814FF78
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-Route110_Movement_14FF80:: @ 814FF80
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_down
-	end_movement
-
-Route110_Movement_14FF89:: @ 814FF89
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
deleted file mode 100644
index a14ce2e2d..000000000
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ /dev/null
@@ -1,759 +0,0 @@
-Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
-	map_script 3, Route110_TrickHouseEntrance_MapScript1_160F3B
-	map_script 2, Route110_TrickHouseEntrance_MapScript2_1611CD
-	map_script 4, Route110_TrickHouseEntrance_MapScript2_1610B2
-	.byte 0
-
-Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
-	setflag FLAG_LANDMARK_TRICK_HOUSE
-	compare VAR_TRICK_HOUSE_STATE, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE
-	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_16109A
-	case 1, Route110_TrickHouseEntrance_EventScript_1610A0
-	case 3, Route110_TrickHouseEntrance_EventScript_1610A6
-	case 4, Route110_TrickHouseEntrance_EventScript_1610AC
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE
-	setvar VAR_TRICK_HOUSE_STATE, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16103C
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161046
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161050
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16105A
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161064
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16106E
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161078
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161082
-	return
-
-Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
-	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
-	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
-	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
-	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
-	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
-	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
-	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	return
-
-Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E
-	setobjectxyperm 1, 5, 2
-	setobjectmovementtype 1, 4
-	end
-
-Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
-	end
-
-Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE
-	.2byte 0
-
-Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4
-	addobject 1
-	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	turnobject 1, 4
-	turnobject 255, 3
-	end
-
-Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105
-	addobject 1
-	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
-	case 0, Route110_TrickHouseEntrance_EventScript_16116B
-	case 1, Route110_TrickHouseEntrance_EventScript_161173
-	case 2, Route110_TrickHouseEntrance_EventScript_161193
-	case 3, Route110_TrickHouseEntrance_EventScript_161183
-	case 4, Route110_TrickHouseEntrance_EventScript_16118B
-	case 5, Route110_TrickHouseEntrance_EventScript_16117B
-	case 6, Route110_TrickHouseEntrance_EventScript_16119B
-	case 7, Route110_TrickHouseEntrance_EventScript_1611A3
-	end
-
-Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B
-	setobjectxy 1, 6, 3
-	end
-
-Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173
-	setobjectxy 1, 11, 5
-	end
-
-Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B
-	setobjectxy 1, 11, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183
-	setobjectxy 1, 3, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B
-	setobjectxy 1, 0, 5
-	end
-
-Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193
-	setobjectxy 1, 9, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B
-	setobjectxy 1, 8, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3
-	setobjectxy 1, 4, 4
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB
-	removeobject 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF
-	addobject 1
-	setobjectxy 1, 5, 2
-	turnobject 1, 2
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE
-	addobject 1
-	setobjectxy 1, 5, 2
-	turnobject 1, 1
-	end
-
-Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7
-	.2byte 0
-
-Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
-	lockall
-	delay 20
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161327
-	msgbox Route110_TrickHouseEntrance_Text_19BD82, 4
-	closemessage
-	delay 20
-	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
-	waitmovement 0
-	removeobject 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
-	releaseall
-	end
-
-@ 8161218
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A
-	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_16124D
-	case 2, Route110_TrickHouseEntrance_EventScript_16136E
-	case 3, Route110_TrickHouseEntrance_EventScript_161330
-	case 6, Route110_TrickHouseEntrance_EventScript_161518
-	end
-
-Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
-	playse SE_PIN
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833
-	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835
-	waitmovement 0
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161303
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16130C
-	closemessage
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
-	warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1612CD:: @ 81612CD
-	msgbox Route110_TrickHouseEntrance_Text_19BA6E, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612D6:: @ 81612D6
-	msgbox Route110_TrickHouseEntrance_Text_19BAC0, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612DF:: @ 81612DF
-	msgbox Route110_TrickHouseEntrance_Text_19BB11, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612E8:: @ 81612E8
-	msgbox Route110_TrickHouseEntrance_Text_19BB61, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612F1:: @ 81612F1
-	msgbox Route110_TrickHouseEntrance_Text_19BBB4, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612FA:: @ 81612FA
-	msgbox Route110_TrickHouseEntrance_Text_19BC04, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_161303:: @ 8161303
-	msgbox Route110_TrickHouseEntrance_Text_19BC55, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C
-	msgbox Route110_TrickHouseEntrance_Text_19BCA8, 4
-	return
-
-Route110_TrickHouseEnd_Movement_161315:: @ 8161315
-Route110_TrickHouseEntrance_Movement_161315:: @ 8161315
-	face_up
-	delay_4
-	face_left
-	delay_4
-	face_down
-	delay_4
-	face_right
-	delay_4
-	end_movement
-
-Route110_TrickHouseEnd_Movement_16131E:: @ 816131E
-Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E
-	face_up
-	disable_anim
-	slide_up
-	slide_up
-	slide_up
-	slide_up
-	slide_up
-	slide_up
-	end_movement
-
-Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327
-	msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330
-	msgbox Route110_TrickHouseEntrance_Text_19BF19, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833
-	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
-	waitmovement 0
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19C07E, 4
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161426
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161452
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6
-	end
-
-Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
-	giveitem_std ITEM_RARE_CANDY
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
-	giveitem_std ITEM_TIMER_BALL
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
-	giveitem_std ITEM_HARD_STONE
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
-	giveitem_std ITEM_SMOKE_BALL
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
-	giveitem_std ITEM_TM12_TAUNT
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
-	giveitem_std ITEM_MAGNET
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6
-	giveitem_std ITEM_PP_MAX
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
-	waitmovement 0
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19C128, 4
-	.ifdef SAPPHIRE
-	givedecoration_std DECOR_BLUE_TENT
-	.else
-	givedecoration_std DECOR_RED_TENT
-	.endif
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161551
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8
-	msgbox Route110_TrickHouseEntrance_Text_19C18D, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551
-	msgbox Route110_TrickHouseEntrance_Text_19C17E, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_16309F
-	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
-	waitmovement 0
-	removeobject 1
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A
-	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_1615BD
-	case 1, Route110_TrickHouseEntrance_EventScript_1615C7
-	case 4, Route110_TrickHouseEntrance_EventScript_1616B8
-	case 5, Route110_TrickHouseEntrance_EventScript_1616C2
-	end
-
-Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD
-	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7
-	msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO
-	closemessage
-	compare RESULT, YES
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
-	setmetatile 5, 1, 537, 0
-	special DrawWholeMapView
-	delay 20
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856
-	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_16165E
-	waitmovement 0
-	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
-	case 0, Route110_TrickHouseEntrance_EventScript_161660
-	case 1, Route110_TrickHouseEntrance_EventScript_16166B
-	case 2, Route110_TrickHouseEntrance_EventScript_161676
-	case 3, Route110_TrickHouseEntrance_EventScript_161681
-	case 4, Route110_TrickHouseEntrance_EventScript_16168C
-	case 5, Route110_TrickHouseEntrance_EventScript_161697
-	case 6, Route110_TrickHouseEntrance_EventScript_1616A2
-	case 7, Route110_TrickHouseEntrance_EventScript_1616AD
-	end
-
-Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E
-	set_invisible
-	end_movement
-
-Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8
-	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7
-	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7
-	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
-	releaseall
-	end
-
-gUnknown_081616E1:: @ 81616E1
-	lockall
-	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
-	case 0, Route110_TrickHouseEntrance_EventScript_161740
-	case 1, Route110_TrickHouseEntrance_EventScript_161769
-	case 2, Route110_TrickHouseEntrance_EventScript_161792
-	case 3, Route110_TrickHouseEntrance_EventScript_1617BB
-	case 4, Route110_TrickHouseEntrance_EventScript_1617E4
-	case 5, Route110_TrickHouseEntrance_EventScript_16180D
-	case 6, Route110_TrickHouseEntrance_EventScript_161836
-	case 7, Route110_TrickHouseEntrance_EventScript_16185F
-	end
-
-Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
-	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CAD1, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
-	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CCCB, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
-	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CEF9, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
-	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819D164, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
-	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819D3A5, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
-	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819DC0A, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
-	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819DE8D, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
-	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819E0FF, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888
-	msgbox UnknownString_819C21F, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle1_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle2_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle3_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle4_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle5_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle6_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle7_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle8_EventScript_161892:: @ 8161892
-	msgbox Route110_TrickHousePuzzle1_Text_19C1FF, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle1_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle2_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle3_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle4_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C
-	playfanfare BGM_FANFA4
-	message Route110_TrickHousePuzzle1_Text_19C1B8
-	waitfanfare
-	waitmessage
-	msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0
-	lockall
-	msgbox Route110_TrickHouseEntrance_Text_19BA56, 4
-	releaseall
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16190B
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1
-	setvar VAR_SPECIAL_4, 6
-	setvar VAR_SPECIAL_5, 3
-	setvar VAR_SPECIAL_6, 0
-	call Route110_TrickHouseEntrance_EventScript_161920
-	return
-
-Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6
-	setvar VAR_SPECIAL_4, 11
-	setvar VAR_SPECIAL_5, 5
-	setvar VAR_SPECIAL_6, 0
-	call Route110_TrickHouseEntrance_EventScript_161920
-	return
-
-Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B
-	setvar VAR_SPECIAL_4, 9
-	setvar VAR_SPECIAL_5, 2
-	setvar VAR_SPECIAL_6, 0
-	call Route110_TrickHouseEntrance_EventScript_161920
-	return
-
-Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920
-	setfieldeffectargument 0, 32772
-	setfieldeffectargument 1, 32773
-	setfieldeffectargument 2, 32774
-	dofieldeffect FLDEFF_SPARKLE
-	waitfieldeffect FLDEFF_SPARKLE
-	delay 10
-	return
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
deleted file mode 100644
index 3e1570aff..000000000
--- a/data/scripts/maps/Route111.inc
+++ /dev/null
@@ -1,442 +0,0 @@
-Route111_MapScripts:: @ 814FF91
-	map_script 1, Route111_MapScript1_14FF9C
-	map_script 3, Route111_MapScript1_14FFB9
-	.byte 0
-
-Route111_MapScript1_14FF9C:: @ 814FF9C
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6
-	end
-
-Route111_EventScript_14FFA6:: @ 814FFA6
-	setmetatile 29, 86, 124, 1
-	setmetatile 29, 87, 145, 1
-	return
-
-Route111_MapScript1_14FFB9:: @ 814FFB9
-	call Route111_EventScript_14FFCD
-	call Route111_EventScript_1AE313
-	goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D
-	end
-
-Route111_EventScript_14FFCD:: @ 814FFCD
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_1, 34
-	goto_if_lt Route111_EventScript_15000C
-	compare VAR_TEMP_1, 107
-	goto_if_gt Route111_EventScript_15000C
-	compare VAR_TEMP_1, 72
-	goto_if_gt Route111_EventScript_150009
-	compare VAR_TEMP_0, 2000
-	goto_if_gt Route111_EventScript_15000C
-	compare VAR_TEMP_0, 8
-	goto_if_lt Route111_EventScript_15000C
-
-Route111_EventScript_150009:: @ 8150009
-	setweather WEATHER_SANDSTORM
-
-Route111_EventScript_15000C:: @ 815000C
-	return
-
-Route111_EventScript_15000D:: @ 815000D
-	clearflag FLAG_HIDE_VICTOR_WINSTRATE
-	setflag FLAG_HIDE_VICTORIA_WINSTRATE
-	setflag FLAG_HIDE_VIVI_WINSTRATE
-	setflag FLAG_HIDE_VICKI_WINSTRATE
-	cleartrainerflag OPPONENT_VICTOR
-	cleartrainerflag OPPONENT_VICTORIA
-	cleartrainerflag OPPONENT_VIVI
-	end
-
-Route111_EventScript_150023:: @ 8150023
-	lockall
-	msgbox Route111_Text_16FA54, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq Route111_EventScript_15005F
-	giveitem_std ITEM_ROOT_FOSSIL
-	closemessage
-	setflag FLAG_HIDE_ROOT_FOSSIL
-	setflag FLAG_HIDE_CLAW_FOSSIL
-	removeobject 34
-	delay 30
-	applymovement 35, Route111_Movement_1500AF
-	waitmovement 0
-	removeobject 35
-	releaseall
-	end
-
-Route111_EventScript_15005F:: @ 815005F
-	msgbox Route111_Text_16FACE, 4
-	releaseall
-	end
-
-Route111_EventScript_150069:: @ 8150069
-	lockall
-	msgbox Route111_Text_16FAED, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq Route111_EventScript_1500A5
-	giveitem_std ITEM_CLAW_FOSSIL
-	closemessage
-	setflag FLAG_HIDE_CLAW_FOSSIL
-	setflag FLAG_HIDE_ROOT_FOSSIL
-	removeobject 35
-	delay 30
-	applymovement 34, Route111_Movement_1500AF
-	waitmovement 0
-	removeobject 34
-	releaseall
-	end
-
-Route111_EventScript_1500A5:: @ 81500A5
-	msgbox Route111_Text_16FB67, 4
-	releaseall
-	end
-
-Route111_Movement_1500AF:: @ 81500AF
-	set_visible
-	delay_4
-	set_invisible
-	delay_4
-	set_visible
-	delay_4
-	set_invisible
-	delay_4
-	set_visible
-	delay_8
-	set_invisible
-	delay_8
-	set_visible
-	delay_8
-	set_invisible
-	delay_8
-	set_visible
-	delay_16
-	set_invisible
-	delay_16
-	set_visible
-	end_movement
-
-Route111_EventScript_1500C5:: @ 81500C5
-	lock
-	faceplayer
-	dodailyevents
-	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100
-	msgbox Route111_Text_1C56F0, 4
-	giveitem_std ITEM_RAZZ_BERRY
-	compare RESULT, 0
-	goto_if_eq Route111_EventScript_1A029B
-	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
-	special GetPlayerBigGuyGirlString
-	msgbox Route111_Text_1C5781, 4
-	release
-	end
-
-Route111_EventScript_150100:: @ 8150100
-	msgbox Route111_Text_1C57D2, 4
-	release
-	end
-
-@ 815010A
-	lockall
-	setvar VAR_SPECIAL_4, 0
-	goto Route111_EventScript_15013A
-	end
-
-Route111_EventScript_150116:: @ 8150116
-	lockall
-	setvar VAR_SPECIAL_4, 1
-	goto Route111_EventScript_15013A
-	end
-
-Route111_EventScript_150122:: @ 8150122
-	lockall
-	setvar VAR_SPECIAL_4, 2
-	goto Route111_EventScript_15013A
-	end
-
-@ 815012E
-	lockall
-	setvar VAR_SPECIAL_4, 3
-	goto Route111_EventScript_15013A
-	end
-
-Route111_EventScript_15013A:: @ 815013A
-	checkitem ITEM_GO_GOGGLES, 1
-	compare RESULT, 0
-	goto_if_eq Route111_EventScript_150151
-	setvar VAR_TEMP_3, 1
-	releaseall
-	end
-
-Route111_EventScript_150151:: @ 8150151
-	msgbox Route111_Text_1A0F93, 4
-	closemessage
-	compare VAR_SPECIAL_4, 0
-	call_if_eq Route111_EventScript_150188
-	compare VAR_SPECIAL_4, 1
-	call_if_eq Route111_EventScript_150193
-	compare VAR_SPECIAL_4, 2
-	call_if_eq Route111_EventScript_15019E
-	compare VAR_SPECIAL_4, 3
-	call_if_eq Route111_EventScript_1501A9
-	releaseall
-	end
-
-Route111_EventScript_150188:: @ 8150188
-	applymovement 255, Route111_Movement_1501B4
-	waitmovement 0
-	return
-
-Route111_EventScript_150193:: @ 8150193
-	applymovement 255, Route111_Movement_1501B6
-	waitmovement 0
-	return
-
-Route111_EventScript_15019E:: @ 815019E
-	applymovement 255, Route111_Movement_1501B8
-	waitmovement 0
-	return
-
-Route111_EventScript_1501A9:: @ 81501A9
-	applymovement 255, Route111_Movement_1501BA
-	waitmovement 0
-	return
-
-Route111_Movement_1501B4:: @ 81501B4
-	walk_up
-	end_movement
-
-Route111_Movement_1501B6:: @ 81501B6
-	walk_down
-	end_movement
-
-Route111_Movement_1501B8:: @ 81501B8
-	walk_left
-	end_movement
-
-Route111_Movement_1501BA:: @ 81501BA
-	walk_right
-	end_movement
-
-Route111_EventScript_1501BC:: @ 81501BC
-	setweather WEATHER_SUNNY
-	fadenewbgm BGM_DOORO_X1
-	doweather
-	setvar VAR_TEMP_3, 0
-	end
-
-Route111_EventScript_1501C9:: @ 81501C9
-	setweather WEATHER_SANDSTORM
-	fadenewbgm BGM_ASHROAD
-	doweather
-	end
-
-Route111_EventScript_1501D1:: @ 81501D1
-	lock
-	faceplayer
-	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
-	msgbox Route111_Text_16F705, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route111_EventScript_1501F3
-	msgbox Route111_Text_16F785, 4
-	release
-	end
-
-Route111_EventScript_1501F3:: @ 81501F3
-	msgbox Route111_Text_16F7B3, 4
-	trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2
-	applymovement 1, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	msgbox Route111_Text_16F7FF, 4
-	closemessage
-	applymovement 1, Route111_Movement_150356
-	waitmovement 0
-	removeobject 1
-	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
-	waitmovement 0
-	call Route111_EventScript_150348
-	addobject 2
-	applymovement 2, Route111_Movement_150359
-	waitmovement 0
-	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F82D, 4
-	trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6
-	applymovement 2, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	msgbox Route111_Text_16F8D5, 4
-	closemessage
-	applymovement 2, Route111_Movement_150356
-	waitmovement 0
-	removeobject 2
-	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
-	waitmovement 0
-	call Route111_EventScript_150348
-	addobject 3
-	applymovement 3, Route111_Movement_150359
-	waitmovement 0
-	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F90E, 4
-	trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956
-	applymovement 3, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	msgbox Route111_Text_16F96C, 4
-	closemessage
-	applymovement 3, Route111_Movement_150356
-	waitmovement 0
-	removeobject 3
-	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
-	waitmovement 0
-	call Route111_EventScript_150348
-	addobject 4
-	applymovement 4, Route111_Movement_150359
-	waitmovement 0
-	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F991, 4
-	trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC
-	msgbox Route111_Text_16FA22, 4
-	closemessage
-	applymovement 4, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	applymovement 4, Route111_Movement_150356
-	waitmovement 0
-	removeobject 4
-	call Route111_EventScript_15034F
-	release
-	end
-
-Route111_EventScript_150348:: @ 8150348
-	opendoor 13, 113
-	waitdooranim
-	return
-
-Route111_EventScript_15034F:: @ 815034F
-	closedoor 13, 113
-	waitdooranim
-	return
-
-Route111_Movement_150356:: @ 8150356
-	walk_in_place_fastest_up
-	walk_up
-	end_movement
-
-Route111_Movement_150359:: @ 8150359
-	walk_down
-	end_movement
-
-Route111_Movement_15035B:: @ 815035B
-	delay_16
-	delay_16
-	delay_16
-	end_movement
-
-Route111_EventScript_15035F:: @ 815035F
-	msgbox Route111_Text_16FC9C, 3
-	end
-
-Route111_EventScript_150368:: @ 8150368
-	msgbox Route111_Text_16FCB6, 3
-	end
-
-Route111_EventScript_150371:: @ 8150371
-	msgbox Route111_Text_16FCEF, 3
-	end
-
-Route111_EventScript_15037A:: @ 815037A
-	msgbox Route111_Text_16FD05, 3
-	end
-
-Route111_EventScript_150383:: @ 8150383
-	msgbox Route111_Text_16FD1B, 3
-	end
-
-Route111_EventScript_15038C:: @ 815038C
-	msgbox Route111_Text_16FD55, 3
-	end
-
-Route111_EventScript_150395:: @ 8150395
-	msgbox Route111_Text_16FB86, 2
-	end
-
-Route111_EventScript_15039E:: @ 815039E
-	msgbox Route111_Text_16FC3A, 2
-	end
-
-Route111_EventScript_1503A7:: @ 81503A7
-	trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
-	msgbox Route111_Text_1BAC10, 6
-	end
-
-Route111_EventScript_1503BE:: @ 81503BE
-	trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
-	msgbox Route111_Text_1BACD8, 6
-	end
-
-Route111_EventScript_1503D5:: @ 81503D5
-	trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
-	msgbox Route111_Text_1BADC2, 6
-	end
-
-Route111_EventScript_1503EC:: @ 81503EC
-	trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
-	msgbox Route111_Text_1BAE81, 6
-	end
-
-Route111_EventScript_150403:: @ 8150403
-	trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route111_EventScript_15042A
-	msgbox Route111_Text_1BAF5B, 6
-	end
-
-Route111_EventScript_15042A:: @ 815042A
-	trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
-	msgbox Route111_Text_1BB070, 6
-	end
-
-Route111_EventScript_150441:: @ 8150441
-	trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140
-	msgbox Route111_Text_1BB15B, 6
-	end
-
-Route111_EventScript_150458:: @ 8150458
-	trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
-	msgbox Route111_Text_1BB1F6, 6
-	end
-
-Route111_EventScript_15046F:: @ 815046F
-	trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E
-	msgbox Route111_Text_1BB290, 6
-	end
-
-Route111_EventScript_150486:: @ 8150486
-	trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route111_EventScript_1504AD
-	msgbox Route111_Text_1BB33E, 6
-	end
-
-Route111_EventScript_1504AD:: @ 81504AD
-	trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
-	msgbox Route111_Text_1BB40E, 6
-	end
-
-Route111_EventScript_1504C4:: @ 81504C4
-	trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route111_EventScript_1504EB
-	msgbox Route111_Text_1BB4CE, 6
-	end
-
-Route111_EventScript_1504EB:: @ 81504EB
-	trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
-	msgbox Route111_Text_1BB5C1, 6
-	end
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
deleted file mode 100644
index b1f2d33bf..000000000
--- a/data/scripts/maps/Route119.inc
+++ /dev/null
@@ -1,382 +0,0 @@
-Route119_MapScripts:: @ 8151167
-	map_script 5, Route119_MapScript1_151172
-	map_script 3, Route119_MapScript1_15119B
-	.byte 0
-
-Route119_MapScript1_151172:: @ 8151172
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C
-	end
-
-Route119_EventScript_15117C:: @ 815117C
-	compare VAR_SPECIAL_4, 6
-	call_if_eq Route119_EventScript_151193
-	compare VAR_SPECIAL_4, 7
-	call_if_eq Route119_EventScript_151197
-	return
-
-Route119_EventScript_151193:: @ 8151193
-	removeobject 35
-	return
-
-Route119_EventScript_151197:: @ 8151197
-	removeobject 36
-	return
-
-Route119_MapScript1_15119B:: @ 815119B
-	call Route119_EventScript_1A014E
-	call Route119_EventScript_1A0172
-	call Route119_EventScript_1A0196
-	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if_eq Route119_EventScript_1511B9
-	special SetRoute119Weather
-	end
-
-Route119_EventScript_1511B9:: @ 81511B9
-	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
-	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
-	setvar VAR_WEATHER_INSTITUTE_STATE, 2
-	return
-
-Route119_EventScript_1511C5:: @ 81511C5
-	setvar VAR_TEMP_1, 1
-	goto Route119_EventScript_1511DB
-	end
-
-Route119_EventScript_1511D0:: @ 81511D0
-	setvar VAR_TEMP_1, 2
-	goto Route119_EventScript_1511DB
-	end
-
-Route119_EventScript_1511DB:: @ 81511DB
-	lockall
-	addobject 25
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq Route119_EventScript_151254
-	compare RESULT, 1
-	call_if_eq Route119_EventScript_151259
-	delay 65
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513A6
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513B1
-	applymovement 255, Route119_Movement_1A0845
-	waitmovement 0
-	delay 30
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513D2
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513E1
-	removeobject 25
-	addobject 16
-	delay 30
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq Route119_EventScript_15125E
-	compare RESULT, 1
-	goto_if_eq Route119_EventScript_1512D8
-	releaseall
-	end
-
-Route119_EventScript_151254:: @ 8151254
-	playbgm BGM_GIRL_SUP, TRUE
-	return
-
-Route119_EventScript_151259:: @ 8151259
-	playbgm BGM_BOY_SUP, TRUE
-	return
-
-Route119_EventScript_15125E:: @ 815125E
-	msgbox Route119_Text_1710BB, 4
-	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_15128D
-	case 1, Route119_EventScript_15129D
-	case 2, Route119_EventScript_1512AD
-	end
-
-Route119_EventScript_15128D:: @ 815128D
-	trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156
-	goto Route119_EventScript_1512BD
-	end
-
-Route119_EventScript_15129D:: @ 815129D
-	trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156
-	goto Route119_EventScript_1512BD
-	end
-
-Route119_EventScript_1512AD:: @ 81512AD
-	trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156
-	goto Route119_EventScript_1512BD
-	end
-
-Route119_EventScript_1512BD:: @ 81512BD
-	msgbox Route119_Text_1711B1, 4
-	call Route119_EventScript_151352
-	msgbox Route119_Text_171214, 4
-	goto Route119_EventScript_151362
-	end
-
-Route119_EventScript_1512D8:: @ 81512D8
-	msgbox Route119_Text_171358, 4
-	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_151307
-	case 1, Route119_EventScript_151317
-	case 2, Route119_EventScript_151327
-	end
-
-Route119_EventScript_151307:: @ 8151307
-	trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2
-	goto Route119_EventScript_151337
-	end
-
-Route119_EventScript_151317:: @ 8151317
-	trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2
-	goto Route119_EventScript_151337
-	end
-
-Route119_EventScript_151327:: @ 8151327
-	trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2
-	goto Route119_EventScript_151337
-	end
-
-Route119_EventScript_151337:: @ 8151337
-	msgbox Route119_Text_17140B, 4
-	call Route119_EventScript_151352
-	msgbox Route119_Text_171475, 4
-	goto Route119_EventScript_151362
-	end
-
-Route119_EventScript_151352:: @ 8151352
-	giveitem_std ITEM_HM02_FLY
-	setflag FLAG_RECEIVED_HM02
-	return
-
-Route119_EventScript_151362:: @ 8151362
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513D2
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513E1
-	removeobject 16
-	addobject 25
-	delay 30
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513BC
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513C7
-	removeobject 25
-	setvar VAR_ROUTE119_STATE, 1
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-Route119_EventScript_1513A6:: @ 81513A6
-	applymovement 25, Route119_Movement_1513F0
-	waitmovement 0
-	return
-
-Route119_EventScript_1513B1:: @ 81513B1
-	applymovement 25, Route119_Movement_1513FA
-	waitmovement 0
-	return
-
-Route119_EventScript_1513BC:: @ 81513BC
-	applymovement 25, Route119_Movement_151405
-	waitmovement 0
-	return
-
-Route119_EventScript_1513C7:: @ 81513C7
-	applymovement 25, Route119_Movement_15140F
-	waitmovement 0
-	return
-
-Route119_EventScript_1513D2:: @ 81513D2
-	setobjectxyperm 16, 25, 32
-	setobjectxyperm 25, 25, 32
-	return
-
-Route119_EventScript_1513E1:: @ 81513E1
-	setobjectxyperm 16, 26, 32
-	setobjectxyperm 25, 26, 32
-	return
-
-Route119_Movement_1513F0:: @ 81513F0
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	end_movement
-
-Route119_Movement_1513FA:: @ 81513FA
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	end_movement
-
-Route119_Movement_151405:: @ 8151405
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-Route119_Movement_15140F:: @ 815140F
-	walk_fast_left
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_right
-	walk_fast_right
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	walk_fast_up
-	end_movement
-
-Route119_EventScript_15141A:: @ 815141A
-	msgbox Route119_Text_171698, 2
-	end
-
-Route119_EventScript_151423:: @ 8151423
-	msgbox Route119_Text_171749, 3
-	end
-
-Route119_EventScript_15142C:: @ 815142C
-	msgbox Route119_Text_171762, 3
-	end
-
-Route119_EventScript_151435:: @ 8151435
-	trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F
-	msgbox Route119_Text_1BE561, 6
-	end
-
-Route119_EventScript_15144C:: @ 815144C
-	trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF
-	msgbox Route119_Text_1BE5F8, 6
-	end
-
-Route119_EventScript_151463:: @ 8151463
-	trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B
-	msgbox Route119_Text_1BE695, 6
-	end
-
-Route119_EventScript_15147A:: @ 815147A
-	trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729
-	msgbox Route119_Text_1BE748, 6
-	end
-
-Route119_EventScript_151491:: @ 8151491
-	trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3
-	msgbox Route119_Text_1BE7E9, 6
-	end
-
-Route119_EventScript_1514A8:: @ 81514A8
-	trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D
-	msgbox Route119_Text_1BE89A, 6
-	end
-
-Route119_EventScript_1514BF:: @ 81514BF
-	trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route119_EventScript_1514E6
-	msgbox Route119_Text_1BE937, 6
-	end
-
-Route119_EventScript_1514E6:: @ 81514E6
-	trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0
-	msgbox Route119_Text_1BE9E8, 6
-	end
-
-Route119_EventScript_1514FD:: @ 81514FD
-	trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route119_EventScript_151524
-	msgbox Route119_Text_1BEAB3, 6
-	end
-
-Route119_EventScript_151524:: @ 8151524
-	trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49
-	msgbox Route119_Text_1BEB68, 6
-	end
-
-Route119_EventScript_15153B:: @ 815153B
-	trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C
-	msgbox Route119_Text_1BEC2A, 6
-	end
-
-Route119_EventScript_151552:: @ 8151552
-	trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A
-	msgbox Route119_Text_1BECB1, 6
-	end
-
-Route119_EventScript_151569:: @ 8151569
-	trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C
-	msgbox Route119_Text_1BED5C, 6
-	end
-
-Route119_EventScript_151580:: @ 8151580
-	trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC
-	msgbox Route119_Text_1BEE06, 6
-	end
-
-Route119_EventScript_151597:: @ 8151597
-	trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B
-	msgbox Route119_Text_1BEE66, 6
-	end
-
-Route119_EventScript_1515AE:: @ 81515AE
-	trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37
-	msgbox Route119_Text_1BEF67, 6
-	end
-
-Route119_EventScript_1515C5:: @ 81515C5
-	lock
-	faceplayer
-	msgbox Route119_Text_171520, 4
-	closemessage
-	applymovement LAST_TALKED, Route119_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route119_EventScript_1515DC:: @ 81515DC
-	lock
-	faceplayer
-	msgbox Route119_Text_17157C, 4
-	closemessage
-	applymovement LAST_TALKED, Route119_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route119_EventScript_1515F3:: @ 81515F3
-	msgbox Route119_Text_1715D7, 2
-	end
-
-Route119_EventScript_1515FC:: @ 81515FC
-	msgbox Route119_Text_1716F4, 2
-	end
-
-Route119_EventScript_151605:: @ 8151605
-	msgbox Route119_Text_171774, 3
-	end
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
deleted file mode 100644
index 32c264acc..000000000
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ /dev/null
@@ -1,92 +0,0 @@
-Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2
-	map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8
-	.byte 0
-
-Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8
-	call Route119_WeatherInstitute_2F_EventScript_1A0196
-	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4
-	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4
-	setobjectxyperm 5, 1, 6
-	setobjectmovementtype 5, 10
-	return
-
-Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
-	setobjectxyperm 5, 4, 6
-	setobjectmovementtype 5, 10
-	return
-
-Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
-	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
-	msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13
-	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
-	msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A
-	trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
-	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
-	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
-	closemessage
-	setvar VAR_WEATHER_INSTITUTE_STATE, 1
-	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
-	fadedefaultbgm
-	fadescreen 1
-	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
-	removeobject 1
-	removeobject 2
-	removeobject 3
-	fadescreen 0
-	applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8
-	waitmovement 0
-	moveobjectoffscreen 5
-	goto Route119_WeatherInstitute_2F_EventScript_163D7A
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
-	msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4
-	playfanfare BGM_FANFA4
-	message Route119_WeatherInstitute_2F_Text_19F267
-	waitfanfare
-	waitmessage
-	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
-	setflag FLAG_RECEIVED_CASTFORM
-	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163DB4:: @ 8163DB4
-	msgbox Route119_WeatherInstitute_2F_Text_19F231, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE
-	msgbox Route119_WeatherInstitute_2F_Text_19F2FE, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE
-	goto Route119_WeatherInstitute_2F_EventScript_163D7A
-	end
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
deleted file mode 100644
index 6e9ae80fd..000000000
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ /dev/null
@@ -1,138 +0,0 @@
-Route121_SafariZoneEntrance_MapScripts:: @ 815C323
-	map_script 2, Route121_SafariZoneEntrance_MapScript2_15C329
-	.byte 0
-
-Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329
-	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333
-	.2byte 0
-
-Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333
-	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C348
-	waitmovement 0
-	special ExitSafariMode
-	setvar VAR_SAFARI_ZONE_STATE, 0
-	releaseall
-	end
-
-Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351
-	msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A
-	lock
-	faceplayer
-	msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379
-	msgbox Route121_SafariZoneEntrance_Text_1C373C, 4
-	release
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379
-	msgbox Route121_SafariZoneEntrance_Text_1C375F, 4
-	release
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383
-	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841
-	waitmovement 0
-	showmoneybox 0, 0
-	nop
-	msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3
-	msgbox Route121_SafariZoneEntrance_Text_1C3895, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare RESULT, 0
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450
-	call Route121_SafariZoneEntrance_EventScript_15C425
-	checkmoney 0x1f4, 0
-	compare RESULT, 0
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E
-	msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4
-	takemoney 0x1f4, 0
-	updatemoneybox 0, 0
-	nop
-	msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4
-	playfanfare BGM_FANFA4
-	message Route121_SafariZoneEntrance_Text_1C3910
-	waitfanfare
-	waitmessage
-	msgbox Route121_SafariZoneEntrance_Text_1C392D, 4
-	closemessage
-	hidemoneybox 0, 0
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E
-	waitmovement 0
-	special EnterSafariMode
-	setvar VAR_SAFARI_ZONE_STATE, 2
-	warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33
-	waitstate
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
-	getpartysize
-	compare RESULT, 6
-	goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F
-	specialvar RESULT, CheckFreePokemonStorageSpace
-	compare RESULT, 1
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F
-	msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F
-	return
-
-Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450
-	msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E
-	msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
-	closemessage
-	hidemoneybox 0, 0
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C
-	waitmovement 0
-	releaseall
-	end
-
-Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C
-	walk_right
-	end_movement
-
-Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	delay_16
-	end_movement
-
-Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487
-	msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3
-	end
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
deleted file mode 100644
index b7b36dd6d..000000000
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ /dev/null
@@ -1,175 +0,0 @@
-RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA
-	map_script 3, RustboroCity_DevonCorp_2F_MapScript1_1574D0
-	.byte 0
-
-RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
-	return
-
-RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519
-	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519
-	msgbox RustboroCity_DevonCorp_2F_Text_182C25, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543
-	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543
-	msgbox RustboroCity_DevonCorp_2F_Text_182D7E, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 2
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640
-	msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4
-	checkitem ITEM_ROOT_FOSSIL, 1
-	compare RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6
-	checkitem ITEM_CLAW_FOSSIL, 1
-	compare RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
-	closemessage
-	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
-	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
-	bufferitemname 0, ITEM_ROOT_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	takeitem ITEM_ROOT_FOSSIL, 1
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
-	setvar VAR_WHICH_FOSSIL_REVIVED, 1
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
-	closemessage
-	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
-	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
-	bufferitemname 0, ITEM_CLAW_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	takeitem ITEM_CLAW_FOSSIL, 1
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
-	setvar VAR_WHICH_FOSSIL_REVIVED, 2
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636
-	msgbox RustboroCity_DevonCorp_2F_Text_182FD7, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640
-	msgbox RustboroCity_DevonCorp_2F_Text_183072, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A
-	compare VAR_WHICH_FOSSIL_REVIVED, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661
-	compare VAR_WHICH_FOSSIL_REVIVED, 2
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
-	bufferspeciesname 1, SPECIES_LILEEP
-	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
-	copyvar VAR_SPECIAL_4, RESULT
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
-	setflag FLAG_RECEIVED_FOSSIL_MON
-	playfanfare BGM_FANFA4
-	message RustboroCity_DevonCorp_2F_Text_18319E
-	waitfanfare
-	waitmessage
-	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
-	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
-	bufferspeciesname 1, SPECIES_ANORITH
-	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
-	copyvar VAR_SPECIAL_4, RESULT
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
-	setflag FLAG_RECEIVED_FOSSIL_MON
-	playfanfare BGM_FANFA4
-	message RustboroCity_DevonCorp_2F_Text_18319E
-	waitfanfare
-	waitmessage
-	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
-	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707
-	msgbox RustboroCity_DevonCorp_2F_Text_1831C8, 4
-	release
-	end
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
deleted file mode 100644
index e68269437..000000000
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ /dev/null
@@ -1,194 +0,0 @@
-RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711
-	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721
-	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739
-	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748
-	.byte 0
-
-RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
-	compare VAR_DEVON_CORP_3F_STATE, 0
-	call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D
-	setobjectxyperm 2, 3, 2
-	setobjectmovementtype 2, 9
-	return
-
-RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739
-	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743
-	.2byte 0
-
-RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743
-	turnobject 255, 4
-	end
-
-RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
-	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752
-	.2byte 0
-
-RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
-	lockall
-	msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4
-	closemessage
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815
-	waitmovement 0
-	delay 80
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_183903, 4
-	closemessage
-	playbgm BGM_TSURETEK, FALSE
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4
-	closemessage
-	fadedefaultbgm
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4
-	giveitem_std ITEM_LETTER
-	msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4
-	playfanfare BGM_FANFA4
-	message RustboroCity_DevonCorp_3F_Text_183422
-	waitfanfare
-	waitmessage
-	setflag FLAG_SYS_POKENAV_GET
-	setflag FLAG_RECEIVED_POKENAV
-	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
-	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
-	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
-	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
-	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
-	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
-	setvar VAR_BRINEY_LOCATION, 1
-	clearflag FLAG_HIDE_RIVAL_RUSTBORO
-	setvar VAR_DEVON_CORP_3F_STATE, 1
-	releaseall
-	end
-
-@ 81577FE
-	walk_up
-	walk_up
-	walk_up
-	walk_in_place_fastest_left
-	end_movement
-
-RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_in_place_fastest_left
-	end_movement
-
-RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812
-	delay_16
-	walk_in_place_fastest_down
-	end_movement
-
-RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
-	delay_16
-	delay_16
-	walk_down
-	walk_down
-	walk_in_place_fastest_right
-	end_movement
-
-RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B
-	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864
-	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
-	msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4
-	giveitem_std ITEM_EXP_SHARE
-	compare RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
-	setflag FLAG_RECEIVED_EXP_SHARE
-	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
-	msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5
-	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5
-	msgbox RustboroCity_DevonCorp_3F_Text_1839A3, 4
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF
-	msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3
-	end
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
deleted file mode 100644
index 1aae9faba..000000000
--- a/data/scripts/maps/RusturfTunnel.inc
+++ /dev/null
@@ -1,420 +0,0 @@
-RusturfTunnel_MapScripts:: @ 815C745
-	map_script 3, RusturfTunnel_MapScript1_15C762
-	map_script 2, RusturfTunnel_MapScript2_15C750
-	.byte 0
-
-RusturfTunnel_MapScript2_15C750:: @ 815C750
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1
-	.2byte 0
-
-RusturfTunnel_MapScript1_15C762:: @ 815C762
-	call RusturfTunnel_EventScript_1A0196
-	compare VAR_RUSTURF_TUNNEL_STATE, 2
-	call_if_eq RusturfTunnel_EventScript_15C773
-	end
-
-RusturfTunnel_EventScript_15C773:: @ 815C773
-	setobjectxyperm 7, 13, 4
-	setobjectxyperm 6, 13, 5
-	return
-
-RusturfTunnel_EventScript_15C782:: @ 815C782
-	lock
-	faceplayer
-	msgbox RusturfTunnel_Text_194766, 4
-	closemessage
-	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_15C799:: @ 815C799
-	lock
-	faceplayer
-	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC
-	setflag FLAG_TEMP_1
-	msgbox RusturfTunnel_Text_1944C5, 4
-	closemessage
-	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
-	msgbox RusturfTunnel_Text_1945B2, 4
-	closemessage
-	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
-	lockall
-	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_15C8CA
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C8DF
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C8EA
-	call RusturfTunnel_EventScript_15C92D
-	msgbox RusturfTunnel_Text_19461D, 4
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C8EB
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C8EB
-	giveitem_std ITEM_HM04_STRENGTH
-	setflag FLAG_RECEIVED_HM04
-	msgbox RusturfTunnel_Text_194693, 4
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_15C880
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C892
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C8AE
-	msgbox RusturfTunnel_Text_194706, 4
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_15C8F7
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C909
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C91B
-	call RusturfTunnel_EventScript_1A0442
-	releaseall
-	end
-
-RusturfTunnel_EventScript_15C880:: @ 815C880
-	applymovement 255, RusturfTunnel_Movement_15C96A
-	applymovement 1, RusturfTunnel_Movement_15C98F
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C892:: @ 815C892
-	applymovement 255, RusturfTunnel_Movement_15C96D
-	applymovement 1, RusturfTunnel_Movement_15C994
-	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_1A0845
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8AE:: @ 815C8AE
-	applymovement 255, RusturfTunnel_Movement_15C96D
-	applymovement 1, RusturfTunnel_Movement_15C994
-	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_1A0845
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8CA:: @ 815C8CA
-	applymovement 1, RusturfTunnel_Movement_1A0841
-	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_1A0845
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8DF:: @ 815C8DF
-	applymovement 1, RusturfTunnel_Movement_15C970
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8EA:: @ 815C8EA
-	return
-
-RusturfTunnel_EventScript_15C8EB:: @ 815C8EB
-	closemessage
-	applymovement 1, RusturfTunnel_Movement_15C98D
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8F7:: @ 815C8F7
-	applymovement 10, RusturfTunnel_Movement_15C945
-	applymovement 1, RusturfTunnel_Movement_15C973
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C909:: @ 815C909
-	applymovement 10, RusturfTunnel_Movement_15C951
-	applymovement 1, RusturfTunnel_Movement_15C980
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C91B:: @ 815C91B
-	applymovement 10, RusturfTunnel_Movement_15C951
-	applymovement 1, RusturfTunnel_Movement_15C980
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C92D:: @ 815C92D
-	playse SE_PIN
-	applymovement 1, RusturfTunnel_Movement_1A0833
-	waitmovement 0
-	applymovement 1, RusturfTunnel_Movement_1A0835
-	waitmovement 0
-	return
-
-RusturfTunnel_Movement_15C945:: @ 815C945
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-RusturfTunnel_Movement_15C951:: @ 815C951
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-@ 815C95D
-	walk_left
-	walk_in_place_fastest_right
-	end_movement
-
-@ 815C960
-	walk_down
-	walk_in_place_fastest_up
-	delay_8
-	walk_in_place_fastest_right
-	end_movement
-
-@ 815C965
-	walk_up
-	walk_in_place_fastest_down
-	delay_8
-	walk_in_place_fastest_right
-	end_movement
-
-RusturfTunnel_Movement_15C96A:: @ 815C96A
-	walk_left
-	walk_in_place_fastest_right
-	end_movement
-
-RusturfTunnel_Movement_15C96D:: @ 815C96D
-	walk_right
-	walk_in_place_fastest_left
-	end_movement
-
-RusturfTunnel_Movement_15C970:: @ 815C970
-	walk_up
-	walk_in_place_fastest_right
-	end_movement
-
-RusturfTunnel_Movement_15C973:: @ 815C973
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-RusturfTunnel_Movement_15C980:: @ 815C980
-	walk_up
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	end_movement
-
-RusturfTunnel_Movement_15C98D:: @ 815C98D
-	walk_right
-	end_movement
-
-RusturfTunnel_Movement_15C98F:: @ 815C98F
-	walk_in_place_fast_up
-	walk_in_place_fast_up
-	walk_fast_up
-	walk_fast_right
-	end_movement
-
-RusturfTunnel_Movement_15C994:: @ 815C994
-	walk_in_place_fast_right
-	walk_in_place_fast_right
-	walk_fast_right
-	walk_in_place_fastest_up
-	end_movement
-
-RusturfTunnel_EventScript_15C999:: @ 815C999
-	setvar VAR_TEMP_1, 1
-	end
-
-RusturfTunnel_EventScript_15C99F:: @ 815C99F
-	setvar VAR_TEMP_1, 2
-	end
-
-RusturfTunnel_EventScript_15C9A5:: @ 815C9A5
-	setvar VAR_TEMP_1, 3
-	end
-
-RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
-	lockall
-	msgbox RusturfTunnel_Text_194159, 4
-	closemessage
-	applymovement 6, RusturfTunnel_Movement_15C9D3
-	applymovement 7, RusturfTunnel_Movement_15C9D3
-	waitmovement 0
-	moveobjectoffscreen 6
-	moveobjectoffscreen 7
-	setvar VAR_RUSTURF_TUNNEL_STATE, 3
-	releaseall
-	end
-
-RusturfTunnel_Movement_15C9D3:: @ 815C9D3
-	lock_facing_direction
-	walk_right
-	unlock_facing_direction
-	end_movement
-
-RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox RusturfTunnel_Text_194188, 4
-	waitmoncry
-	release
-	end
-
-RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
-	lock
-	faceplayer
-	playbgm BGM_EVIL_TEAM, FALSE
-	msgbox RusturfTunnel_Text_19419B, 4
-	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
-	msgbox RusturfTunnel_Text_194274, 4
-	giveitem_std ITEM_DEVON_GOODS
-	closemessage
-	applymovement 255, RusturfTunnel_Movement_15CA99
-	applymovement 6, RusturfTunnel_Movement_15CAA2
-	waitmovement 0
-	removeobject 6
-	delay 50
-	addobject 5
-	applymovement 5, RusturfTunnel_Movement_15CAAC
-	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_15CA9F
-	applymovement 5, RusturfTunnel_Movement_15CAC0
-	waitmovement 0
-	msgbox RusturfTunnel_Text_19432A, 4
-	applymovement 5, RusturfTunnel_Movement_1A0839
-	waitmovement 0
-	message RusturfTunnel_Text_19434F
-	waitmessage
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	waitbuttonpress
-	waitmoncry
-	closemessage
-	applymovement 5, RusturfTunnel_Movement_15CAB4
-	applymovement 7, RusturfTunnel_Movement_15CAC3
-	waitmovement 0
-	removeobject 5
-	removeobject 7
-	clearflag FLAG_DEVON_GOODS_STOLEN
-	setflag FLAG_RECOVERED_DEVON_GOODS
-	setvar VAR_RUSTBORO_STATE, 4
-	setvar VAR_BRINEY_HOUSE_STATE, 1
-	setflag FLAG_HIDE_BRINEY_ROUTE116
-	release
-	end
-
-RusturfTunnel_Movement_15CA99:: @ 815CA99
-	face_down
-	lock_facing_direction
-	walk_up
-	unlock_facing_direction
-	walk_in_place_fastest_left
-	end_movement
-
-RusturfTunnel_Movement_15CA9F:: @ 815CA9F
-	walk_down
-	walk_in_place_fastest_up
-	end_movement
-
-RusturfTunnel_Movement_15CAA2:: @ 815CAA2
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	walk_fast_left
-	end_movement
-
-RusturfTunnel_Movement_15CAAC:: @ 815CAAC
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-RusturfTunnel_Movement_15CAB4:: @ 815CAB4
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-RusturfTunnel_Movement_15CAC0:: @ 815CAC0
-	delay_16
-	walk_right
-	end_movement
-
-RusturfTunnel_Movement_15CAC3:: @ 815CAC3
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-RusturfTunnel_EventScript_15CACD:: @ 815CACD
-	trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2
-	msgbox RusturfTunnel_Text_1948C4, 6
-	end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
deleted file mode 100644
index eb46278dd..000000000
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ /dev/null
@@ -1,291 +0,0 @@
-SeafloorCavern_Room9_MapScripts:: @ 815DAE6
-	map_script 3, SeafloorCavern_Room9_MapScript1_15DAEC
-	.byte 0
-
-SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
-	call SeafloorCavern_Room9_EventScript_1A0196
-	call SeafloorCavern_Room9_EventScript_1A01B5
-	.ifdef SAPPHIRE
-	setmaplayoutindex 157
-	.else
-	setmaplayoutindex 327
-	.endif
-	end
-
-SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
-	lockall
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 3
-	setvar VAR_SPECIAL_6, 4
-	setvar VAR_SPECIAL_7, 5
-	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
-	waitmovement 0
-	applymovement 255, SeafloorCavern_Room9_Movement_15DD68
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B41B8, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4850, 4
-	.endif
-	closemessage
-	addobject VAR_SPECIAL_4
-	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
-	waitmovement 0
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B41D5, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B486C, 4
-	.endif
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4201, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4897, 4
-	.endif
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4289, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B491F, 4
-	.endif
-	.ifdef SAPPHIRE
-	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
-	.else
-	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
-	.endif
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B432C, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B49C1, 4
-	.endif
-	setweather WEATHER_NONE
-	doweather
-	special sub_8081924
-	waitstate
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B43C4, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
-	.endif
-	special WaitWeather
-	waitstate
-	.ifdef SAPPHIRE
-	setvar RESULT, 1
-	.else
-	setvar RESULT, 0
-	.endif
-	playse SE_W197
-	setfieldeffectargument 0, 16
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect FLDEFF_SPARKLE
-	waitfieldeffect FLDEFF_SPARKLE
-	.ifdef SAPPHIRE
-	setvar RESULT, 0
-	.else
-	setvar RESULT, 1
-	.endif
-	playfanfare BGM_ME_TAMA
-	playse SE_TAMA
-	special sub_80818A4
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
-	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
-	waitmovement 0
-	delay 150
-	removeobject 7
-	addobject 1
-	waitstate
-	delay 60
-	applymovement 1, SeafloorCavern_Room9_Movement_15DD4C
-	waitmovement 0
-	special sub_80818FC
-	waitstate
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_SPECIAL_5, 1
-	special sub_810F758
-	waitstate
-	applymovement 1, SeafloorCavern_Room9_Movement_15DD57
-	waitmovement 0
-	removeobject 1
-	delay 4
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 2
-	special sub_810F758
-	waitstate
-	delay 30
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 3
-	setvar VAR_SPECIAL_6, 4
-	setvar VAR_SPECIAL_7, 5
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B43F2, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4A89, 4
-	.endif
-	playse SE_PC_LOGON
-	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4443, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
-	.endif
-	closemessage
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B447A, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4B11, 4
-	.endif
-	closemessage
-	playse SE_PC_OFF
-	delay 20
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B45C6, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4C79, 4
-	.endif
-	closemessage
-	addobject VAR_SPECIAL_5
-	addobject VAR_SPECIAL_6
-	addobject VAR_SPECIAL_7
-	applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63
-	applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63
-	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A
-	waitmovement 0
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B464D, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4D02, 4
-	.endif
-	playse SE_PIN
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833
-	waitmovement 0
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4723, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4DD3, 4
-	.endif
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4786, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4E37, 4
-	.endif
-	closemessage
-	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4818, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
-	.endif
-	setvar VAR_ROUTE128_STATE, 1
-	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
-	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
-	clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
-	setvar VAR_SOOTOPOLIS_STATE, 1
-	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
-	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
-	setflag FLAG_SYS_WEATHER_CTRL
-	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
-	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE
-	setvar VAR_STEVENS_HOUSE_STATE, 1
-	setvar VAR_SEAFLOOR_CAVERN_STATE, 1
-	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
-	warp MAP_ROUTE128, 255, 38, 22
-	waitstate
-	releaseall
-	end
-
-SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-@ 815DD3E
-	walk_left
-	walk_left
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41
-	walk_left
-	delay_16
-	end_movement
-
-@ 815DD44
-	walk_right
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
-	face_up
-	lock_facing_direction
-	walk_down
-	unlock_facing_direction
-	walk_in_place_fastest_right
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C
-	delay_16
-	delay_16
-	walk_slow_down
-	delay_16
-	delay_16
-	delay_16
-	walk_slow_down
-	delay_16
-	delay_16
-	delay_16
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57
-	slide_up
-	slide_up
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60
-	walk_right
-	walk_right
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	end_movement
-
-SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68
-	delay_16
-	delay_16
-	end_movement
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
deleted file mode 100644
index 7d244e633..000000000
--- a/data/scripts/maps/SlateportCity.inc
+++ /dev/null
@@ -1,641 +0,0 @@
-SlateportCity_MapScripts:: @ 814BA36
-	map_script 3, SlateportCity_MapScript1_14BA3C
-	.byte 0
-
-SlateportCity_MapScript1_14BA3C:: @ 814BA3C
-	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
-	.else
-	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
-	.endif
-	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
-	call SlateportCity_EventScript_14BA5C
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BA68
-	end
-
-SlateportCity_EventScript_14BA5C:: @ 814BA5C
-	setflag FLAG_VISITED_SLATEPORT_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
-	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
-	return
-
-SlateportCity_EventScript_14BA68:: @ 814BA68
-	setobjectxyperm 11, 28, 13
-	setobjectxyperm 7, 25, 13
-	setobjectxyperm 3, 25, 14
-	setobjectxyperm 6, 27, 16
-	setobjectxyperm 8, 28, 16
-	setobjectxyperm 1, 29, 16
-	setobjectxyperm 2, 31, 14
-	setobjectmovementtype 11, 8
-	setobjectmovementtype 7, 18
-	setobjectmovementtype 3, 16
-	setobjectmovementtype 6, 7
-	setobjectmovementtype 8, 7
-	setobjectmovementtype 1, 7
-	setobjectmovementtype 2, 9
-	return
-
-SlateportCity_EventScript_14BAB6:: @ 814BAB6
-	lock
-	faceplayer
-	message SlateportCity_Text_164642
-	waitmessage
-	pokemart SlateportCity_Items1
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Items1:: @ 814BAD0
-	.2byte ITEM_PROTEIN
-	.2byte ITEM_IRON
-	.2byte ITEM_CARBOS
-	.2byte ITEM_ZINC
-	.2byte ITEM_CALCIUM
-	.2byte ITEM_HP_UP
-	.2byte ITEM_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BAE0:: @ 814BAE0
-	lock
-	faceplayer
-	bufferleadmonspeciesname 0
-	msgbox SlateportCity_Text_164682, 4
-	specialvar RESULT, LeadMonHasEffortRibbon
-	compare RESULT, 1
-	call_if_eq SlateportCity_EventScript_14BB35
-	specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
-	compare RESULT, 0
-	call_if_eq SlateportCity_EventScript_14BB2B
-	msgbox SlateportCity_Text_164691, 4
-	playfanfare BGM_FANFA4
-	message SlateportCity_Text_1646DD
-	waitfanfare
-	waitmessage
-	msgbox SlateportCity_Text_1646FC, 4
-	special GivLeadMonEffortRibbon
-	release
-	end
-
-SlateportCity_EventScript_14BB2B:: @ 814BB2B
-	msgbox SlateportCity_Text_16471C, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB35:: @ 814BB35
-	msgbox SlateportCity_Text_164775, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB3F:: @ 814BB3F
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BB56
-	msgbox SlateportCity_Text_164814, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB56:: @ 814BB56
-	msgbox SlateportCity_Text_165376, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB60:: @ 814BB60
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BB77
-	msgbox SlateportCity_Text_1648A0, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB77:: @ 814BB77
-	msgbox SlateportCity_Text_165222, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB81:: @ 814BB81
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BBA1
-	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB
-	msgbox SlateportCity_Text_164937, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBA1:: @ 814BBA1
-	msgbox SlateportCity_Text_1652A0, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBAB:: @ 814BBAB
-	msgbox SlateportCity_Text_164995, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBB5:: @ 814BBB5
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BBCC
-	msgbox SlateportCity_Text_164A30, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBCC:: @ 814BBCC
-	msgbox SlateportCity_Text_16530A, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBD6:: @ 814BBD6
-	compare VAR_SLATEPORT_STATE, 1
-	goto_if_eq SlateportCity_EventScript_14BBEA
-	msgbox SlateportCity_Text_164AA9, 2
-	end
-
-SlateportCity_EventScript_14BBEA:: @ 814BBEA
-	msgbox SlateportCity_Text_1653D1, 3
-	end
-
-SlateportCity_EventScript_14BBF3:: @ 814BBF3
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BC0A
-	msgbox SlateportCity_Text_164B34, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC0A:: @ 814BC0A
-	msgbox SlateportCity_Text_1653F4, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC14:: @ 814BC14
-	lock
-	faceplayer
-	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29
-	msgbox SlateportCity_Text_164BBF, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC29:: @ 814BC29
-	msgbox SlateportCity_Text_164BEA, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC33:: @ 814BC33
-	msgbox SlateportCity_Text_165856, 3
-	end
-
-SlateportCity_EventScript_14BC3C:: @ 814BC3C
-	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59
-	msgbox SlateportCity_Text_1658A0, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BC59:: @ 814BC59
-	msgbox SlateportCity_Text_1658E8, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BC63:: @ 814BC63
-	msgbox SlateportCity_Text_165952, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BC6D:: @ 814BC6D
-	msgbox SlateportCity_Text_1659B3, 3
-	end
-
-SlateportCity_EventScript_14BC76:: @ 814BC76
-	msgbox SlateportCity_Text_1659E3, 3
-	end
-
-SlateportCity_EventScript_14BC7F:: @ 814BC7F
-	msgbox SlateportCity_Text_165A17, 3
-	end
-
-SlateportCity_EventScript_14BC88:: @ 814BC88
-	msgbox SlateportCity_Text_165A57, 3
-	end
-
-SlateportCity_EventScript_14BC91:: @ 814BC91
-	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5
-	msgbox SlateportCity_Text_165A8B, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BCA5:: @ 814BCA5
-	msgbox SlateportCity_Text_165B02, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BCAF:: @ 814BCAF
-	msgbox SlateportCity_Text_165B48, 3
-	end
-
-SlateportCity_EventScript_14BCB8:: @ 814BCB8
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BCCF
-	msgbox SlateportCity_Text_164F9E, 4
-	release
-	end
-
-SlateportCity_EventScript_14BCCF:: @ 814BCCF
-	msgbox SlateportCity_Text_164F9E, 4
-	release
-	end
-
-SlateportCity_EventScript_14BCD9:: @ 814BCD9
-	msgbox SlateportCity_Text_164FFC, 2
-	end
-
-SlateportCity_EventScript_14BCE2:: @ 814BCE2
-	msgbox SlateportCity_Text_164E85, 2
-	end
-
-SlateportCity_EventScript_14BCEB:: @ 814BCEB
-	msgbox SlateportCity_Text_164EDB, 2
-	end
-
-SlateportCity_EventScript_14BCF4:: @ 814BCF4
-	msgbox SlateportCity_Text_164F62, 2
-	end
-
-SlateportCity_EventScript_14BCFD:: @ 814BCFD
-	msgbox SlateportCity_Text_16507C, 2
-	end
-
-SlateportCity_EventScript_14BD06:: @ 814BD06
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq SlateportCity_EventScript_14BD28
-	compare RESULT, NO
-	call_if_eq SlateportCity_EventScript_14BD31
-	release
-	end
-
-SlateportCity_EventScript_14BD28:: @ 814BD28
-	msgbox SlateportCity_Text_16511E, 4
-	return
-
-SlateportCity_EventScript_14BD31:: @ 814BD31
-	msgbox SlateportCity_Text_1651A1, 4
-	return
-
-SlateportCity_EventScript_14BD3A:: @ 814BD3A
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164C64, 4
-	closemessage
-	applymovement 5, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD51:: @ 814BD51
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164C9F, 4
-	closemessage
-	applymovement 19, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD68:: @ 814BD68
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164CE8, 4
-	closemessage
-	applymovement 20, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD7F:: @ 814BD7F
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164D2B, 4
-	closemessage
-	applymovement 27, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD96:: @ 814BD96
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164D92, 4
-	closemessage
-	applymovement 28, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDAD:: @ 814BDAD
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164DD5, 4
-	closemessage
-	applymovement 29, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDC4:: @ 814BDC4
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164DF4, 4
-	closemessage
-	applymovement 30, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDDB:: @ 814BDDB
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164E46, 4
-	closemessage
-	applymovement 31, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDF2:: @ 814BDF2
-	lock
-	faceplayer
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemartdecoration SlateportCity_Decorations1
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Decorations1:: @ 814BE0C
-	.2byte DECOR_AZURILL_DOLL
-	.2byte DECOR_MARILL_DOLL
-	.2byte DECOR_SKITTY_DOLL
-	.2byte DECOR_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BE16:: @ 814BE16
-	msgbox SlateportCity_Text_1A116E, 4
-	release
-	end
-
-SlateportCity_EventScript_14BE20:: @ 814BE20
-	lock
-	faceplayer
-	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemartdecoration SlateportCity_Decorations2
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Decorations2:: @ 814BE40
-	.2byte DECOR_RED_BRICK
-	.2byte DECOR_BLUE_BRICK
-	.2byte DECOR_YELLOW_BRICK
-	.2byte DECOR_RED_BALLOON
-	.2byte DECOR_BLUE_BALLOON
-	.2byte DECOR_YELLOW_BALLOON
-	.2byte DECOR_C_LOW_NOTE_MAT
-	.2byte DECOR_D_NOTE_MAT
-	.2byte DECOR_E_NOTE_MAT
-	.2byte DECOR_F_NOTE_MAT
-	.2byte DECOR_G_NOTE_MAT
-	.2byte DECOR_A_NOTE_MAT
-	.2byte DECOR_B_NOTE_MAT
-	.2byte DECOR_C_HIGH_NOTE_MAT
-	.2byte DECOR_NONE
-	release
-	end
-
-@ 814BE60
-	lock
-	faceplayer
-	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemartdecoration SlateportCity_Decorations3
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Decorations3:: @ 814BE80
-	.2byte DECOR_MUD_BALL
-	.2byte DECOR_SLIDE
-	.2byte DECOR_FENCE_LENGTH
-	.2byte DECOR_FENCE_WIDTH
-	.2byte DECOR_TIRE
-	.2byte DECOR_BREAKABLE_DOOR
-	.2byte DECOR_SOLID_BOARD
-	.2byte DECOR_STAND
-	.2byte DECOR_TV
-	.2byte DECOR_ROUND_TV
-	.2byte DECOR_CUTE_TV
-	.2byte DECOR_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BE9A:: @ 814BE9A
-	lock
-	faceplayer
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemart SlateportCity_Items2
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Items2:: @ 814BEB4
-	.2byte ITEM_TM10_HIDDEN_POWER
-	.2byte ITEM_TM43_SECRET_POWER
-	.2byte ITEM_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BEBC:: @ 814BEBC
-	lockall
-	msgbox SlateportCity_Text_165498, 4
-	msgbox SlateportCity_Text_1654E0, 4
-	closemessage
-	applymovement 10, SlateportCity_Movement_1A0843
-	waitmovement 0
-	delay 10
-	applymovement 9, SlateportCity_Movement_1A0845
-	waitmovement 0
-	delay 25
-	applymovement 11, SlateportCity_Movement_14C000
-	applymovement 255, SlateportCity_Movement_14C00E
-	applymovement 10, SlateportCity_Movement_14BFDD
-	applymovement 9, SlateportCity_Movement_14BFEA
-	waitmovement 0
-	removeobject 10
-	removeobject 9
-	msgbox SlateportCity_Text_16558D, 4
-	applymovement 11, SlateportCity_Movement_1A0841
-	waitmovement 0
-	msgbox SlateportCity_Text_1655E7, 4
-	playbgm BGM_EVIL_TEAM, FALSE
-	msgbox SlateportCity_Text_1656BC, 4
-	applymovement 6, SlateportCity_Movement_1A083F
-	applymovement 1, SlateportCity_Movement_1A083F
-	applymovement 7, SlateportCity_Movement_14BFCD
-	applymovement 3, SlateportCity_Movement_1A0831
-	applymovement 2, SlateportCity_Movement_14BFD5
-	waitmovement 0
-	applymovement 11, SlateportCity_Movement_1A0845
-	waitmovement 0
-	msgbox SlateportCity_Text_16578F, 4
-	playse SE_PIN
-	applymovement 11, SlateportCity_Movement_1A0833
-	waitmovement 0
-	applymovement 11, SlateportCity_Movement_1A0835
-	waitmovement 0
-	msgbox SlateportCity_Text_1657FA, 4
-	applymovement 11, SlateportCity_Movement_1A0839
-	waitmovement 0
-	msgbox SlateportCity_Text_16583A, 4
-	closemessage
-	applymovement 11, SlateportCity_Movement_14BFFB
-	applymovement 255, SlateportCity_Movement_14C008
-	waitmovement 0
-	removeobject 11
-	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
-	setvar VAR_SLATEPORT_STATE, 2
-	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
-	waitstate
-	releaseall
-	end
-
-SlateportCity_Movement_14BFCD:: @ 814BFCD
-	delay_16
-	delay_16
-	emote_question_mark
-	walk_in_place_fastest_right
-	delay_16
-	delay_16
-	walk_in_place_fastest_left
-	end_movement
-
-SlateportCity_Movement_14BFD5:: @ 814BFD5
-	emote_question_mark
-	walk_in_place_fastest_up
-	delay_16
-	walk_in_place_fastest_down
-	delay_16
-	delay_16
-	walk_in_place_fastest_left
-	end_movement
-
-SlateportCity_Movement_14BFDD:: @ 814BFDD
-	delay_16
-	walk_left
-	walk_left
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-SlateportCity_Movement_14BFEA:: @ 814BFEA
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_down
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-@ 814BFF8
-	walk_down
-	walk_in_place_fastest_up
-	end_movement
-
-SlateportCity_Movement_14BFFB:: @ 814BFFB
-	walk_right
-	walk_up
-	walk_up
-	set_invisible
-	end_movement
-
-SlateportCity_Movement_14C000:: @ 814C000
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_down
-	walk_left
-	end_movement
-
-SlateportCity_Movement_14C008:: @ 814C008
-	walk_in_place_fastest_right
-	delay_16
-	delay_16
-	walk_right
-	walk_up
-	end_movement
-
-SlateportCity_Movement_14C00E:: @ 814C00E
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_in_place_fastest_down
-	end_movement
-
-SlateportCity_EventScript_14C017:: @ 814C017
-	msgbox SlateportCity_Text_165425, 3
-	end
-
-SlateportCity_EventScript_14C020:: @ 814C020
-	msgbox SlateportCity_Text_165458, 3
-	end
-
-SlateportCity_EventScript_14C029:: @ 814C029
-	msgbox SlateportCity_Text_1647A7, 2
-	end
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
deleted file mode 100644
index 8ab61661a..000000000
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ /dev/null
@@ -1,369 +0,0 @@
-SlateportCity_Harbor_MapScripts:: @ 8155F5D
-	map_script 3, SlateportCity_Harbor_MapScript1_155F63
-	.byte 0
-
-SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
-	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
-	setvar VAR_TEMP_1, 0
-	compare VAR_SLATEPORT_HARBOR_STATE, 1
-	call_if_eq SlateportCity_Harbor_EventScript_155F89
-	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85
-	end
-
-SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
-	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
-	return
-
-SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
-	savebgm BGM_EVIL_TEAM
-	setobjectxyperm 4, 12, 13
-	setobjectmovementtype 4, 9
-	setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
-	return
-
-SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF
-	lockall
-	setvar VAR_SPECIAL_8, 3
-	applymovement 255, SlateportCity_Harbor_Movement_1560C2
-	waitmovement 0
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
-	applymovement 7, SlateportCity_Harbor_Movement_1A0845
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0841
-	waitmovement 0
-	msgbox SlateportCity_Harbor_Text_17FD7D, 4
-	closemessage
-	applymovement 6, SlateportCity_Harbor_Movement_15609B
-	applymovement 7, SlateportCity_Harbor_Movement_15609B
-	applymovement 8, SlateportCity_Harbor_Movement_1560A5
-	waitmovement 0
-	removeobject 6
-	removeobject 7
-	removeobject 8
-	setvar VAR_SLATEPORT_HARBOR_STATE, 2
-	compare VAR_SPECIAL_8, 0
-	call_if_eq SlateportCity_Harbor_EventScript_15605C
-	compare VAR_SPECIAL_8, 1
-	call_if_eq SlateportCity_Harbor_EventScript_156071
-	compare VAR_SPECIAL_8, 2
-	call_if_eq SlateportCity_Harbor_EventScript_156086
-	compare VAR_SPECIAL_8, 3
-	call_if_eq SlateportCity_Harbor_EventScript_156086
-	msgbox SlateportCity_Harbor_Text_17FE60, 4
-	closemessage
-	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
-	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
-	moveobjectoffscreen 4
-	setobjectmovementtype 4, 10
-	releaseall
-	end
-
-SlateportCity_Harbor_EventScript_15605C:: @ 815605C
-	applymovement 4, SlateportCity_Harbor_Movement_1560B3
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0845
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_156071:: @ 8156071
-	applymovement 4, SlateportCity_Harbor_Movement_1560B9
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0843
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_156086:: @ 8156086
-	applymovement 4, SlateportCity_Harbor_Movement_1560BE
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0843
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_Movement_15609B:: @ 815609B
-	delay_16
-	delay_16
-	jump_up
-	set_invisible
-	end_movement
-
-@ 81560A0
-	delay_16
-	delay_16
-	jump_up
-	set_invisible
-	end_movement
-
-SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	walk_right
-	walk_right
-	walk_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	walk_fast_right
-	end_movement
-
-SlateportCity_Harbor_Movement_1560B3:: @ 81560B3
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	end_movement
-
-SlateportCity_Harbor_Movement_1560B9:: @ 81560B9
-	walk_left
-	walk_left
-	walk_up
-	walk_left
-	end_movement
-
-SlateportCity_Harbor_Movement_1560BE:: @ 81560BE
-	walk_left
-	walk_left
-	walk_left
-	end_movement
-
-SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
-	walk_up
-	end_movement
-
-SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
-	lock
-	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9
-	msgbox SlateportCity_Harbor_Text_17FA0A, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9
-	msgbox SlateportCity_Harbor_Text_17FA73, 4
-	checkitem ITEM_SS_TICKET, 1
-	compare RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_156135
-	message SlateportCity_Harbor_Text_17FB0A
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1560FD
-	end
-
-SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD
-	multichoicedefault 18, 6, 52, 2, 0
-	switch RESULT
-	case 0, SlateportCity_Harbor_EventScript_15613F
-	case 1, SlateportCity_Harbor_EventScript_156167
-	case 2, SlateportCity_Harbor_EventScript_1561DA
-	case 127, SlateportCity_Harbor_EventScript_1561DA
-	end
-
-SlateportCity_Harbor_EventScript_156135:: @ 8156135
-	msgbox SlateportCity_Harbor_Text_17FAAD, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15613F:: @ 815613F
-	msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_15618A
-	setvar VAR_PORTHOLE_STATE, 1
-	call SlateportCity_Harbor_EventScript_156196
-	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
-	waitstate
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156167:: @ 8156167
-	msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_15618A
-	call SlateportCity_Harbor_EventScript_156196
-	warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23
-	waitstate
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15618A:: @ 815618A
-	message SlateportCity_Harbor_Text_17FBE5
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1560FD
-	end
-
-SlateportCity_Harbor_EventScript_156196:: @ 8156196
-	msgbox SlateportCity_Harbor_Text_17FBB6, 4
-	closemessage
-	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841
-	waitmovement 0
-	delay 30
-	hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
-	compare FACING, 2
-	call_if_eq SlateportCity_Harbor_EventScript_1561EF
-	compare FACING, 4
-	call_if_eq SlateportCity_Harbor_EventScript_1561E4
-	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
-	setvar VAR_SPECIAL_4, 5
-	call SlateportCity_Harbor_EventScript_1A040E
-	return
-
-SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA
-	msgbox SlateportCity_Harbor_Text_17FB5F, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4
-	applymovement 255, SlateportCity_Harbor_Movement_1561FA
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF
-	applymovement 255, SlateportCity_Harbor_Movement_1561FD
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_Movement_1561FA:: @ 81561FA
-	walk_right
-	walk_in_place_fastest_up
-	end_movement
-
-SlateportCity_Harbor_Movement_1561FD:: @ 81561FD
-	walk_up
-	end_movement
-
-SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF
-	msgbox SlateportCity_Harbor_Text_17FC07, 2
-	end
-
-SlateportCity_Harbor_EventScript_156208:: @ 8156208
-	msgbox SlateportCity_Harbor_Text_17FC7C, 2
-	end
-
-SlateportCity_Harbor_EventScript_156211:: @ 8156211
-	lock
-	faceplayer
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258
-	compare VAR_SLATEPORT_HARBOR_STATE, 2
-	goto_if_eq SlateportCity_Harbor_EventScript_15624E
-	msgbox SlateportCity_Harbor_Text_17FD1C, 4
-	closemessage
-	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15624E:: @ 815624E
-	msgbox SlateportCity_Harbor_Text_17FE60, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156258:: @ 8156258
-	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
-	msgbox SlateportCity_Harbor_Text_17FF35, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156265:: @ 8156265
-	msgbox SlateportCity_Harbor_Text_1800A0, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15626F:: @ 815626F
-	compare VAR_TEMP_1, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_156380
-	checkitem ITEM_SCANNER, 1
-	compare RESULT, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D
-	msgbox SlateportCity_Harbor_Text_18017B, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15629D:: @ 815629D
-	msgbox SlateportCity_Harbor_Text_1801EA, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7
-	message SlateportCity_Harbor_Text_18028B
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1562B3
-	end
-
-SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3
-	multichoice 0, 0, 46, 0
-	switch RESULT
-	case 0, SlateportCity_Harbor_EventScript_1562EA
-	case 1, SlateportCity_Harbor_EventScript_15632A
-	case 2, SlateportCity_Harbor_EventScript_15636A
-	case 127, SlateportCity_Harbor_EventScript_15636A
-	end
-
-SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
-	msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem_std ITEM_DEEP_SEA_TOOTH
-	compare RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_156380
-	end
-
-SlateportCity_Harbor_EventScript_15632A:: @ 815632A
-	msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem_std ITEM_DEEP_SEA_SCALE
-	compare RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_156380
-	end
-
-SlateportCity_Harbor_EventScript_15636A:: @ 815636A
-	msgbox SlateportCity_Harbor_Text_180360, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156374:: @ 8156374
-	message SlateportCity_Harbor_Text_180447
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1562B3
-	end
-
-SlateportCity_Harbor_EventScript_156380:: @ 8156380
-	setvar VAR_TEMP_1, 1
-	msgbox SlateportCity_Harbor_Text_180491, 4
-	release
-	end
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
deleted file mode 100644
index 6947d52b1..000000000
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ /dev/null
@@ -1,272 +0,0 @@
-SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA
-	map_script 3, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0
-	.byte 0
-
-SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A0196
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
-	lock
-	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4
-	closemessage
-	playbgm BGM_EVIL_TEAM, TRUE
-	addobject 3
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4
-	waitmovement 0
-	addobject 4
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5
-	waitmovement 0
-	compare FACING, 1
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
-	compare FACING, 4
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4
-	compare FACING, 4
-	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4
-	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2
-	waitmovement 0
-	compare FACING, 1
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78
-	compare FACING, 3
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83
-	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
-	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4
-	savebgm 0
-	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4
-	closemessage
-	delay 35
-	addobject 2
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4
-	.else
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4
-	.endif
-	closemessage
-	fadescreen 1
-	removeobject 2
-	removeobject 3
-	removeobject 4
-	fadescreen 0
-	delay 30
-	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4
-	setvar VAR_SPECIAL_4, 269
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4
-	closemessage
-	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98
-	waitmovement 0
-	playse SE_KAIDAN
-	removeobject 1
-	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110
-	setflag FLAG_DELIVERED_DEVON_GOODS
-	clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
-	setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
-	release
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D
-	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E
-	walk_left
-	walk_down
-	walk_in_place_fastest_left
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92
-	walk_up
-	walk_left
-	walk_left
-	walk_down
-	walk_in_place_fastest_left
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98
-	walk_up
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	walk_left
-	walk_left
-	walk_up
-	walk_up
-	delay_8
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6
-	walk_right
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2
-	walk_right
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4
-	walk_down
-	walk_right
-	walk_in_place_fastest_down
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF
-	lock_facing_direction
-	walk_left
-	unlock_facing_direction
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3
-	walk_down
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5
-	walk_down
-	walk_down
-	walk_down
-	walk_down
-	walk_right
-	walk_right
-	walk_right
-	walk_right
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_16
-	delay_8
-	walk_fast_down
-	walk_in_place_fastest_up
-	end_movement
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EE3:: @ 8155EE3
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EEC:: @ 8155EEC
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EF5:: @ 8155EF5
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EFE:: @ 8155EFE
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F07:: @ 8155F07
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F10:: @ 8155F10
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F19:: @ 8155F19
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F22:: @ 8155F22
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F2B:: @ 8155F2B
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F34:: @ 8155F34
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, 2
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F3D:: @ 8155F3D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, 2
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46
-	lock
-	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4
-	closemessage
-	applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D
-	waitmovement 0
-	release
-	end
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
deleted file mode 100644
index 7377d2298..000000000
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ /dev/null
@@ -1,429 +0,0 @@
-UnknownMap_25_34_MapScripts:: @ 815F580
-	map_script 4, LinkContestRoom1_MapScript2_15F610
-	map_script 2, LinkContestRoom1_MapScript2_15F606
-	map_script 3, LinkContestRoom1_MapScript1_15F595
-	map_script 5, LinkContestRoom1_MapScript1_15F5F4
-	.byte 0
-
-LinkContestRoom1_MapScript1_15F595:: @ 815F595
-	call LinkContestRoom1_EventScript_15F5A5
-	setvar VAR_TEMP_0, 1
-	call LinkContestRoom1_EventScript_15F630
-	end
-
-LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5
-	special ScriptGetMultiplayerId
-	compare RESULT, 0
-	call_if_eq LinkContestRoom1_EventScript_15F5E0
-	compare RESULT, 1
-	call_if_eq LinkContestRoom1_EventScript_15F5E4
-	compare RESULT, 2
-	call_if_eq LinkContestRoom1_EventScript_15F5E8
-	compare RESULT, 3
-	call_if_eq LinkContestRoom1_EventScript_15F5EC
-	compare RESULT, 4
-	call_if_eq LinkContestRoom1_EventScript_15F5F0
-	return
-
-LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0
-	savebgm BGM_TEST1
-	return
-
-LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4
-	savebgm BGM_TEST2
-	return
-
-LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8
-	savebgm BGM_TEST3
-	return
-
-LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC
-	savebgm BGM_TEST4
-	return
-
-LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0
-	savebgm BGM_CONTEST0
-	return
-
-LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4
-	compare VAR_TEMP_9, 1
-	call_if_eq LinkContestRoom1_EventScript_15F600
-	end
-
-LinkContestRoom1_EventScript_15F600:: @ 815F600
-	call LinkContestRoom1_EventScript_15F919
-	return
-
-LinkContestRoom1_MapScript2_15F606:: @ 815F606
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A
-	.2byte 0
-
-LinkContestRoom1_MapScript2_15F610:: @ 815F610
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625
-	.2byte 0
-
-LinkContestRoom1_EventScript_15F61A:: @ 815F61A
-	call LinkContestRoom1_EventScript_1A514D
-	call LinkContestRoom1_EventScript_15FB64
-	end
-
-LinkContestRoom1_EventScript_15F625:: @ 815F625
-	hideobjectat 255, MAP_LITTLEROOT_TOWN
-	call LinkContestRoom1_EventScript_15F919
-	end
-
-LinkContestRoom1_EventScript_15F630:: @ 815F630
-	call LinkContestRoom1_EventScript_15F6E6
-	call LinkContestRoom1_EventScript_15F646
-	compare VAR_TEMP_0, 8
-	goto_if_lt LinkContestRoom1_EventScript_15F630
-	return
-
-LinkContestRoom1_EventScript_15F646:: @ 815F646
-	switch VAR_TEMP_0
-	case 1, LinkContestRoom1_EventScript_15F699
-	case 2, LinkContestRoom1_EventScript_15F6A4
-	case 3, LinkContestRoom1_EventScript_15F6AF
-	case 4, LinkContestRoom1_EventScript_15F6BA
-	case 5, LinkContestRoom1_EventScript_15F6C5
-	case 6, LinkContestRoom1_EventScript_15F6D0
-	case 7, LinkContestRoom1_EventScript_15F6DB
-	end
-
-LinkContestRoom1_EventScript_15F699:: @ 815F699
-	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4
-	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF
-	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA
-	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5
-	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0
-	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB
-	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6
-	setvar RESULT, 32
-	special ScriptRandom
-	addvar RESULT, 1
-	switch RESULT
-	case 1, LinkContestRoom1_EventScript_15F859
-	case 2, LinkContestRoom1_EventScript_15F85F
-	case 3, LinkContestRoom1_EventScript_15F865
-	case 4, LinkContestRoom1_EventScript_15F86B
-	case 5, LinkContestRoom1_EventScript_15F871
-	case 6, LinkContestRoom1_EventScript_15F877
-	case 7, LinkContestRoom1_EventScript_15F87D
-	case 8, LinkContestRoom1_EventScript_15F883
-	case 9, LinkContestRoom1_EventScript_15F889
-	case 10, LinkContestRoom1_EventScript_15F88F
-	case 11, LinkContestRoom1_EventScript_15F895
-	case 12, LinkContestRoom1_EventScript_15F89B
-	case 13, LinkContestRoom1_EventScript_15F8A1
-	case 14, LinkContestRoom1_EventScript_15F8A7
-	case 15, LinkContestRoom1_EventScript_15F8AD
-	case 16, LinkContestRoom1_EventScript_15F8B3
-	case 17, LinkContestRoom1_EventScript_15F8B9
-	case 18, LinkContestRoom1_EventScript_15F8BF
-	case 19, LinkContestRoom1_EventScript_15F8C5
-	case 20, LinkContestRoom1_EventScript_15F8CB
-	case 21, LinkContestRoom1_EventScript_15F8D1
-	case 22, LinkContestRoom1_EventScript_15F8D7
-	case 23, LinkContestRoom1_EventScript_15F8DD
-	case 24, LinkContestRoom1_EventScript_15F8E3
-	case 25, LinkContestRoom1_EventScript_15F8E9
-	case 26, LinkContestRoom1_EventScript_15F8EF
-	case 27, LinkContestRoom1_EventScript_15F8F5
-	case 28, LinkContestRoom1_EventScript_15F8FB
-	case 29, LinkContestRoom1_EventScript_15F901
-	case 30, LinkContestRoom1_EventScript_15F907
-	case 31, LinkContestRoom1_EventScript_15F90D
-	case 32, LinkContestRoom1_EventScript_15F913
-	end
-
-LinkContestRoom1_EventScript_15F859:: @ 815F859
-	setvar VAR_TEMP_1, 5
-	return
-
-LinkContestRoom1_EventScript_15F85F:: @ 815F85F
-	setvar VAR_TEMP_1, 6
-	return
-
-LinkContestRoom1_EventScript_15F865:: @ 815F865
-	setvar VAR_TEMP_1, 7
-	return
-
-LinkContestRoom1_EventScript_15F86B:: @ 815F86B
-	setvar VAR_TEMP_1, 8
-	return
-
-LinkContestRoom1_EventScript_15F871:: @ 815F871
-	setvar VAR_TEMP_1, 10
-	return
-
-LinkContestRoom1_EventScript_15F877:: @ 815F877
-	setvar VAR_TEMP_1, 11
-	return
-
-LinkContestRoom1_EventScript_15F87D:: @ 815F87D
-	setvar VAR_TEMP_1, 12
-	return
-
-LinkContestRoom1_EventScript_15F883:: @ 815F883
-	setvar VAR_TEMP_1, 13
-	return
-
-LinkContestRoom1_EventScript_15F889:: @ 815F889
-	setvar VAR_TEMP_1, 14
-	return
-
-LinkContestRoom1_EventScript_15F88F:: @ 815F88F
-	setvar VAR_TEMP_1, 15
-	return
-
-LinkContestRoom1_EventScript_15F895:: @ 815F895
-	setvar VAR_TEMP_1, 17
-	return
-
-LinkContestRoom1_EventScript_15F89B:: @ 815F89B
-	setvar VAR_TEMP_1, 18
-	return
-
-LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1
-	setvar VAR_TEMP_1, 19
-	return
-
-LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7
-	setvar VAR_TEMP_1, 20
-	return
-
-LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD
-	setvar VAR_TEMP_1, 21
-	return
-
-LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3
-	setvar VAR_TEMP_1, 22
-	return
-
-LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9
-	setvar VAR_TEMP_1, 25
-	return
-
-LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF
-	setvar VAR_TEMP_1, 26
-	return
-
-LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5
-	setvar VAR_TEMP_1, 27
-	return
-
-LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB
-	setvar VAR_TEMP_1, 47
-	return
-
-LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1
-	setvar VAR_TEMP_1, 30
-	return
-
-LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7
-	setvar VAR_TEMP_1, 31
-	return
-
-LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD
-	setvar VAR_TEMP_1, 32
-	return
-
-LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3
-	setvar VAR_TEMP_1, 33
-	return
-
-LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9
-	setvar VAR_TEMP_1, 34
-	return
-
-LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF
-	setvar VAR_TEMP_1, 35
-	return
-
-LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5
-	setvar VAR_TEMP_1, 36
-	return
-
-LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB
-	setvar VAR_TEMP_1, 37
-	return
-
-LinkContestRoom1_EventScript_15F901:: @ 815F901
-	setvar VAR_TEMP_1, 38
-	return
-
-LinkContestRoom1_EventScript_15F907:: @ 815F907
-	setvar VAR_TEMP_1, 44
-	return
-
-LinkContestRoom1_EventScript_15F90D:: @ 815F90D
-	setvar VAR_TEMP_1, 45
-	return
-
-LinkContestRoom1_EventScript_15F913:: @ 815F913
-	setvar VAR_TEMP_1, 46
-	return
-
-LinkContestRoom1_EventScript_15F919:: @ 815F919
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_15F956
-	case 2, LinkContestRoom1_EventScript_15F969
-	case 3, LinkContestRoom1_EventScript_15F9C4
-	case 4, LinkContestRoom1_EventScript_15FA70
-	case 5, LinkContestRoom1_EventScript_15FA70
-	return
-
-LinkContestRoom1_EventScript_15F956:: @ 815F956
-	createvobject 5, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_15F969:: @ 815F969
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 46, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 12, 13, 12, 8, 3, 3
-	createvobject 47, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 48, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 22, 20, 3, 2, 3, 1
-	createvobject 23, 20, 6, 2, 3, 1
-	createvobject 34, 20, 7, 2, 3, 1
-	createvobject 46, 24, 8, 2, 3, 1
-	createvobject 48, 24, 11, 2, 3, 1
-	createvobject 11, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 17, 27, 5, 9, 3, 2
-	createvobject 41, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_15FA70:: @ 815FA70
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	createvobject 49, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 48, 27, 5, 9, 3, 2
-	createvobject 41, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_15FB64:: @ 815FB64
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_15FBA1
-	case 2, LinkContestRoom1_EventScript_15FBAD
-	case 3, LinkContestRoom1_EventScript_15FBB9
-	case 4, LinkContestRoom1_EventScript_15FBC5
-	case 5, LinkContestRoom1_EventScript_15FBD1
-	return
-
-LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4
-	waitstate
-	end
-
-FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3
-	compare RESULT, 1
-	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9
-	return
-
-FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	return
-
-FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9
-	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
-	return
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index a1a99fa89..9f0e67cb6 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
 	call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
 	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
 	waitmovement 0
-	playbgm BGM_INTER_V, FALSE
+	playbgm MUS_INTER_V, FALSE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4
 	closemessage
 	applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
@@ -184,7 +184,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
 	call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D
 	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
 	waitmovement 0
-	playbgm BGM_INTER_V, FALSE
+	playbgm MUS_INTER_V, FALSE
 	msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4
 	closemessage
 	applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
diff --git a/data/text/maps/Route125.s b/data/text/maps/Route125.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route125.s
+++ /dev/null
diff --git a/data/text/maps/Route126.s b/data/text/maps/Route126.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route126.s
+++ /dev/null
diff --git a/data/text/maps/Route127.s b/data/text/maps/Route127.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route127.s
+++ /dev/null
diff --git a/data/text/maps/Route129.s b/data/text/maps/Route129.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route129.s
+++ /dev/null
diff --git a/data/text/maps/Route130.s b/data/text/maps/Route130.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route130.s
+++ /dev/null
diff --git a/data/text/maps/Route131.s b/data/text/maps/Route131.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route131.s
+++ /dev/null
diff --git a/data/text/maps/Route132.s b/data/text/maps/Route132.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route132.s
+++ /dev/null
diff --git a/data/text/maps/Route133.s b/data/text/maps/Route133.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route133.s
+++ /dev/null
diff --git a/data/text/maps/Route134.s b/data/text/maps/Route134.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route134.s
+++ /dev/null
diff --git a/de_after.sh b/de_after.sh
index 92f940d8d..92f940d8d 100755..100644
--- a/de_after.sh
+++ b/de_after.sh
diff --git a/de_before.sh b/de_before.sh
index 392726948..392726948 100755..100644
--- a/de_before.sh
+++ b/de_before.sh
diff --git a/graphics/move_tutor_menu/arrows.png b/graphics/move_tutor_menu/arrows.png
index 2abf39366..2abf39366 100755..100644
--- a/graphics/move_tutor_menu/arrows.png
+++ b/graphics/move_tutor_menu/arrows.png
diff --git a/include/battle_ai_switch_items.h b/include/battle_ai_switch_items.h
index 648cfad74..648cfad74 100755..100644
--- a/include/battle_ai_switch_items.h
+++ b/include/battle_ai_switch_items.h
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 86fd6718f..86fd6718f 100755..100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
diff --git a/include/constants/songs.h b/include/constants/songs.h
index 920873a7c..45e3d335a 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -249,125 +249,125 @@
 #define SE_W287B 245            // Stat Decreased
 #define SE_W114 246             // Haze
 #define SE_W063B 247            // Hyper Beam 2
-#define BGM_STOP 349
-#define BGM_TETSUJI 350         // Littleroot Town Test 'TETSUJI'
-#define BGM_FIELD13 351         // GSC - Route 38
-#define BGM_KACHI22 352         // Wild Pokémon Defeated
-#define BGM_KACHI2 353          // Wild Pokémon Defeated with Intro
-#define BGM_KACHI3 354          // Gym Leader Defeated
-#define BGM_KACHI5 355          // Victory! Elite Four
-#define BGM_PCC 356             // Crystal - Pokémon Communication Center
-#define BGM_NIBI 357            // GSC - Viridian/Saffron/Pewter/etc
-#define BGM_SUIKUN 358          // Crystal - Battle! Legendary Beasts
-#define BGM_DOORO1 359          // Route 101
-#define BGM_DOORO_X1 360        // Route 110
-#define BGM_DOORO_X3 361        // Route 120
-#define BGM_MACHI_S2 362        // Petalburg City
-#define BGM_MACHI_S4 363        // Oldale Town
-#define BGM_GIM 364             // Gym
-#define BGM_NAMINORI 365        // Surfing
-#define BGM_DAN01 366           // Caves and Darkness
-#define BGM_FANFA1 367          // Level Up!
-#define BGM_ME_ASA 368          // Pokémon Healed
-#define BGM_ME_BACHI 369        // Obtained a Badge!
-#define BGM_FANFA4 370          // Obtained an Item!
-#define BGM_FANFA5 371          // Your Pokémon Just Evolved!
-#define BGM_ME_WAZA 372         // Obtained a TM/HM!
-#define BGM_BIJYUTU 373         // Lilycove Musseum
-#define BGM_DOORO_X4 374        // Route 122/Intro
-#define BGM_FUNE_KAN 375        // Slateport Museum
-#define BGM_ME_SHINKA 376       // Evolution Intro
-#define BGM_SHINKA 377          // Evolution
-#define BGM_ME_WASURE 378       // Move Deleted
-#define BGM_SYOUJOEYE 379       // Encounter! Tuber
-#define BGM_BOYEYE 380          // Encounter! Boy
-#define BGM_DAN02 381           // Abandoned Ship
-#define BGM_MACHI_S3 382        // Fortree City
-#define BGM_ODAMAKI 383         // Professor Birch's Lab
-#define BGM_B_TOWER 384         // Battle Tower (RS)
-#define BGM_SWIMEYE 385         // Encounter! Swimmer
-#define BGM_DAN03 386           // Meteor Falls
-#define BGM_ME_KINOMI 387       // Obtained a Berry!
-#define BGM_ME_TAMA 388         // Awakening the Super-Ancient Pokémon
-#define BGM_ME_B_BIG 389        // Slots Jackpot!
-#define BGM_ME_B_SMALL 390      // Slots Victory!
-#define BGM_ME_ZANNEN 391       // Too bad!
-#define BGM_BD_TIME 392         // Roulette!
-#define BGM_TEST1 393           // Contest Test 1
-#define BGM_TEST2 394           // Contest Test 2
-#define BGM_TEST3 395           // Contest Test 3
-#define BGM_TEST4 396           // Contest Test 4
-#define BGM_TEST 397            // Encounter! Gentleman (Test?)
-#define BGM_GOMACHI0 398        // Verdanturf Town
-#define BGM_GOTOWN 399          // Rustboro City
-#define BGM_POKECEN 400         // Pokémon Center
-#define BGM_NEXTROAD 401        // Route 104
-#define BGM_GRANROAD 402        // Route 119
-#define BGM_CYCLING 403         // Cycling
-#define BGM_FRIENDLY 404        // Pokémart
-#define BGM_MISHIRO 405         // Littleroot Town
-#define BGM_TOZAN 406           // Sky Pillar
-#define BGM_GIRLEYE 407         // Encounter! Girl
-#define BGM_MINAMO 408          // Lilycove City
-#define BGM_ASHROAD 409         // Route 111
-#define BGM_EVENT0 410          // Help me!
-#define BGM_DEEPDEEP 411        // Underwater
-#define BGM_KACHI1 412          // Victory! Trainer
-#define BGM_TITLE3 413          // Title Screen
-#define BGM_DEMO1 414           // Opening Movie
-#define BGM_GIRL_SUP 415        // Encounter! May
-#define BGM_HAGESHII 416        // Encounter! Biker
-#define BGM_KAKKOII 417         // Encounter! Electric Trainer
-#define BGM_KAZANBAI 418        // Route 113
-#define BGM_AQA_0 419           // Encounter! Team Aqua
-#define BGM_TSURETEK 420        // Follow Me!
-#define BGM_BOY_SUP 421         // Encounter! Brendan
-#define BGM_RAINBOW 422         // Ever Grande City
-#define BGM_AYASII 423          // Encounter! Psychic
-#define BGM_KACHI4 424          // Victory! Aqua/Magma Grunt
-#define BGM_ROPEWAY 425         // Cable Car
-#define BGM_CASINO 426          // Game Corner
-#define BGM_HIGHTOWN 427        // Dewford Town
-#define BGM_SAFARI 428          // Safari Zone
-#define BGM_C_ROAD 429          // Victory Toad
-#define BGM_AJITO 430           // Aqua/Magma Hideout
-#define BGM_M_BOAT 431          // Sailing
-#define BGM_M_DUNGON 432        // Mt. Pyre (Inside)
-#define BGM_FINECITY 433        // Slateport City
-#define BGM_MACHUPI 434         // Mt. Pyre (Outside)
-#define BGM_P_SCHOOL 435        // Pokémon Trainer's School
-#define BGM_DENDOU 436          // Hall of Fame
-#define BGM_TONEKUSA 437        // Lavaridge Town
-#define BGM_MABOROSI 438        // Sealed Chamber
-#define BGM_CON_FAN 439         // You are the Champion!
-#define BGM_CONTEST0 440        // Pokémon Contest
-#define BGM_MGM0 441            // Encounter! Team Magma
-#define BGM_T_BATTLE 442        // Opening Battle
-#define BGM_OOAME 443           // The Flood
-#define BGM_HIDERI 444          // The Drought
-#define BGM_RUNECITY 445        // Sootopolis City
-#define BGM_CON_K 446           // Berry Blending Results
-#define BGM_EIKOU_R 447         // Hall of Fame
-#define BGM_KARAKURI 448        // Trick House
-#define BGM_HUTAGO 449          // Encounter! Kid
-#define BGM_SITENNOU 450        // Encounter! Elite Four
-#define BGM_YAMA_EYE 451        // Encounter! Hiker
-#define BGM_CONLOBBY 452        // Contest Lobby
-#define BGM_INTER_V 453         // Encounter! Gabby and Ty
-#define BGM_DAIGO 454           // Encounter! Wallace
-#define BGM_THANKFOR 455        // Credits
-#define BGM_END 456             // The End
-#define BGM_BATTLE27 457        // Battle! Wild Pokémon
-#define BGM_BATTLE31 458        // Battle! Team Aqua/Magma
-#define BGM_BATTLE20 459        // Battle! Trainer
-#define BGM_BATTLE32 460        // Battle! Gym Leader
-#define BGM_BATTLE33 461        // Battle! Champion
-#define BGM_BATTLE36 462        // Battle! Regi Trio
-#define BGM_BATTLE34 463        // Battle! Legendary Pokémon
-#define BGM_BATTLE35 464        // Battle! Rival
-#define BGM_BATTLE38 465        // Battle! Elite Four
-#define BGM_BATTLE30 466        // Battle! Archie/Maxie
+#define MUS_STOP 349
+#define MUS_TETSUJI 350         // Littleroot Town Test 'TETSUJI'
+#define MUS_FIELD13 351         // GSC - Route 38
+#define MUS_KACHI22 352         // Wild Pokémon Defeated
+#define MUS_KACHI2 353          // Wild Pokémon Defeated with Intro
+#define MUS_KACHI3 354          // Gym Leader Defeated
+#define MUS_KACHI5 355          // Victory! Elite Four
+#define MUS_PCC 356             // Crystal - Pokémon Communication Center
+#define MUS_NIBI 357            // GSC - Viridian/Saffron/Pewter/etc
+#define MUS_SUIKUN 358          // Crystal - Battle! Legendary Beasts
+#define MUS_DOORO1 359          // Route 101
+#define MUS_DOORO_X1 360        // Route 110
+#define MUS_DOORO_X3 361        // Route 120
+#define MUS_MACHI_S2 362        // Petalburg City
+#define MUS_MACHI_S4 363        // Oldale Town
+#define MUS_GIM 364             // Gym
+#define MUS_NAMINORI 365        // Surfing
+#define MUS_DAN01 366           // Caves and Darkness
+#define MUS_FANFA1 367          // Level Up!
+#define MUS_ME_ASA 368          // Pokémon Healed
+#define MUS_ME_BACHI 369        // Obtained a Badge!
+#define MUS_FANFA4 370          // Obtained an Item!
+#define MUS_FANFA5 371          // Your Pokémon Just Evolved!
+#define MUS_ME_WAZA 372         // Obtained a TM/HM!
+#define MUS_BIJYUTU 373         // Lilycove Musseum
+#define MUS_DOORO_X4 374        // Route 122/Intro
+#define MUS_FUNE_KAN 375        // Slateport Museum
+#define MUS_ME_SHINKA 376       // Evolution Intro
+#define MUS_SHINKA 377          // Evolution
+#define MUS_ME_WASURE 378       // Move Deleted
+#define MUS_SYOUJOEYE 379       // Encounter! Tuber
+#define MUS_BOYEYE 380          // Encounter! Boy
+#define MUS_DAN02 381           // Abandoned Ship
+#define MUS_MACHI_S3 382        // Fortree City
+#define MUS_ODAMAKI 383         // Professor Birch's Lab
+#define MUS_B_TOWER 384         // Battle Tower (RS)
+#define MUS_SWIMEYE 385         // Encounter! Swimmer
+#define MUS_DAN03 386           // Meteor Falls
+#define MUS_ME_KINOMI 387       // Obtained a Berry!
+#define MUS_ME_TAMA 388         // Awakening the Super-Ancient Pokémon
+#define MUS_ME_B_BIG 389        // Slots Jackpot!
+#define MUS_ME_B_SMALL 390      // Slots Victory!
+#define MUS_ME_ZANNEN 391       // Too bad!
+#define MUS_BD_TIME 392         // Roulette!
+#define MUS_TEST1 393           // Contest Test 1
+#define MUS_TEST2 394           // Contest Test 2
+#define MUS_TEST3 395           // Contest Test 3
+#define MUS_TEST4 396           // Contest Test 4
+#define MUS_TEST 397            // Encounter! Gentleman (Test?)
+#define MUS_GOMACHI0 398        // Verdanturf Town
+#define MUS_GOTOWN 399          // Rustboro City
+#define MUS_POKECEN 400         // Pokémon Center
+#define MUS_NEXTROAD 401        // Route 104
+#define MUS_GRANROAD 402        // Route 119
+#define MUS_CYCLING 403         // Cycling
+#define MUS_FRIENDLY 404        // Pokémart
+#define MUS_MISHIRO 405         // Littleroot Town
+#define MUS_TOZAN 406           // Sky Pillar
+#define MUS_GIRLEYE 407         // Encounter! Girl
+#define MUS_MINAMO 408          // Lilycove City
+#define MUS_ASHROAD 409         // Route 111
+#define MUS_EVENT0 410          // Help me!
+#define MUS_DEEPDEEP 411        // Underwater
+#define MUS_KACHI1 412          // Victory! Trainer
+#define MUS_TITLE3 413          // Title Screen
+#define MUS_DEMO1 414           // Opening Movie
+#define MUS_GIRL_SUP 415        // Encounter! May
+#define MUS_HAGESHII 416        // Encounter! Biker
+#define MUS_KAKKOII 417         // Encounter! Electric Trainer
+#define MUS_KAZANBAI 418        // Route 113
+#define MUS_AQA_0 419           // Encounter! Team Aqua
+#define MUS_TSURETEK 420        // Follow Me!
+#define MUS_BOY_SUP 421         // Encounter! Brendan
+#define MUS_RAINBOW 422         // Ever Grande City
+#define MUS_AYASII 423          // Encounter! Psychic
+#define MUS_KACHI4 424          // Victory! Aqua/Magma Grunt
+#define MUS_ROPEWAY 425         // Cable Car
+#define MUS_CASINO 426          // Game Corner
+#define MUS_HIGHTOWN 427        // Dewford Town
+#define MUS_SAFARI 428          // Safari Zone
+#define MUS_C_ROAD 429          // Victory Toad
+#define MUS_AJITO 430           // Aqua/Magma Hideout
+#define MUS_M_BOAT 431          // Sailing
+#define MUS_M_DUNGON 432        // Mt. Pyre (Inside)
+#define MUS_FINECITY 433        // Slateport City
+#define MUS_MACHUPI 434         // Mt. Pyre (Outside)
+#define MUS_P_SCHOOL 435        // Pokémon Trainer's School
+#define MUS_DENDOU 436          // Hall of Fame
+#define MUS_TONEKUSA 437        // Lavaridge Town
+#define MUS_MABOROSI 438        // Sealed Chamber
+#define MUS_CON_FAN 439         // You are the Champion!
+#define MUS_CONTEST0 440        // Pokémon Contest
+#define MUS_MGM0 441            // Encounter! Team Magma
+#define MUS_T_BATTLE 442        // Opening Battle
+#define MUS_OOAME 443           // The Flood
+#define MUS_HIDERI 444          // The Drought
+#define MUS_RUNECITY 445        // Sootopolis City
+#define MUS_CON_K 446           // Berry Blending Results
+#define MUS_EIKOU_R 447         // Hall of Fame
+#define MUS_KARAKURI 448        // Trick House
+#define MUS_HUTAGO 449          // Encounter! Kid
+#define MUS_SITENNOU 450        // Encounter! Elite Four
+#define MUS_YAMA_EYE 451        // Encounter! Hiker
+#define MUS_CONLOBBY 452        // Contest Lobby
+#define MUS_INTER_V 453         // Encounter! Gabby and Ty
+#define MUS_DAIGO 454           // Encounter! Wallace
+#define MUS_THANKFOR 455        // Credits
+#define MUS_END 456             // The End
+#define MUS_BATTLE27 457        // Battle! Wild Pokémon
+#define MUS_BATTLE31 458        // Battle! Team Aqua/Magma
+#define MUS_BATTLE20 459        // Battle! Trainer
+#define MUS_BATTLE32 460        // Battle! Gym Leader
+#define MUS_BATTLE33 461        // Battle! Champion
+#define MUS_BATTLE36 462        // Battle! Regi Trio
+#define MUS_BATTLE34 463        // Battle! Legendary Pokémon
+#define MUS_BATTLE35 464        // Battle! Rival
+#define MUS_BATTLE38 465        // Battle! Elite Four
+#define MUS_BATTLE30 466        // Battle! Archie/Maxie
 
-#define BGM_ROUTE_118 0x7FFF  // What is this for?
+#define MUS_ROUTE_118 0x7FFF  // What is this for?
 
 #endif  // GUARD_CONSTANTS_SONGS_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index a85f5b101..e77342b72 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -2,7 +2,7 @@
 #define GUARD_FIELDMAP2_H
 #include "event_object_movement.h"
 
-extern struct BackupMapData gUnknown_03004870;
+extern struct BackupMapLayout gUnknown_03004870;
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection);
 int GetMapBorderIdAt(int x, int y);
 int CanCameraMoveInDirection(int direction);
@@ -35,9 +35,9 @@ struct MapConnection *sub_8056BA0(s16 x, s16 y); // fieldmap.c
 void sub_8056C50(u16, u16);
 void sav1_camera_get_focus_coords(u16 *x, u16 *y);
 void GetCameraCoords(u16*, u16*);
-void sub_8056D28(struct MapData *pData);
-void sub_8056D38(struct MapData *pData);
-void apply_map_tileset2_palette(struct MapData *pData);
+void sub_8056D28(struct MapLayout *pData);
+void sub_8056D38(struct MapLayout *pData);
+void apply_map_tileset2_palette(struct MapLayout *pData);
 void copy_map_tileset1_tileset2_to_vram(/*TODO: arg types*/);
 void apply_map_tileset1_tileset2_palette(/*TODO: arg types*/);
 
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index dc8558146..799a12a19 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -53,7 +53,7 @@ struct Tileset
     /*0x14*/ TilesetCB callback;
 };
 
-struct MapData
+struct MapLayout
 {
     /*0x00*/ s32 width;
     /*0x04*/ s32 height;
@@ -63,7 +63,7 @@ struct MapData
     /*0x14*/ struct Tileset *secondaryTileset;
 };
 
-struct BackupMapData
+struct BackupMapLayout
 {
     s32 width;
     s32 height;
@@ -157,12 +157,12 @@ struct MapConnections
 
 struct MapHeader
 {
-    /* 0x00 */ struct MapData *mapData;
+    /* 0x00 */ struct MapLayout *mapLayout;
     /* 0x04 */ struct MapEvents *events;
     /* 0x08 */ u8 *mapScripts;
     /* 0x0C */ struct MapConnections *connections;
     /* 0x10 */ u16 music;
-    /* 0x12 */ u16 mapDataId;
+    /* 0x12 */ u16 mapLayoutId;
     /* 0x14 */ u8 regionMapSectionId;
     /* 0x15 */ u8 cave;
     /* 0x16 */ u8 weather;
diff --git a/include/global.h b/include/global.h
index 0f015745b..3c0169606 100644
--- a/include/global.h
+++ b/include/global.h
@@ -649,7 +649,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2E*/ u8 weather;
     /*0x2F*/ u8 weatherCycleStage;
     /*0x30*/ u8 flashLevel;  // flash level on current map, 0 being normal and 4 being the darkest
-    /*0x32*/ u16 mapDataId;
+    /*0x32*/ u16 mapLayoutId;
     /*0x34*/ u16 mapView[0x100];
     /*0x234*/ u8 playerPartyCount;
     /*0x238*/ struct Pokemon playerParty[6];
diff --git a/include/overworld.h b/include/overworld.h
index c123599a2..f7571ee0f 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -41,7 +41,6 @@ void SetGameStat(u8, u32);
 void Overworld_SetEventObjTemplateCoords(u8, s16, s16);
 void Overworld_SetEventObjTemplateMovementType(u8, u8);
 // mapdata_load_assets_to_gpu_and_full_redraw
-// get_mapdata_header
 // ApplyCurrentWarp
 // SetWarpData
 // warp_data_is_not_neg_1
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index af72edef0..af72edef0 100755..100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c
index 5b6d56dac..5b6d56dac 100755..100644
--- a/src/battle/anim/egg.c
+++ b/src/battle/anim/egg.c
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index ec40e26c4..ec40e26c4 100755..100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index fd33d4782..fd33d4782 100755..100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c
index a523df20e..a523df20e 100755..100644
--- a/src/battle/anim/ground.c
+++ b/src/battle/anim/ground.c
diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c
index 50c8b9030..50c8b9030 100755..100644
--- a/src/battle/anim/ice.c
+++ b/src/battle/anim/ice.c
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index 8303e7c68..8303e7c68 100755..100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 79d60125e..11ddd6b71 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -6339,7 +6339,7 @@ void HandleEndTurn_BattleWon(void)
         {
         case TRAINER_CLASS_ELITE_FOUR:
         case TRAINER_CLASS_CHAMPION:
-            PlayBGM(BGM_KACHI5);
+            PlayBGM(MUS_KACHI5);
             break;
         case TRAINER_CLASS_TEAM_AQUA:
         case TRAINER_CLASS_TEAM_MAGMA:
@@ -6347,13 +6347,13 @@ void HandleEndTurn_BattleWon(void)
         case TRAINER_CLASS_AQUA_LEADER:
         case TRAINER_CLASS_MAGMA_ADMIN:
         case TRAINER_CLASS_MAGMA_LEADER:
-            PlayBGM(BGM_KACHI4);
+            PlayBGM(MUS_KACHI4);
             break;
         case TRAINER_CLASS_LEADER:
-            PlayBGM(BGM_KACHI3);
+            PlayBGM(MUS_KACHI3);
             break;
         default:
-            PlayBGM(BGM_KACHI1);
+            PlayBGM(MUS_KACHI1);
             break;
         }
     }
diff --git a/src/battle/battle_ai_switch_items.c b/src/battle/battle_ai_switch_items.c
index 4dd7614bf..4dd7614bf 100755..100644
--- a/src/battle/battle_ai_switch_items.c
+++ b/src/battle/battle_ai_switch_items.c
diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c
index 601e3c6df..601e3c6df 100755..100644
--- a/src/battle/battle_anim_812C144.c
+++ b/src/battle/battle_anim_812C144.c
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index f53959cc2..8c5f68902 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -587,7 +587,7 @@ void ScrSpecial_StartRayquazaBattle(void)
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
-    CreateBattleStartTask(B_TRANSITION_BLUR, BGM_BATTLE34);
+    CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE34);
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -598,9 +598,9 @@ void ScrSpecial_StartGroudonKyogreBattle(void)
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
     if (gGameVersion == VERSION_RUBY)
-        CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON
+        CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON
     else
-        CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE
+        CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -610,7 +610,7 @@ void ScrSpecial_StartRegiBattle(void)
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
-    CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE36);
+    CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_BATTLE36);
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -1172,46 +1172,46 @@ void PlayTrainerEncounterMusic(void)
         switch (sub_803FC58(gTrainerBattleOpponent))
         {
         case TRAINER_ENCOUNTER_MUSIC_MALE:
-            music = BGM_BOYEYE;
+            music = MUS_BOYEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_FEMALE:
-            music = BGM_GIRLEYE;
+            music = MUS_GIRLEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_GIRL:
-            music = BGM_SYOUJOEYE;
+            music = MUS_SYOUJOEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTENSE:
-            music = BGM_HAGESHII;
+            music = MUS_HAGESHII;
             break;
         case TRAINER_ENCOUNTER_MUSIC_COOL:
-            music = BGM_KAKKOII;
+            music = MUS_KAKKOII;
             break;
         case TRAINER_ENCOUNTER_MUSIC_AQUA:
-            music = BGM_AQA_0;
+            music = MUS_AQA_0;
             break;
         case TRAINER_ENCOUNTER_MUSIC_MAGMA:
-            music = BGM_MGM0;
+            music = MUS_MGM0;
             break;
         case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
-            music = BGM_SWIMEYE;
+            music = MUS_SWIMEYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_TWINS:
-            music = BGM_HUTAGO;
+            music = MUS_HUTAGO;
             break;
         case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
-            music = BGM_SITENNOU;
+            music = MUS_SITENNOU;
             break;
         case TRAINER_ENCOUNTER_MUSIC_HIKER:
-            music = BGM_YAMA_EYE;
+            music = MUS_YAMA_EYE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
-            music = BGM_INTER_V;
+            music = MUS_INTER_V;
             break;
         case TRAINER_ENCOUNTER_MUSIC_RICH:
-            music = BGM_TEST;
+            music = MUS_TEST;
             break;
         default:
-            music = BGM_AYASII;
+            music = MUS_AYASII;
         }
         PlayNewMapMusic(music);
     }
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index be2adbf1b..c619141a1 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -815,7 +815,7 @@ static void sub_8046FBC(struct Sprite *sprite)
     {
         gDoingBattleAnim = 0;
         m4aMPlayAllStop();
-        PlaySE(BGM_FANFA5);
+        PlaySE(MUS_FANFA5);
     }
     else if (sprite->data[4] == 315)
     {
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 4531ea546..8bf669a92 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1245,7 +1245,7 @@ static void sub_804E9F8(void)
         {
             gBerryBlenderData->field_178 = GetCurrentMapMusic();
         }
-        PlayBGM(BGM_CYCLING);
+        PlayBGM(MUS_CYCLING);
         break;
     case 100:
         Menu_DrawStdWindowFrame(0, 13, 29, 19);
@@ -1507,7 +1507,7 @@ static void sub_804F378(void)
         {
             gBerryBlenderData->field_178 = GetCurrentMapMusic();
         }
-        PlayBGM(BGM_CYCLING);
+        PlayBGM(MUS_CYCLING);
         PlaySE(SE_MOTER);
         Blender_ControlHitPitch();
         break;
@@ -3524,7 +3524,7 @@ static void sub_8052BD0(u8 taskID)
 {
     if (gTasks[taskID].data[0] == 0)
     {
-        PlayFanfare(BGM_FANFA1);
+        PlayFanfare(MUS_FANFA1);
         gTasks[taskID].data[0]++;
     }
     if (IsFanfareTaskInactive())
diff --git a/src/bike.c b/src/bike.c
index f0f996b6b..41090a375 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -1001,8 +1001,8 @@ void GetOnOffBike(u8 var)
     else
     {
         SetPlayerAvatarTransitionFlags(var);
-        Overworld_SetSavedMusic(BGM_CYCLING);
-        Overworld_ChangeMusicTo(BGM_CYCLING);
+        Overworld_SetSavedMusic(MUS_CYCLING);
+        Overworld_ChangeMusicTo(MUS_CYCLING);
     }
 }
 
diff --git a/src/cable_car.c b/src/cable_car.c
index c4276c733..52111b285 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -386,7 +386,7 @@ static void CableCarMainCallback_Setup(void)
             break;
         case 7:
             BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0));
-            FadeInNewBGM(BGM_ROPEWAY, 1);
+            FadeInNewBGM(MUS_ROPEWAY, 1);
             sub_8123FBC(1);
             gMain.state++;
             break;
diff --git a/src/cable_club.c b/src/cable_club.c
index 0da23c5f3..1e1f0af07 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -766,9 +766,9 @@ static void sub_808382C(u8 taskId)
         break;
     case 5:
         if (gLinkPlayers[0].trainerId & 1)
-            current_map_music_set__default_for_battle(BGM_BATTLE32);
+            current_map_music_set__default_for_battle(MUS_BATTLE32);
         else
-            current_map_music_set__default_for_battle(BGM_BATTLE20);
+            current_map_music_set__default_for_battle(MUS_BATTLE20);
 
         switch (gSpecialVar_0x8004)
         {
diff --git a/src/contest.c b/src/contest.c
index fcadd8ae1..9dff08ea7 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1584,7 +1584,7 @@ void sub_80AC2CC(u8 taskId)
         {
         case 0:
             sub_80B1EA8(-1, 1);
-            PlayFanfare(BGM_ME_ZANNEN);
+            PlayFanfare(MUS_ME_ZANNEN);
             gTasks[taskId].data[10]++;
             break;
         case 1:
diff --git a/src/credits.c b/src/credits.c
index b99bc56bd..1a810492b 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -497,7 +497,7 @@ void sub_81439D0(void)
 
 
     SetVBlankCallback(vblank_8143948);
-    m4aSongNumStart(BGM_THANKFOR);
+    m4aSongNumStart(MUS_THANKFOR);
     SetMainCallback2(sub_814395C);
     gUnknown_02039325 = 0;
 
@@ -741,7 +741,7 @@ static void task_a_8144080(u8 taskIdA)
         }
 
         if (gTasks[taskIdA].data[TDA_0] == 6840)
-            m4aSongNumStart(BGM_END);
+            m4aSongNumStart(MUS_END);
 
         gTasks[taskIdA].data[TDA_0] -= 1;
     }
diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h
index 67eb70ee1..7ae5467dd 100644
--- a/src/data/battle_strings_en.h
+++ b/src/data/battle_strings_en.h
@@ -747,8 +747,8 @@ const u8 BattleText_BallBrokeOhNo[] = _("Oh, no!\nThe POKéMON broke free!");
 const u8 BattleText_BallBrokeAppeared[] = _("Aww!\nIt appeared to be caught!");
 const u8 BattleText_BallBrokeAlmost[] = _("Aargh!\nAlmost had it!");
 const u8 BattleText_BallBrokeSoClose[] = _("Shoot!\nIt was so close, too!");
-const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p");
-const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}");
+const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p");
+const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}");
 const u8 BattleText_GiveNickname[] = _("Give a nickname to the\ncaptured {STRING 3}?");
 const u8 BattleText_SentToPC[] = _("{STRING 3} was sent to\n{STRING 35} PC.");
 const u8 BattleText_Someone[] = _("someone’s");
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index 8f1bb96a8..8f1bb96a8 100755..100644
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/field_event_obj/field_effect_object_graphics.h
index 36850a4ec..36850a4ec 100755..100644
--- a/src/data/field_event_obj/field_effect_object_graphics.h
+++ b/src/data/field_event_obj/field_effect_object_graphics.h
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index a20d58319..508dc048e 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -752,14 +752,14 @@ static const u8 Str_843E58D[] = _(
 static u16 FishingPoints_CountFishingTilesInMapThird(u8 a0)
 {
     u16 retval = 0;
-    u16 height = gMapHeader.mapData->height / 3;
+    u16 height = gMapHeader.mapLayout->height / 3;
     u16 y;
     u16 x;
     u16 start = height * a0;
 
     for (y = start; y < start + height; y++)
     {
-        for (x = 0; x < gMapHeader.mapData->width; x++)
+        for (x = 0; x < gMapHeader.mapLayout->width; x++)
         {
             if (MetatileBehavior_IsFeebasEncounterable(MapGridGetMetatileBehaviorAt(x + 7, y + 7)) == TRUE)
             {
@@ -783,9 +783,9 @@ static u16 FishingPoints_GetIndexOfCurrentFishingSpot(void)
     x -= 7;
     y -= 7;
 
-    for (yy = 0; yy < gMapHeader.mapData->height; yy++)
+    for (yy = 0; yy < gMapHeader.mapLayout->height; yy++)
     {
-        for (xx = 0; xx < gMapHeader.mapData->width; xx++)
+        for (xx = 0; xx < gMapHeader.mapLayout->width; xx++)
         {
             if (MetatileBehavior_IsFeebasEncounterable(MapGridGetMetatileBehaviorAt(xx + 7, yy + 7)) == TRUE)
             {
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index 1fcf52f38..d57c699da 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -19,7 +19,7 @@
 // window selections
 enum
 {
-    BGM_WINDOW,
+    MUS_WINDOW,
     SE_WINDOW
 };
 
@@ -151,7 +151,7 @@ void CB2_StartSoundCheckMenu(void)
     SetMainCallback2(CB2_SoundCheckMenu);
     REG_DISPCNT = 0x7140;
     taskId = CreateTask(Task_InitSoundCheckMenu, 0);
-    gTasks[taskId].tWindowSelected = BGM_WINDOW;
+    gTasks[taskId].tWindowSelected = MUS_WINDOW;
     gTasks[taskId].tBgmIndex = 0;
     gTasks[taskId].tSeIndex = 0;
     gTasks[taskId].data[3] = 0;
@@ -196,7 +196,7 @@ extern const u8 *const gSENames[];
 void sub_80BA384(u8 taskId) // Task_HandleDrawingSoundCheckMenuText
 {
     HighlightSelectedWindow(gTasks[taskId].tWindowSelected);
-    PrintSoundNumber(gTasks[taskId].tBgmIndex + BGM_STOP, 7, 8); // print by BGM index
+    PrintSoundNumber(gTasks[taskId].tBgmIndex + MUS_STOP, 7, 8); // print by BGM index
     sub_80BA79C(gBGMNames[gTasks[taskId].tBgmIndex], 11, 8);
     PrintSoundNumber(gTasks[taskId].tSeIndex, 7, 15);
     sub_80BA79C(gSENames[gTasks[taskId].tSeIndex], 11, 15);
@@ -247,19 +247,19 @@ bool8 Task_ProcessSoundCheckMenuInput(u8 taskId)
             {
                 if (gTasks[taskId].tBgmIndex != 0)
                 {
-                    m4aSongNumStop(gTasks[taskId].data[3] + BGM_STOP);
-                    m4aSongNumStart(gTasks[taskId].tBgmIndex + BGM_STOP);
+                    m4aSongNumStop(gTasks[taskId].data[3] + MUS_STOP);
+                    m4aSongNumStart(gTasks[taskId].tBgmIndex + MUS_STOP);
                     gTasks[taskId].data[3] = gTasks[taskId].tBgmIndex;
                 }
                 else
                 {
-                    m4aSongNumStop(gTasks[taskId].data[3] + BGM_STOP);
+                    m4aSongNumStop(gTasks[taskId].data[3] + MUS_STOP);
                     gTasks[taskId].data[3] = 0;
                 }
             }
             else if (gTasks[taskId].tBgmIndex != 0)
             {
-                m4aSongNumStart(gTasks[taskId].tBgmIndex + BGM_STOP);
+                m4aSongNumStart(gTasks[taskId].tBgmIndex + MUS_STOP);
                 gTasks[taskId].data[3] = gTasks[taskId].tBgmIndex;
             }
         }
@@ -346,7 +346,7 @@ void HighlightSelectedWindow(u8 windowType)
 {
     switch (windowType)
     {
-    case BGM_WINDOW:
+    case MUS_WINDOW:
     default:
         REG_WIN1H = WIN_RANGE(17, 223);
         REG_WIN1V = WIN_RANGE(41, 87);
@@ -819,124 +819,124 @@ void sub_80BB1D4(void)
 }
 
 #define SOUND_LIST_BGM \
-	X(BGM_STOP, "STOP") \
-	X(BGM_TETSUJI, "TETSUJI") \
-	X(BGM_FIELD13, "FIELD13") \
-	X(BGM_KACHI22, "KACHI22") \
-	X(BGM_KACHI2, "KACHI2") \
-	X(BGM_KACHI3, "KACHI3") \
-	X(BGM_KACHI5, "KACHI5") \
-	X(BGM_PCC, "PCC") \
-	X(BGM_NIBI, "NIBI") \
-	X(BGM_SUIKUN, "SUIKUN") \
-	X(BGM_DOORO1, "DOORO1") \
-	X(BGM_DOORO_X1, "DOORO-X1") \
-	X(BGM_DOORO_X3, "DOORO-X3") \
-	X(BGM_MACHI_S2, "MACHI-S2") \
-	X(BGM_MACHI_S4, "MACHI-S4") \
-	X(BGM_GIM, "GIM") \
-	X(BGM_NAMINORI, "NAMINORI") \
-	X(BGM_DAN01, "DAN01") \
-	X(BGM_FANFA1, "FANFA1") \
-	X(BGM_ME_ASA, "ME-ASA") \
-	X(BGM_ME_BACHI, "ME-BACHI") \
-	X(BGM_FANFA4, "FANFA4") \
-	X(BGM_FANFA5, "FANFA5") \
-	X(BGM_ME_WAZA, "ME-WAZA") \
-	X(BGM_BIJYUTU, "BIJYUTU") \
-	X(BGM_DOORO_X4, "DOORO-X4") \
-	X(BGM_FUNE_KAN, "FUNE-KAN") \
-	X(BGM_ME_SHINKA, "ME-SHINKA") \
-	X(BGM_SHINKA, "SHINKA") \
-	X(BGM_ME_WASURE, "ME-WASURE") \
-	X(BGM_SYOUJOEYE, "SYOUJOEYE") \
-	X(BGM_BOYEYE, "BOYEYE") \
-	X(BGM_DAN02, "DAN02") \
-	X(BGM_MACHI_S3, "MACHI-S3") \
-	X(BGM_ODAMAKI, "ODAMAKI") \
-	X(BGM_B_TOWER, "B-TOWER") \
-	X(BGM_SWIMEYE, "SWIMEYE") \
-	X(BGM_DAN03, "DAN03") \
-	X(BGM_ME_KINOMI, "ME-KINOMI") \
-	X(BGM_ME_TAMA, "ME-TAMA") \
-	X(BGM_ME_B_BIG, "ME-B-BIG") \
-	X(BGM_ME_B_SMALL, "ME-B-SMALL") \
-	X(BGM_ME_ZANNEN, "ME-ZANNEN") \
-	X(BGM_BD_TIME, "BD-TIME") \
-	X(BGM_TEST1, "TEST1") \
-	X(BGM_TEST2, "TEST2") \
-	X(BGM_TEST3, "TEST3") \
-	X(BGM_TEST4, "TEST4") \
-	X(BGM_TEST, "TEST") \
-	X(BGM_GOMACHI0, "GOMACHI0") \
-	X(BGM_GOTOWN, "GOTOWN") \
-	X(BGM_POKECEN, "POKECEN") \
-	X(BGM_NEXTROAD, "NEXTROAD") \
-	X(BGM_GRANROAD, "GRANROAD") \
-	X(BGM_CYCLING, "CYCLING") \
-	X(BGM_FRIENDLY, "FRIENDLY") \
-	X(BGM_MISHIRO, "MISHIRO") \
-	X(BGM_TOZAN, "TOZAN") \
-	X(BGM_GIRLEYE, "GIRLEYE") \
-	X(BGM_MINAMO, "MINAMO") \
-	X(BGM_ASHROAD, "ASHROAD") \
-	X(BGM_EVENT0, "EVENT0") \
-	X(BGM_DEEPDEEP, "DEEPDEEP") \
-	X(BGM_KACHI1, "KACHI1") \
-	X(BGM_TITLE3, "TITLE3") \
-	X(BGM_DEMO1, "DEMO1") \
-	X(BGM_GIRL_SUP, "GIRL-SUP") \
-	X(BGM_HAGESHII, "HAGESHII") \
-	X(BGM_KAKKOII, "KAKKOII") \
-	X(BGM_KAZANBAI, "KAZANBAI") \
-	X(BGM_AQA_0, "AQA-0") \
-	X(BGM_TSURETEK, "TSURETEK") \
-	X(BGM_BOY_SUP, "BOY-SUP") \
-	X(BGM_RAINBOW, "RAINBOW") \
-	X(BGM_AYASII, "AYASII") \
-	X(BGM_KACHI4, "KACHI4") \
-	X(BGM_ROPEWAY, "ROPEWAY") \
-	X(BGM_CASINO, "CASINO") \
-	X(BGM_HIGHTOWN, "HIGHTOWN") \
-	X(BGM_SAFARI, "SAFARI") \
-	X(BGM_C_ROAD, "C-ROAD") \
-	X(BGM_AJITO, "AJITO") \
-	X(BGM_M_BOAT, "M-BOAT") \
-	X(BGM_M_DUNGON, "M-DUNGON") \
-	X(BGM_FINECITY, "FINECITY") \
-	X(BGM_MACHUPI, "MACHUPI") \
-	X(BGM_P_SCHOOL, "P-SCHOOL") \
-	X(BGM_DENDOU, "DENDOU") \
-	X(BGM_TONEKUSA, "TONEKUSA") \
-	X(BGM_MABOROSI, "MABOROSI") \
-	X(BGM_CON_FAN, "CON-FAN") \
-	X(BGM_CONTEST0, "CONTEST0") \
-	X(BGM_MGM0, "MGM0") \
-	X(BGM_T_BATTLE, "T-BATTLE") \
-	X(BGM_OOAME, "OOAME") \
-	X(BGM_HIDERI, "HIDERI") \
-	X(BGM_RUNECITY, "RUNECITY") \
-	X(BGM_CON_K, "CON-K") \
-	X(BGM_EIKOU_R, "EIKOU-R") \
-	X(BGM_KARAKURI, "KARAKURI") \
-	X(BGM_HUTAGO, "HUTAGO") \
-	X(BGM_SITENNOU, "SITENNOU") \
-	X(BGM_YAMA_EYE, "YAMA-EYE") \
-	X(BGM_CONLOBBY, "CONLOBBY") \
-	X(BGM_INTER_V, "INTER-V") \
-	X(BGM_DAIGO, "DAIGO") \
-	X(BGM_THANKFOR, "THANKFOR") \
-	X(BGM_END, "END") \
-	X(BGM_BATTLE27, "BATTLE27") \
-	X(BGM_BATTLE31, "BATTLE31") \
-	X(BGM_BATTLE20, "BATTLE20") \
-	X(BGM_BATTLE32, "BATTLE32") \
-	X(BGM_BATTLE33, "BATTLE33") \
-	X(BGM_BATTLE36, "BATTLE36") \
-	X(BGM_BATTLE34, "BATTLE34") \
-	X(BGM_BATTLE35, "BATTLE35") \
-	X(BGM_BATTLE38, "BATTLE38") \
-	X(BGM_BATTLE30, "BATTLE30")
+	X(MUS_STOP, "STOP") \
+	X(MUS_TETSUJI, "TETSUJI") \
+	X(MUS_FIELD13, "FIELD13") \
+	X(MUS_KACHI22, "KACHI22") \
+	X(MUS_KACHI2, "KACHI2") \
+	X(MUS_KACHI3, "KACHI3") \
+	X(MUS_KACHI5, "KACHI5") \
+	X(MUS_PCC, "PCC") \
+	X(MUS_NIBI, "NIBI") \
+	X(MUS_SUIKUN, "SUIKUN") \
+	X(MUS_DOORO1, "DOORO1") \
+	X(MUS_DOORO_X1, "DOORO-X1") \
+	X(MUS_DOORO_X3, "DOORO-X3") \
+	X(MUS_MACHI_S2, "MACHI-S2") \
+	X(MUS_MACHI_S4, "MACHI-S4") \
+	X(MUS_GIM, "GIM") \
+	X(MUS_NAMINORI, "NAMINORI") \
+	X(MUS_DAN01, "DAN01") \
+	X(MUS_FANFA1, "FANFA1") \
+	X(MUS_ME_ASA, "ME-ASA") \
+	X(MUS_ME_BACHI, "ME-BACHI") \
+	X(MUS_FANFA4, "FANFA4") \
+	X(MUS_FANFA5, "FANFA5") \
+	X(MUS_ME_WAZA, "ME-WAZA") \
+	X(MUS_BIJYUTU, "BIJYUTU") \
+	X(MUS_DOORO_X4, "DOORO-X4") \
+	X(MUS_FUNE_KAN, "FUNE-KAN") \
+	X(MUS_ME_SHINKA, "ME-SHINKA") \
+	X(MUS_SHINKA, "SHINKA") \
+	X(MUS_ME_WASURE, "ME-WASURE") \
+	X(MUS_SYOUJOEYE, "SYOUJOEYE") \
+	X(MUS_BOYEYE, "BOYEYE") \
+	X(MUS_DAN02, "DAN02") \
+	X(MUS_MACHI_S3, "MACHI-S3") \
+	X(MUS_ODAMAKI, "ODAMAKI") \
+	X(MUS_B_TOWER, "B-TOWER") \
+	X(MUS_SWIMEYE, "SWIMEYE") \
+	X(MUS_DAN03, "DAN03") \
+	X(MUS_ME_KINOMI, "ME-KINOMI") \
+	X(MUS_ME_TAMA, "ME-TAMA") \
+	X(MUS_ME_B_BIG, "ME-B-BIG") \
+	X(MUS_ME_B_SMALL, "ME-B-SMALL") \
+	X(MUS_ME_ZANNEN, "ME-ZANNEN") \
+	X(MUS_BD_TIME, "BD-TIME") \
+	X(MUS_TEST1, "TEST1") \
+	X(MUS_TEST2, "TEST2") \
+	X(MUS_TEST3, "TEST3") \
+	X(MUS_TEST4, "TEST4") \
+	X(MUS_TEST, "TEST") \
+	X(MUS_GOMACHI0, "GOMACHI0") \
+	X(MUS_GOTOWN, "GOTOWN") \
+	X(MUS_POKECEN, "POKECEN") \
+	X(MUS_NEXTROAD, "NEXTROAD") \
+	X(MUS_GRANROAD, "GRANROAD") \
+	X(MUS_CYCLING, "CYCLING") \
+	X(MUS_FRIENDLY, "FRIENDLY") \
+	X(MUS_MISHIRO, "MISHIRO") \
+	X(MUS_TOZAN, "TOZAN") \
+	X(MUS_GIRLEYE, "GIRLEYE") \
+	X(MUS_MINAMO, "MINAMO") \
+	X(MUS_ASHROAD, "ASHROAD") \
+	X(MUS_EVENT0, "EVENT0") \
+	X(MUS_DEEPDEEP, "DEEPDEEP") \
+	X(MUS_KACHI1, "KACHI1") \
+	X(MUS_TITLE3, "TITLE3") \
+	X(MUS_DEMO1, "DEMO1") \
+	X(MUS_GIRL_SUP, "GIRL-SUP") \
+	X(MUS_HAGESHII, "HAGESHII") \
+	X(MUS_KAKKOII, "KAKKOII") \
+	X(MUS_KAZANBAI, "KAZANBAI") \
+	X(MUS_AQA_0, "AQA-0") \
+	X(MUS_TSURETEK, "TSURETEK") \
+	X(MUS_BOY_SUP, "BOY-SUP") \
+	X(MUS_RAINBOW, "RAINBOW") \
+	X(MUS_AYASII, "AYASII") \
+	X(MUS_KACHI4, "KACHI4") \
+	X(MUS_ROPEWAY, "ROPEWAY") \
+	X(MUS_CASINO, "CASINO") \
+	X(MUS_HIGHTOWN, "HIGHTOWN") \
+	X(MUS_SAFARI, "SAFARI") \
+	X(MUS_C_ROAD, "C-ROAD") \
+	X(MUS_AJITO, "AJITO") \
+	X(MUS_M_BOAT, "M-BOAT") \
+	X(MUS_M_DUNGON, "M-DUNGON") \
+	X(MUS_FINECITY, "FINECITY") \
+	X(MUS_MACHUPI, "MACHUPI") \
+	X(MUS_P_SCHOOL, "P-SCHOOL") \
+	X(MUS_DENDOU, "DENDOU") \
+	X(MUS_TONEKUSA, "TONEKUSA") \
+	X(MUS_MABOROSI, "MABOROSI") \
+	X(MUS_CON_FAN, "CON-FAN") \
+	X(MUS_CONTEST0, "CONTEST0") \
+	X(MUS_MGM0, "MGM0") \
+	X(MUS_T_BATTLE, "T-BATTLE") \
+	X(MUS_OOAME, "OOAME") \
+	X(MUS_HIDERI, "HIDERI") \
+	X(MUS_RUNECITY, "RUNECITY") \
+	X(MUS_CON_K, "CON-K") \
+	X(MUS_EIKOU_R, "EIKOU-R") \
+	X(MUS_KARAKURI, "KARAKURI") \
+	X(MUS_HUTAGO, "HUTAGO") \
+	X(MUS_SITENNOU, "SITENNOU") \
+	X(MUS_YAMA_EYE, "YAMA-EYE") \
+	X(MUS_CONLOBBY, "CONLOBBY") \
+	X(MUS_INTER_V, "INTER-V") \
+	X(MUS_DAIGO, "DAIGO") \
+	X(MUS_THANKFOR, "THANKFOR") \
+	X(MUS_END, "END") \
+	X(MUS_BATTLE27, "BATTLE27") \
+	X(MUS_BATTLE31, "BATTLE31") \
+	X(MUS_BATTLE20, "BATTLE20") \
+	X(MUS_BATTLE32, "BATTLE32") \
+	X(MUS_BATTLE33, "BATTLE33") \
+	X(MUS_BATTLE36, "BATTLE36") \
+	X(MUS_BATTLE34, "BATTLE34") \
+	X(MUS_BATTLE35, "BATTLE35") \
+	X(MUS_BATTLE38, "BATTLE38") \
+	X(MUS_BATTLE30, "BATTLE30")
 
 #define SOUND_LIST_SE \
 	X(SE_STOP, "STOP") \
diff --git a/src/decoration.c b/src/decoration.c
index 8eff1270f..a4976932d 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2271,7 +2271,7 @@ void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 * unk_0203
         sub_81008BC(unk_02038900);
         sub_8100930(unk_02038900->decoration->shape);
         sub_8100874(unk_02038900);
-        sub_810070C(unk_02038900->palette, ((u16 *)gMapHeader.mapData->secondaryTileset->metatiles + 8 * unk_02038900->decoration->tiles[0])[7] >> 12);
+        sub_810070C(unk_02038900->palette, ((u16 *)gMapHeader.mapLayout->secondaryTileset->metatiles + 8 * unk_02038900->decoration->tiles[0])[7] >> 12);
         LoadSpritePalette(&gUnknown_083EC954);
         gUnknown_020391A8 = gSprites[gFieldCamera.trackedSpriteId].data[0];
         gFieldCamera.trackedSpriteId = CreateSprite(&gSpriteTemplate_83EC93C, gUnknown_083EC900[unk_02038900->decoration->shape].x,  gUnknown_083EC900[unk_02038900->decoration->shape].y, 0);
@@ -3206,7 +3206,7 @@ bool8 sub_810038C(u8 taskId)
     {
         data[1]++;
         return FALSE;
-    } else if (gUnknown_020391AA == DIR_NORTH && data[1] - 7 >= gMapHeader.mapData->height)
+    } else if (gUnknown_020391AA == DIR_NORTH && data[1] - 7 >= gMapHeader.mapLayout->height)
     {
         data[1]--;
         return FALSE;
@@ -3214,7 +3214,7 @@ bool8 sub_810038C(u8 taskId)
     {
         data[0]++;
         return FALSE;
-    } else if (gUnknown_020391AA == DIR_EAST && data[0] + data[5] - 8 >= gMapHeader.mapData->width)
+    } else if (gUnknown_020391AA == DIR_EAST && data[0] + data[5] - 8 >= gMapHeader.mapLayout->width)
     {
         data[0]--;
         return FALSE;
@@ -3336,7 +3336,7 @@ void sub_810070C(u16 *a0, u16 a1)
     u16 i;
     for (i=0; i<16; i++)
     {
-        a0[i] = ((u16 *)gMapHeader.mapData->primaryTileset->palettes)[16 * a1 + i];
+        a0[i] = ((u16 *)gMapHeader.mapLayout->primaryTileset->palettes)[16 * a1 + i];
     }
 }
 
@@ -3352,7 +3352,7 @@ void sub_8100740(u8 *dest, u16 flags)
     }
     for (i=0; i<32; i++)
     {
-        buffer[i] = ((u8 *)gMapHeader.mapData->primaryTileset->tiles)[flags * 32 + i];
+        buffer[i] = ((u8 *)gMapHeader.mapLayout->primaryTileset->tiles)[flags * 32 + i];
     }
     switch (mode)
     {
@@ -3398,7 +3398,7 @@ void sub_8100874(struct UnkStruct_02038900 *unk_02038900)
 
 u16 sub_810089C(u16 a0)
 {
-    return ((u16 *)gMapHeader.mapData->secondaryTileset->metatiles)[a0] & 0xfff;
+    return ((u16 *)gMapHeader.mapLayout->secondaryTileset->metatiles)[a0] & 0xfff;
 }
 
 const u8 Unknown_3EC660[] = {0, 1, 2, 3};
@@ -3665,7 +3665,7 @@ void sub_8100B6C(void)
             {
                 for (k=0; k<gUnknown_020391B4[i].width; k++)
                 {
-                    MapGridSetMetatileEntryAt(x + 7 + k, y + 7 - j, ((u16 *)gMapHeader.mapData->map)[(x + k) + gMapHeader.mapData->width * (y - j)] | 0x3000);
+                    MapGridSetMetatileEntryAt(x + 7 + k, y + 7 - j, ((u16 *)gMapHeader.mapLayout->map)[(x + k) + gMapHeader.mapLayout->width * (y - j)] | 0x3000);
                 }
             }
             sub_8100A60(gUnknown_020391B4[i].decorId);
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 48d5dd82c..182f85d8d 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -567,14 +567,14 @@ static void Task_EvolutionScene(u8 taskID)
     case 3: // wait for cry, play tu du SE
         if (IsCryFinished())
         {
-            PlaySE(BGM_ME_SHINKA);
+            PlaySE(MUS_ME_SHINKA);
             gTasks[taskID].tState++;
         }
         break;
     case 4: // play evolution music and fade screen black
         if (!IsSEPlaying())
         {
-            PlayNewMapMusic(BGM_SHINKA);
+            PlayNewMapMusic(MUS_SHINKA);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0));
         }
@@ -642,7 +642,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo);
             Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
-            PlayBGM(BGM_FANFA5);
+            PlayBGM(MUS_FANFA5);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -719,7 +719,7 @@ static void Task_EvolutionScene(u8 taskID)
         if (gUnknown_03004210.state == 0 && !IsSEPlaying())
         {
             sub_8024CEC();
-            PlayFanfare(BGM_FANFA1);
+            PlayFanfare(MUS_FANFA1);
             StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
             Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
@@ -908,15 +908,15 @@ static void Task_TradeEvolutionScene(u8 taskID)
     case 2:
         if (IsCryFinished())
         {
-            m4aSongNumStop(BGM_SHINKA);
-            PlaySE(BGM_ME_SHINKA);
+            m4aSongNumStop(MUS_SHINKA);
+            PlaySE(MUS_ME_SHINKA);
             gTasks[taskID].tState++;
         }
         break;
     case 3:
         if (!IsSEPlaying())
         {
-            PlayBGM(BGM_SHINKA);
+            PlayBGM(MUS_SHINKA);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0));
         }
@@ -984,7 +984,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo);
             Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
-            PlayFanfare(BGM_FANFA5);
+            PlayFanfare(MUS_FANFA5);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -1016,7 +1016,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             else
             {
-                PlayBGM(BGM_SHINKA);
+                PlayBGM(MUS_SHINKA);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gTasks[taskID].tState++;
             }
@@ -1033,7 +1033,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         if (gUnknown_03004828->window.state == 0 && !IsSEPlaying())
         {
             sub_8024CEC();
-            PlayFanfare(BGM_FANFA1);
+            PlayFanfare(MUS_FANFA1);
             StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]);
             Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
diff --git a/src/field_camera.c b/src/field_camera.c
index efd2e2d8c..29cdf0496 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -28,14 +28,14 @@ extern struct FieldCamera gFieldCamera;
 extern u16 gTotalCameraPixelOffsetY;
 extern u16 gTotalCameraPixelOffsetX;
 
-static void RedrawMapSliceNorth(struct FieldCameraOffset*, struct MapData*);
-static void RedrawMapSliceSouth(struct FieldCameraOffset*, struct MapData*);
-static void RedrawMapSliceEast(struct FieldCameraOffset*, struct MapData*);
-static void RedrawMapSliceWest(struct FieldCameraOffset*, struct MapData*);
+static void RedrawMapSliceNorth(struct FieldCameraOffset*, struct MapLayout*);
+static void RedrawMapSliceSouth(struct FieldCameraOffset*, struct MapLayout*);
+static void RedrawMapSliceEast(struct FieldCameraOffset*, struct MapLayout*);
+static void RedrawMapSliceWest(struct FieldCameraOffset*, struct MapLayout*);
 static s32 MapPosToBgTilemapOffset(struct FieldCameraOffset*, s32, s32);
 
-static void DrawWholeMapViewInternal(int x, int y, struct MapData*);
-static void DrawMetatileAt(struct MapData*, u16, int, int);
+static void DrawWholeMapViewInternal(int x, int y, struct MapLayout*);
+static void DrawMetatileAt(struct MapLayout*, u16, int, int);
 static void DrawMetatile(s32, u16*, u16);
 static void CameraPanningCB_PanAhead(void);
 
@@ -96,11 +96,11 @@ void sub_8057B14(u16 *a, u16 *b)
 
 void DrawWholeMapView(void)
 {
-    DrawWholeMapViewInternal(gSaveBlock1.pos.x, gSaveBlock1.pos.y, gMapHeader.mapData);
+    DrawWholeMapViewInternal(gSaveBlock1.pos.x, gSaveBlock1.pos.y, gMapHeader.mapLayout);
     sFieldCameraOffset.copyBGToVRAM = TRUE;
 }
 
-static void DrawWholeMapViewInternal(int x, int y, struct MapData *mapData)
+static void DrawWholeMapViewInternal(int x, int y, struct MapLayout *mapLayout)
 {
     u8 i;
     u8 j;
@@ -118,27 +118,27 @@ static void DrawWholeMapViewInternal(int x, int y, struct MapData *mapData)
             temp = sFieldCameraOffset.xTileOffset + j;
             if (temp >= 32)
                 temp -= 32;
-            DrawMetatileAt(mapData, r6 + temp, x + j / 2, y + i / 2);
+            DrawMetatileAt(mapLayout, r6 + temp, x + j / 2, y + i / 2);
         }
     }
 }
 
 static void RedrawMapSlicesForCameraUpdate(struct FieldCameraOffset *cameraOffset, int x, int y)
 {
-    struct MapData *mapData = gMapHeader.mapData;
+    struct MapLayout *mapLayout = gMapHeader.mapLayout;
 
     if (x > 0)
-        RedrawMapSliceWest(cameraOffset, mapData);
+        RedrawMapSliceWest(cameraOffset, mapLayout);
     if (x < 0)
-        RedrawMapSliceEast(cameraOffset, mapData);
+        RedrawMapSliceEast(cameraOffset, mapLayout);
     if (y > 0)
-        RedrawMapSliceNorth(cameraOffset, mapData);
+        RedrawMapSliceNorth(cameraOffset, mapLayout);
     if (y < 0)
-        RedrawMapSliceSouth(cameraOffset, mapData);
+        RedrawMapSliceSouth(cameraOffset, mapLayout);
     cameraOffset->copyBGToVRAM = TRUE;
 }
 
-static void RedrawMapSliceNorth(struct FieldCameraOffset *cameraOffset, struct MapData *mapData)
+static void RedrawMapSliceNorth(struct FieldCameraOffset *cameraOffset, struct MapLayout *mapLayout)
 {
     u8 i;
     u8 temp;
@@ -153,11 +153,11 @@ static void RedrawMapSliceNorth(struct FieldCameraOffset *cameraOffset, struct M
         temp = cameraOffset->xTileOffset + i;
         if (temp >= 32)
             temp -= 32;
-        DrawMetatileAt(mapData, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y + 14);
+        DrawMetatileAt(mapLayout, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y + 14);
     }
 }
 
-static void RedrawMapSliceSouth(struct FieldCameraOffset *cameraOffset, struct MapData *mapData)
+static void RedrawMapSliceSouth(struct FieldCameraOffset *cameraOffset, struct MapLayout *mapLayout)
 {
     u8 i;
     u8 temp;
@@ -168,11 +168,11 @@ static void RedrawMapSliceSouth(struct FieldCameraOffset *cameraOffset, struct M
         temp = cameraOffset->xTileOffset + i;
         if (temp >= 32)
             temp -= 32;
-        DrawMetatileAt(mapData, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y);
+        DrawMetatileAt(mapLayout, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y);
     }
 }
 
-static void RedrawMapSliceEast(struct FieldCameraOffset *cameraOffset, struct MapData *mapData)
+static void RedrawMapSliceEast(struct FieldCameraOffset *cameraOffset, struct MapLayout *mapLayout)
 {
     u8 i;
     u8 temp;
@@ -183,11 +183,11 @@ static void RedrawMapSliceEast(struct FieldCameraOffset *cameraOffset, struct Ma
         temp = cameraOffset->yTileOffset + i;
         if (temp >= 32)
             temp -= 32;
-        DrawMetatileAt(mapData, temp * 32 + r6, gSaveBlock1.pos.x, gSaveBlock1.pos.y + i / 2);
+        DrawMetatileAt(mapLayout, temp * 32 + r6, gSaveBlock1.pos.x, gSaveBlock1.pos.y + i / 2);
     }
 }
 
-static void RedrawMapSliceWest(struct FieldCameraOffset *cameraOffset, struct MapData *mapData)
+static void RedrawMapSliceWest(struct FieldCameraOffset *cameraOffset, struct MapLayout *mapLayout)
 {
     u8 i;
     u8 temp;
@@ -200,7 +200,7 @@ static void RedrawMapSliceWest(struct FieldCameraOffset *cameraOffset, struct Ma
         temp = cameraOffset->yTileOffset + i;
         if (temp >= 32)
             temp -= 32;
-        DrawMetatileAt(mapData, temp * 32 + r5, gSaveBlock1.pos.x + 14, gSaveBlock1.pos.y + i / 2);
+        DrawMetatileAt(mapLayout, temp * 32 + r5, gSaveBlock1.pos.x + 14, gSaveBlock1.pos.y + i / 2);
     }
 }
 
@@ -210,7 +210,7 @@ void CurrentMapDrawMetatileAt(int x, int y)
 
     if (offset >= 0)
     {
-        DrawMetatileAt(gMapHeader.mapData, offset, x, y);
+        DrawMetatileAt(gMapHeader.mapLayout, offset, x, y);
         sFieldCameraOffset.copyBGToVRAM = TRUE;
     }
 }
@@ -226,7 +226,7 @@ void DrawDoorMetatileAt(int x, int y, u16 *arr)
     }
 }
 
-static void DrawMetatileAt(struct MapData *mapData, u16 offset, int x, int y)
+static void DrawMetatileAt(struct MapLayout *mapLayout, u16 offset, int x, int y)
 {
     u16 *metatiles;
     u16 metatileId = MapGridGetMetatileIdAt(x, y);
@@ -236,11 +236,11 @@ static void DrawMetatileAt(struct MapData *mapData, u16 offset, int x, int y)
 
     if (metatileId < 0x200)
     {
-        metatiles = mapData->primaryTileset->metatiles;
+        metatiles = mapLayout->primaryTileset->metatiles;
     }
     else
     {
-        metatiles = mapData->secondaryTileset->metatiles;
+        metatiles = mapLayout->secondaryTileset->metatiles;
         metatileId -= 0x200;
     }
 
diff --git a/src/field_effect.c b/src/field_effect.c
index 47698aee4..b5e2c13c6 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -918,7 +918,7 @@ void PokeballGlowEffect_1(struct Sprite *sprite)
         sprite->data[3] = 0;
         if (sprite->data[5])
         {
-            PlayFanfare(BGM_ME_ASA);
+            PlayFanfare(MUS_ME_ASA);
         }
     }
 }
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 25a4efc58..ea2058965 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -611,8 +611,8 @@ bool32 sub_8069D34(s16 x, s16 y)
 void SetSootopolisGymCrackedIceMetatiles(void)
 {
     s32 x, y;
-    s32 width = gMapHeader.mapData->width;
-    s32 height = gMapHeader.mapData->height;
+    s32 width = gMapHeader.mapLayout->width;
+    s32 height = gMapHeader.mapLayout->height;
     for (x = 0; x < width; x++)
     {
         for (y = 0; y < height; y++)
diff --git a/src/fieldmap.c b/src/fieldmap.c
index b819d7275..874df23b0 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -25,7 +25,7 @@ EWRAM_DATA struct MapHeader gMapHeader = {0};
 EWRAM_DATA struct Camera gCamera = {0};
 EWRAM_DATA static struct ConnectionFlags gUnknown_0202E850 = {0};
 
-struct BackupMapData gUnknown_03004870;
+struct BackupMapLayout gUnknown_03004870;
 
 static const struct ConnectionFlags sDummyConnectionFlags = {0};
 
@@ -53,19 +53,19 @@ void sub_8055FC0(void)
 
 void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader)
 {
-    struct MapData *mapData;
+    struct MapLayout *mapLayout;
     int width;
     int height;
-    mapData = mapHeader->mapData;
+    mapLayout = mapHeader->mapLayout;
     CpuFastFill16(0x03ff, gUnknown_02029828, sizeof(gUnknown_02029828));
     gUnknown_03004870.map = gUnknown_02029828;
-    width = mapData->width + 15;
+    width = mapLayout->width + 15;
     gUnknown_03004870.width = width;
-    height = mapData->height + 14;
+    height = mapLayout->height + 14;
     gUnknown_03004870.height = height;
     if (width * height <= 0x2800)
     {
-        map_copy_with_padding(mapData->map, mapData->width, mapData->height);
+        map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height);
         sub_80560AC(mapHeader);
     }
 }
@@ -129,8 +129,8 @@ void sub_8056134(int x, int y, struct MapHeader *mapHeader, int x2, int y2, int
     u16 *dest;
     int mapWidth;
 
-    mapWidth = mapHeader->mapData->width;
-    src = &mapHeader->mapData->map[mapWidth * y2 + x2];
+    mapWidth = mapHeader->mapLayout->width;
+    src = &mapHeader->mapLayout->map[mapWidth * y2 + x2];
     dest = &gUnknown_03004870.map[gUnknown_03004870.width * y + x];
 
     for (i = 0; i < height; i++)
@@ -150,9 +150,9 @@ void fillSouthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
 
     if (connectedMapHeader)
     {
-        cWidth = connectedMapHeader->mapData->width;
+        cWidth = connectedMapHeader->mapLayout->width;
         x = offset + 7;
-        y = mapHeader->mapData->height + 7;
+        y = mapHeader->mapLayout->height + 7;
         if (x < 0)
         {
             x2 = -x;
@@ -196,8 +196,8 @@ void fillNorthConnection(struct MapHeader *mapHeader, struct MapHeader *connecte
 
     if (connectedMapHeader)
     {
-        cWidth = connectedMapHeader->mapData->width;
-        cHeight = connectedMapHeader->mapData->height;
+        cWidth = connectedMapHeader->mapLayout->width;
+        cHeight = connectedMapHeader->mapLayout->height;
         x = offset + 7;
         y2 = cHeight - 7;
         if (x < 0)
@@ -245,8 +245,8 @@ void fillWestConnection(struct MapHeader *mapHeader, struct MapHeader *connected
     int cWidth, cHeight;
     if (connectedMapHeader)
     {
-        cWidth = connectedMapHeader->mapData->width;
-        cHeight = connectedMapHeader->mapData->height;
+        cWidth = connectedMapHeader->mapLayout->width;
+        cHeight = connectedMapHeader->mapLayout->height;
         y = offset + 7;
         x2 = cWidth - 7;
         if (y < 0)
@@ -291,8 +291,8 @@ void fillEastConnection(struct MapHeader *mapHeader, struct MapHeader *connected
     int cHeight;
     if (connectedMapHeader)
     {
-        cHeight = connectedMapHeader->mapData->height;
-        x = mapHeader->mapData->width + 7;
+        cHeight = connectedMapHeader->mapLayout->height;
+        x = mapHeader->mapLayout->width + 7;
         y = offset + 7;
         if (y < 0)
         {
@@ -352,10 +352,10 @@ u8 MapGridGetZCoordAt(int x, int y)
     }
     else
     {
-        border = gMapHeader.mapData->border;
+        border = gMapHeader.mapLayout->border;
         i = (x + 1) & 1;
         i += ((y + 1) & 1) * 2;
-        block = gMapHeader.mapData->border[i];
+        block = gMapHeader.mapLayout->border[i];
         block |= 0xc00;
     }
     if (block == 0x3ff)
@@ -378,10 +378,10 @@ u8 MapGridIsImpassableAt(int x, int y)
     }
     else
     {
-        border = gMapHeader.mapData->border;
+        border = gMapHeader.mapLayout->border;
         i = (x + 1) & 1;
         i += ((y + 1) & 1) * 2;
-        block = gMapHeader.mapData->border[i];
+        block = gMapHeader.mapLayout->border[i];
         block |= 0xc00;
     }
     if (block == 0x3ff)
@@ -396,7 +396,7 @@ u32 MapGridGetMetatileIdAt(int x, int y)
     u16 block;
     int i;
     int j;
-    struct MapData *mapData;
+    struct MapLayout *mapLayout;
     u16 *border;
     u16 block2;
 
@@ -407,17 +407,17 @@ u32 MapGridGetMetatileIdAt(int x, int y)
     }
     else
     {
-        mapData = gMapHeader.mapData;
+        mapLayout = gMapHeader.mapLayout;
         i = (x + 1) & 1;
         i += ((y + 1) & 1) * 2;
-        block = mapData->border[i] | 0xc00;
+        block = mapLayout->border[i] | 0xc00;
     }
     if (block == 0x3ff)
     {
-        border = gMapHeader.mapData->border;
+        border = gMapHeader.mapLayout->border;
         j = (x + 1) & 1;
         j += ((y + 1) & 1) * 2;
-        block2 = gMapHeader.mapData->border[j];
+        block2 = gMapHeader.mapLayout->border[j];
         block2 |= 0xc00;
         return block2 & block;
     }
@@ -465,12 +465,12 @@ u32 GetBehaviorByMetatileId(u16 metatile)
     u16 *attributes;
     if (metatile <= 0x1ff)
     {
-        attributes = gMapHeader.mapData->primaryTileset->metatileAttributes;
+        attributes = gMapHeader.mapLayout->primaryTileset->metatileAttributes;
         return attributes[metatile];
     }
     else if (metatile <= 0x3ff)
     {
-        attributes = gMapHeader.mapData->secondaryTileset->metatileAttributes;
+        attributes = gMapHeader.mapLayout->secondaryTileset->metatileAttributes;
         return attributes[metatile - 0x200];
     }
     else
@@ -600,7 +600,7 @@ void sub_80566F0(u8 a1)
 
 int GetMapBorderIdAt(int x, int y)
 {
-    struct MapData *mapData;
+    struct MapLayout *mapLayout;
     u16 block, block2;
     int i, j;
     if (x >= 0 && x < gUnknown_03004870.width
@@ -616,10 +616,10 @@ int GetMapBorderIdAt(int x, int y)
     }
     else
     {
-        mapData = gMapHeader.mapData;
+        mapLayout = gMapHeader.mapLayout;
         j = (x + 1) & 1;
         j += ((y + 1) & 1) * 2;
-        block2 = 0xc00 | mapData->border[j];
+        block2 = 0xc00 | mapLayout->border[j];
         if (block2 == 0x3ff)
         {
             goto fail;
@@ -696,7 +696,7 @@ void sub_8056918(struct MapConnection *connection, int direction, int x, int y)
         gSaveBlock1.pos.y -= connection->offset;
         break;
     case CONNECTION_WEST:
-        gSaveBlock1.pos.x = mapHeader->mapData->width;
+        gSaveBlock1.pos.x = mapHeader->mapLayout->width;
         gSaveBlock1.pos.y -= connection->offset;
         break;
     case CONNECTION_SOUTH:
@@ -705,7 +705,7 @@ void sub_8056918(struct MapConnection *connection, int direction, int x, int y)
         break;
     case CONNECTION_NORTH:
         gSaveBlock1.pos.x -= connection->offset;
-        gSaveBlock1.pos.y = mapHeader->mapData->height;
+        gSaveBlock1.pos.y = mapHeader->mapLayout->height;
         break;
     }
 }
@@ -768,10 +768,10 @@ bool8 sub_8056ABC(u8 direction, int x, int y, struct MapConnection *connection)
     {
     case CONNECTION_SOUTH:
     case CONNECTION_NORTH:
-        return sub_8056B20(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset);
+        return sub_8056B20(x, gMapHeader.mapLayout->width, mapHeader->mapLayout->width, connection->offset);
     case CONNECTION_WEST:
     case CONNECTION_EAST:
-        return sub_8056B20(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset);
+        return sub_8056B20(y, gMapHeader.mapLayout->height, mapHeader->mapLayout->height, connection->offset);
     }
     return FALSE;
 }
@@ -812,10 +812,10 @@ int sub_8056B60(struct MapConnection *connection, int x, int y)
     {
     case CONNECTION_SOUTH:
     case CONNECTION_NORTH:
-        return sub_8056B4C(x - connection->offset, mapHeader->mapData->width);
+        return sub_8056B4C(x - connection->offset, mapHeader->mapLayout->width);
     case CONNECTION_WEST:
     case CONNECTION_EAST:
-        return sub_8056B4C(y - connection->offset, mapHeader->mapData->height);
+        return sub_8056B4C(y - connection->offset, mapHeader->mapLayout->height);
     }
     return FALSE;
 }
@@ -839,9 +839,9 @@ struct MapConnection *sub_8056BA0(s16 x, s16 y)
             direction = connection->direction;
             if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE)
              || (direction == CONNECTION_NORTH && y > 6)
-             || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7)
+             || (direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + 7)
              || (direction == CONNECTION_WEST && x > 6)
-             || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7))
+             || (direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + 7))
             {
                 continue;
             }
@@ -916,42 +916,42 @@ void sub_8056CBC(struct Tileset *tileset, int offset, int size)
     }
 }
 
-void sub_8056D28(struct MapData *mapData)
+void sub_8056D28(struct MapLayout *mapLayout)
 {
     void *src = (void*)(BG_VRAM);
-    sub_8056C98(mapData->primaryTileset, src);
+    sub_8056C98(mapLayout->primaryTileset, src);
 }
 
-void sub_8056D38(struct MapData *mapData)
+void sub_8056D38(struct MapLayout *mapLayout)
 {
     void *src = (void*)(BG_VRAM + 0x4000);
-    sub_8056C98(mapData->secondaryTileset, src);
+    sub_8056C98(mapLayout->secondaryTileset, src);
 }
 
-void apply_map_tileset1_palette(struct MapData *mapData)
+void apply_map_tileset1_palette(struct MapLayout *mapLayout)
 {
-    sub_8056CBC(mapData->primaryTileset, 0, 0xc0);
+    sub_8056CBC(mapLayout->primaryTileset, 0, 0xc0);
 }
 
-void apply_map_tileset2_palette(struct MapData *mapData)
+void apply_map_tileset2_palette(struct MapLayout *mapLayout)
 {
-    sub_8056CBC(mapData->secondaryTileset, 0x60, 0xc0);
+    sub_8056CBC(mapLayout->secondaryTileset, 0x60, 0xc0);
 }
 
-void copy_map_tileset1_tileset2_to_vram(struct MapData *mapData)
+void copy_map_tileset1_tileset2_to_vram(struct MapLayout *mapLayout)
 {
-    if (mapData)
+    if (mapLayout)
     {
-        sub_8056D28(mapData);
-        sub_8056D38(mapData);
+        sub_8056D28(mapLayout);
+        sub_8056D38(mapLayout);
     }
 }
 
-void apply_map_tileset1_tileset2_palette(struct MapData *mapData)
+void apply_map_tileset1_tileset2_palette(struct MapLayout *mapLayout)
 {
-    if (mapData)
+    if (mapLayout)
     {
-        apply_map_tileset1_palette(mapData);
-        apply_map_tileset2_palette(mapData);
+        apply_map_tileset1_palette(mapLayout);
+        apply_map_tileset2_palette(mapLayout);
     }
 }
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 5bd0d229b..2536f4898 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -451,7 +451,7 @@ static bool8 sub_8141E64(void)
         if (!gPaletteFade.active)
         {
             SetMainCallback2(CB2_HallOfFame);
-            PlayBGM(BGM_DENDOU);
+            PlayBGM(MUS_DENDOU);
             return 0;
         }
         break;
diff --git a/src/item_use.c b/src/item_use.c
index 926ab4876..5037fee88 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -384,23 +384,23 @@ bool8 sub_80C9688(struct MapConnection *connection, int x, int y)
     case 2:
         localOffset = connection->offset + 7;
         localX = x - localOffset;
-        localLength = mapHeader->mapData->height - 7;
+        localLength = mapHeader->mapLayout->height - 7;
         localY = localLength + y; // additions are reversed for some reason
         break;
     case 1:
         localOffset = connection->offset + 7;
         localX = x - localOffset;
-        localLength = gMapHeader.mapData->height + 7;
+        localLength = gMapHeader.mapLayout->height + 7;
         localY = y - localLength;
         break;
     case 3:
-        localLength = mapHeader->mapData->width - 7;
+        localLength = mapHeader->mapLayout->width - 7;
         localX = localLength + x; // additions are reversed for some reason
         localOffset = connection->offset + 7;
         localY = y - localOffset;
         break;
     case 4:
-        localLength = gMapHeader.mapData->width + 7;
+        localLength = gMapHeader.mapLayout->width + 7;
         localX = x - localLength;
         localOffset = connection->offset + 7;
         localY = y - localOffset;
@@ -417,8 +417,8 @@ void sub_80C9720(u8 taskId)
 {
     s16 x, y;
     s16 curX, curY;
-    s16 width = gMapHeader.mapData->width + 7;
-    s16 height = gMapHeader.mapData->height + 7;
+    s16 width = gMapHeader.mapLayout->width + 7;
+    s16 height = gMapHeader.mapLayout->height + 7;
 
     PlayerGetDestCoords(&x, &y);
 
diff --git a/src/main_menu.c b/src/main_menu.c
index 886995b16..93d9be77a 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -774,7 +774,7 @@ static void Task_NewGameSpeech1(u8 taskId)
     gTasks[taskId].data[3] = 0xFF;
     gTasks[taskId].tFrameCounter = 216;  //Wait 3.6 seconds (216 frames) before starting speech
 
-    PlayBGM(BGM_DOORO_X4);
+    PlayBGM(MUS_DOORO_X4);
 }
 
 static void Task_NewGameSpeech2(u8 taskId)
diff --git a/src/mauville_man.c b/src/mauville_man.c
index e22809242..bfdfe9cf1 100644
--- a/src/mauville_man.c
+++ b/src/mauville_man.c
@@ -745,7 +745,7 @@ static void Task_BardSong(u8 taskId)
     case 3:
         if (gStringVar4[task->tCharIndex] == EOS)
         {
-            FadeInNewBGM(BGM_POKECEN, 6);
+            FadeInNewBGM(MUS_POKECEN, 6);
             m4aMPlayFadeOutTemporarily(&gMPlay_SE2, 2);
             EnableBothScriptContexts();
             DestroyTask(taskId);
diff --git a/src/move_tutor_menu.c b/src/move_tutor_menu.c
index 7e1365391..0ecc82a72 100644
--- a/src/move_tutor_menu.c
+++ b/src/move_tutor_menu.c
@@ -602,13 +602,13 @@ static void MoveTutorMain(void)
             PrintMainMoveTutorMenuText(gOtherText_ForgotOrDidNotLearnMove);
 #endif
             sMoveTutorMenu->state = 31;
-            PlayFanfare(BGM_FANFA1);
+            PlayFanfare(MUS_FANFA1);
         }
         break;
     case 31:
         if (Menu_UpdateWindowText())
         {
-            PlayFanfare(BGM_FANFA1);
+            PlayFanfare(MUS_FANFA1);
             sMoveTutorMenu->state = 32;
         }
         break;
diff --git a/src/overworld.c b/src/overworld.c
index 5bb357f8a..d993d6cac 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -50,9 +50,9 @@
 #include "wild_encounter.h"
 
 #ifdef SAPPHIRE
-#define LEGENDARY_MUSIC BGM_OOAME  // Heavy Rain
+#define LEGENDARY_MUSIC MUS_OOAME  // Heavy Rain
 #else
-#define LEGENDARY_MUSIC BGM_HIDERI // Drought
+#define LEGENDARY_MUSIC MUS_HIDERI // Drought
 #endif
 
 extern u8 gUnknown_020297ED;
@@ -80,7 +80,7 @@ extern u8 TradeRoom_PromptToCancelLink[];
 extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
-extern struct MapData * const gMapAttributes[];
+extern struct MapLayout * const gMapLayouts[];
 extern struct MapHeader * const * const gMapGroups[];
 extern s32 gMaxFlashLevel;
 
@@ -336,17 +336,17 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType)
 static void mapdata_load_assets_to_gpu_and_full_redraw(void)
 {
     move_tilemap_camera_to_upper_left_corner();
-    copy_map_tileset1_tileset2_to_vram(gMapHeader.mapData);
-    apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+    copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout);
+    apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
     DrawWholeMapView();
     cur_mapheader_run_tileset_funcs_after_some_cpuset();
 }
 
-static struct MapData *GetCurrentMapData(void)
+static struct MapLayout *GetMapLayout(void)
 {
-    u16 mapDataId = gSaveBlock1.mapDataId;
-    if (mapDataId)
-        return gMapAttributes[mapDataId - 1];
+    u16 mapLayoutId = gSaveBlock1.mapLayoutId;
+    if (mapLayoutId)
+        return gMapLayouts[mapLayoutId - 1];
     return NULL;
 }
 
@@ -395,14 +395,14 @@ struct MapHeader *const GetDestinationWarpMapHeader(void)
 static void LoadCurrentMapData(void)
 {
     gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    gSaveBlock1.mapDataId = gMapHeader.mapDataId;
-    gMapHeader.mapData = GetCurrentMapData();
+    gSaveBlock1.mapLayoutId = gMapHeader.mapLayoutId;
+    gMapHeader.mapLayout = GetMapLayout();
 }
 
 static void LoadSaveblockMapHeader(void)
 {
     gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    gMapHeader.mapData = GetCurrentMapData();
+    gMapHeader.mapLayout = GetMapLayout();
 }
 
 static void SetPlayerCoordsFromWarp(void)
@@ -419,8 +419,8 @@ static void SetPlayerCoordsFromWarp(void)
     }
     else
     {
-        gSaveBlock1.pos.x = gMapHeader.mapData->width / 2;
-        gSaveBlock1.pos.y = gMapHeader.mapData->height / 2;
+        gSaveBlock1.pos.x = gMapHeader.mapLayout->width / 2;
+        gSaveBlock1.pos.y = gMapHeader.mapLayout->height / 2;
     }
 }
 
@@ -605,8 +605,8 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     Overworld_ClearSavedMusic();
     mapheader_run_script_with_tag_x3();
     not_trainer_hill_battle_pyramid();
-    sub_8056D38(gMapHeader.mapData);
-    apply_map_tileset2_palette(gMapHeader.mapData);
+    sub_8056D38(gMapHeader.mapLayout);
+    apply_map_tileset2_palette(gMapHeader.mapLayout);
 
     for (paletteIndex = 6; paletteIndex < 12; paletteIndex++)
         ApplyWeatherGammaShiftToPal(paletteIndex);
@@ -781,10 +781,10 @@ u8 Overworld_GetFlashLevel(void)
     return gSaveBlock1.flashLevel;
 }
 
-void sub_8053D14(u16 mapDataId)
+void sub_8053D14(u16 mapLayoutId)
 {
-    gSaveBlock1.mapDataId = mapDataId;
-    gMapHeader.mapData = GetCurrentMapData();
+    gSaveBlock1.mapLayoutId = mapLayoutId;
+    gMapHeader.mapLayout = GetMapLayout();
 }
 
 static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
@@ -828,7 +828,7 @@ static u16 GetLocationMusic(struct WarpData *warp)
     if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
         return LEGENDARY_MUSIC;
     else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
-        return BGM_TOZAN;
+        return MUS_TOZAN;
     else
         return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music;
 }
@@ -841,7 +841,7 @@ u16 GetCurrLocationDefaultMusic(void)
     if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE111)
      && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE111)
      && GetSav1Weather() == 8)
-        return BGM_ASHROAD;
+        return MUS_ASHROAD;
 
     music = GetLocationMusic(&gSaveBlock1.location);
     if (music != 0x7FFF)
@@ -851,9 +851,9 @@ u16 GetCurrLocationDefaultMusic(void)
     else
     {
         if (gSaveBlock1.pos.x < 24)
-            return BGM_DOORO_X1;
+            return MUS_DOORO_X1;
         else
-            return BGM_GRANROAD;
+            return MUS_GRANROAD;
     }
 }
 
@@ -868,9 +868,9 @@ u16 GetWarpDestinationMusic(void)
     {
         if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAUVILLE_CITY)
          && gSaveBlock1.location.mapNum == MAP_NUM(MAUVILLE_CITY))
-            return BGM_DOORO_X1;
+            return MUS_DOORO_X1;
         else
-            return BGM_GRANROAD;
+            return MUS_GRANROAD;
     }
 }
 
@@ -888,9 +888,9 @@ void Overworld_PlaySpecialMapMusic(void)
         if (gSaveBlock1.savedMusic)
             music = gSaveBlock1.savedMusic;
         else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER)
-            music = BGM_DEEPDEEP;
+            music = MUS_DEEPDEEP;
         else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-            music = BGM_NAMINORI;
+            music = MUS_NAMINORI;
     }
 
     if (music != GetCurrentMapMusic())
@@ -915,10 +915,10 @@ void sub_8053F0C(void)
         u16 currentMusic = GetCurrentMapMusic();
         if (newMusic != LEGENDARY_MUSIC)
         {
-            if (currentMusic == BGM_DEEPDEEP || currentMusic == BGM_NAMINORI)
+            if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI)
                 return;
             if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-                newMusic = BGM_NAMINORI;
+                newMusic = MUS_NAMINORI;
         }
         if (newMusic != currentMusic)
         {
@@ -1553,15 +1553,15 @@ static bool32 sub_805483C(u8 *state)
         (*state)++;
         break;
     case 6:
-        sub_8056D28(gMapHeader.mapData);
+        sub_8056D28(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 7:
-        sub_8056D38(gMapHeader.mapData);
+        sub_8056D38(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 8:
-        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 9:
@@ -1619,15 +1619,15 @@ bool32 sub_805493C(u8 *state, u32 a2)
         (*state)++;
         break;
     case 6:
-        sub_8056D28(gMapHeader.mapData);
+        sub_8056D28(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 7:
-        sub_8056D38(gMapHeader.mapData);
+        sub_8056D38(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 8:
-        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 9:
@@ -1709,15 +1709,15 @@ bool32 sub_8054A9C(u8 *state)
         (*state)++;
         break;
     case 5:
-        sub_8056D28(gMapHeader.mapData);
+        sub_8056D28(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 6:
-        sub_8056D38(gMapHeader.mapData);
+        sub_8056D38(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 7:
-        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
         (*state)++;
         break;
     case 8:
diff --git a/src/party_menu.c b/src/party_menu.c
index a39300825..a4b7b0ffa 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -3975,7 +3975,7 @@ void Task_TeamMonTMMove3(u8 taskId)
 {
     if (gUnknown_0202E8F6 == 0)
     {
-        PlayFanfare(BGM_FANFA1);
+        PlayFanfare(MUS_FANFA1);
         gTasks[taskId].func = Task_TeamMonTMMove4;
     }
 }
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index c6eda8bca..30e9503cd 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1108,48 +1108,48 @@ void ClearBattleMonForms(void)
         gBattleMonForms[i] = 0;
 }
 
-u16 GetBGM_ForBattle(void)
+u16 GetMUS_ForBattle(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
-        return BGM_BATTLE34;
+        return MUS_BATTLE34;
     if (gBattleTypeFlags & BATTLE_TYPE_REGI)
-        return BGM_BATTLE36;
+        return MUS_BATTLE36;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        return BGM_BATTLE20;
+        return MUS_BATTLE20;
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         switch (gTrainers[gTrainerBattleOpponent].trainerClass)
         {
         case 2:
         case 0x31:
-            return BGM_BATTLE30;
+            return MUS_BATTLE30;
         case 3:
         case 4:
         case 0x32:
         case 0x33:
-            return BGM_BATTLE31;
+            return MUS_BATTLE31;
         case 0x19:
-            return BGM_BATTLE32;
+            return MUS_BATTLE32;
         case 0x20:
-            return BGM_BATTLE33;
+            return MUS_BATTLE33;
         case 0x2E:
             if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally))
-                return BGM_BATTLE20;
-            return BGM_BATTLE35;
+                return MUS_BATTLE20;
+            return MUS_BATTLE35;
         case 0x18:
-            return BGM_BATTLE38;
+            return MUS_BATTLE38;
         default:
-            return BGM_BATTLE20;
+            return MUS_BATTLE20;
         }
     }
-    return BGM_BATTLE27;
+    return MUS_BATTLE27;
 }
 
 void sub_80408BC(void)
 {
     ResetMapMusic();
     m4aMPlayAllStop();
-    PlayBGM(GetBGM_ForBattle());
+    PlayBGM(GetMUS_ForBattle());
 }
 
 void current_map_music_set__default_for_battle(u16 song)
@@ -1159,7 +1159,7 @@ void current_map_music_set__default_for_battle(u16 song)
     if (song)
         PlayNewMapMusic(song);
     else
-        PlayNewMapMusic(GetBGM_ForBattle());
+        PlayNewMapMusic(GetMUS_ForBattle());
 }
 
 const u8 *GetMonSpritePal(struct Pokemon *mon)
diff --git a/src/region_map.c b/src/region_map.c
index 81ecd7c1b..74062f435 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -628,8 +628,8 @@ static void InitializeCursorPosition(void)
     case 5:
         gRegionMap->mapSectionId = gMapHeader.regionMapSectionId;
         gRegionMap->playerIsInCave = FALSE;
-        mapWidth = gMapHeader.mapData->width;
-        mapHeight = gMapHeader.mapData->height;
+        mapWidth = gMapHeader.mapLayout->width;
+        mapHeight = gMapHeader.mapLayout->height;
         x = gSaveBlock1.pos.x;
         y = gSaveBlock1.pos.y;
         if (gRegionMap->mapSectionId == MAPSEC_UNDERWATER_128)
@@ -640,8 +640,8 @@ static void InitializeCursorPosition(void)
         mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp4.mapGroup, gSaveBlock1.warp4.mapNum);
         gRegionMap->mapSectionId = mapHeader->regionMapSectionId;
         gRegionMap->playerIsInCave = TRUE;
-        mapWidth = mapHeader->mapData->width;
-        mapHeight = mapHeader->mapData->height;
+        mapWidth = mapHeader->mapLayout->width;
+        mapHeight = mapHeader->mapLayout->height;
         x = gSaveBlock1.warp4.x;
         y = gSaveBlock1.warp4.y;
         break;
@@ -649,8 +649,8 @@ static void InitializeCursorPosition(void)
         mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.warp2.mapGroup, gSaveBlock1.warp2.mapNum);
         gRegionMap->mapSectionId = mapHeader->regionMapSectionId;
         gRegionMap->playerIsInCave = TRUE;
-        mapWidth = mapHeader->mapData->width;
-        mapHeight = mapHeader->mapData->height;
+        mapWidth = mapHeader->mapLayout->width;
+        mapHeight = mapHeader->mapLayout->height;
         x = gSaveBlock1.warp2.x;
         y = gSaveBlock1.warp2.y;
         break;
@@ -671,8 +671,8 @@ static void InitializeCursorPosition(void)
                 gRegionMap->mapSectionId = mapHeader->regionMapSectionId;
             }
             gRegionMap->playerIsInCave = FALSE;
-            mapWidth = mapHeader->mapData->width;
-            mapHeight = mapHeader->mapData->height;
+            mapWidth = mapHeader->mapLayout->width;
+            mapHeight = mapHeader->mapLayout->height;
             x = r4->x;
             y = r4->y;
         }
@@ -758,14 +758,14 @@ static void sub_80FB600(void)
             u16 r1;
 
             gRegionMap->mapSectionId = mapHeader->regionMapSectionId;
-            r1 = mapHeader->mapData->width / gRegionMapLocations[gRegionMap->mapSectionId].width;
+            r1 = mapHeader->mapLayout->width / gRegionMapLocations[gRegionMap->mapSectionId].width;
             if (r1 == 0)
                 r1 = 1;
             x = sp2 / r1;
             if (x >= gRegionMapLocations[gRegionMap->mapSectionId].width)
                 x = gRegionMapLocations[gRegionMap->mapSectionId].width - 1;
 
-            r1 = mapHeader->mapData->height / gRegionMapLocations[gRegionMap->mapSectionId].height;
+            r1 = mapHeader->mapLayout->height / gRegionMapLocations[gRegionMap->mapSectionId].height;
             if (r1 == 0)
                 r1 = 1;
             y = sp4 / r1;
diff --git a/src/roulette.c b/src/roulette.c
index ab60e089a..c8804a543 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1055,13 +1055,13 @@ void sub_8116638(u8 taskid)
     case 0x2:
         if (gTasks[taskid].data[0x2] == 0xC)
         {
-            PlayFanfare(BGM_ME_B_BIG);
+            PlayFanfare(MUS_ME_B_BIG);
             Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13);
             Menu_PrintText(&gUnknown_081C41A5, 0x1, 0xF);
         }
         else
         {
-            PlayFanfare(BGM_ME_B_SMALL);
+            PlayFanfare(MUS_ME_B_SMALL);
             Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13);
             Menu_PrintText(&gUnknown_081C4199, 0x1, 0xF);
         }
diff --git a/src/secret_base.c b/src/secret_base.c
index 69c7171d6..632d6845e 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -241,11 +241,11 @@ void sub_80BB764(s16 *arg1, s16 *arg2, u16 arg3)
 {
     s16 x, y;
 
-    for (y=0; y<gMapHeader.mapData->height; y++)
+    for (y=0; y<gMapHeader.mapLayout->height; y++)
     {
-        for (x=0; x<gMapHeader.mapData->width; x++)
+        for (x=0; x<gMapHeader.mapLayout->width; x++)
         {
-            if ((gMapHeader.mapData->map[y * gMapHeader.mapData->width + x] & 0x3ff) == arg3)
+            if ((gMapHeader.mapLayout->map[y * gMapHeader.mapLayout->width + x] & 0x3ff) == arg3)
             {
                 *arg1 = x;
                 *arg2 = y;
diff --git a/src/shop.c b/src/shop.c
index 88719e25e..8a5da1117 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -409,16 +409,16 @@ static void Shop_DrawViewportTiles(void)
                 s32 r3 = MapGridGetMetatileLayerTypeAt(facingX + x, facingY + y);
 
                 if (metatileId < 512)
-                    BuyMenuDrawMapMetatile(x, y, (u16 *)gMapHeader.mapData->primaryTileset->metatiles + metatileId * 8, r3);
+                    BuyMenuDrawMapMetatile(x, y, (u16 *)gMapHeader.mapLayout->primaryTileset->metatiles + metatileId * 8, r3);
                 else
-                    BuyMenuDrawMapMetatile(x, y, (u16 *)gMapHeader.mapData->secondaryTileset->metatiles + (metatileId - 512) * 8, r3);
+                    BuyMenuDrawMapMetatile(x, y, (u16 *)gMapHeader.mapLayout->secondaryTileset->metatiles + (metatileId - 512) * 8, r3);
             }
             else
             {
                 if (metatileId < 512)
-                    BuyMenuDrawMapPartialMetatile(x, y, (u16 *)gMapHeader.mapData->primaryTileset->metatiles + metatileId * 8);
+                    BuyMenuDrawMapPartialMetatile(x, y, (u16 *)gMapHeader.mapLayout->primaryTileset->metatiles + metatileId * 8);
                 else
-                    BuyMenuDrawMapPartialMetatile(x, y, (u16 *)gMapHeader.mapData->secondaryTileset->metatiles + (metatileId - 512) * 8);
+                    BuyMenuDrawMapPartialMetatile(x, y, (u16 *)gMapHeader.mapLayout->secondaryTileset->metatiles + (metatileId - 512) * 8);
             }
 
             if (y == 0 && x != 0 && x != 6)
diff --git a/src/slot_machine.c b/src/slot_machine.c
index ccd7e4353..3de87e0f7 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -927,17 +927,17 @@ bool8 sub_81020C8(struct Task *task)
         }
         if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
         {
-            PlayFanfare(BGM_ME_B_BIG);
+            PlayFanfare(MUS_ME_B_BIG);
             sub_8104CAC(6);
         }
         else if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_MIXED))
         {
-            PlayFanfare(BGM_ME_B_BIG);
+            PlayFanfare(MUS_ME_B_BIG);
             sub_8104CAC(5);
         }
         else
         {
-            PlayFanfare(BGM_ME_B_SMALL);
+            PlayFanfare(MUS_ME_B_SMALL);
             sub_8104CAC(2);
         }
         if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
@@ -2682,7 +2682,7 @@ static void sub_810437C(struct Task *task)
     sub_810545C();
     sub_8102680();
     StopMapMusic();
-    PlayNewMapMusic(BGM_BD_TIME);
+    PlayNewMapMusic(MUS_BD_TIME);
 }
 
 static void sub_81043EC(struct Task *task)
@@ -2818,7 +2818,7 @@ static void sub_81046C0(struct Task *task)
         {
             task->data[4] = 0xa0;
             StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5);
-            PlayFanfare(BGM_ME_ZANNEN);
+            PlayFanfare(MUS_ME_ZANNEN);
         }
         else
         {
@@ -2830,7 +2830,7 @@ static void sub_81046C0(struct Task *task)
                 sub_8104098();
                 eSlotMachine->pikaPower = 0;
             }
-            PlayFanfare(BGM_ME_B_SMALL);
+            PlayFanfare(MUS_ME_B_SMALL);
         }
     }
 }
@@ -2906,7 +2906,7 @@ static void sub_81048CC(struct Task *task)
     task->data[4] = 4;
     task->data[5] = 0;
     StopMapMusic();
-    PlayFanfare(BGM_ME_ZANNEN);
+    PlayFanfare(MUS_ME_ZANNEN);
     PlaySE(SE_W153);
 }
 
diff --git a/src/sound.c b/src/sound.c
index 159ad3f70..5b41acbc6 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -44,18 +44,18 @@ extern struct ToneData voicegroup_84549C0[];
 
 static const struct Fanfare sFanfares[] =
 {
-    { BGM_FANFA1,      80 },
-    { BGM_FANFA4,     160 },
-    { BGM_FANFA5,     220 },
-    { BGM_ME_WAZA,    220 },
-    { BGM_ME_ASA,     160 },
-    { BGM_ME_BACHI,   340 },
-    { BGM_ME_WASURE,  180 },
-    { BGM_ME_KINOMI,  120 },
-    { BGM_ME_TAMA,    710 },
-    { BGM_ME_B_BIG,   250 },
-    { BGM_ME_B_SMALL, 150 },
-    { BGM_ME_ZANNEN,  160 },
+    { MUS_FANFA1,      80 },
+    { MUS_FANFA4,     160 },
+    { MUS_FANFA5,     220 },
+    { MUS_ME_WAZA,    220 },
+    { MUS_ME_ASA,     160 },
+    { MUS_ME_BACHI,   340 },
+    { MUS_ME_WASURE,  180 },
+    { MUS_ME_KINOMI,  120 },
+    { MUS_ME_TAMA,    710 },
+    { MUS_ME_B_BIG,   250 },
+    { MUS_ME_B_SMALL, 150 },
+    { MUS_ME_ZANNEN,  160 },
 };
 
 static void Task_Fanfare(u8 taskId);
diff --git a/src/tileset_anim.c b/src/tileset_anim.c
index abd38edad..25f561c96 100644
--- a/src/tileset_anim.c
+++ b/src/tileset_anim.c
@@ -518,11 +518,11 @@ static void StartTileset1Animation(void)
     gTileset1AnimFrame = 0;
     gTileset1AnimLength = 0;
     gTileset1AnimCallback = 0;
-    if (gMapHeader.mapData->primaryTileset)
+    if (gMapHeader.mapLayout->primaryTileset)
     {
-        if (gMapHeader.mapData->primaryTileset->callback)
+        if (gMapHeader.mapLayout->primaryTileset->callback)
         {
-            gMapHeader.mapData->primaryTileset->callback();
+            gMapHeader.mapLayout->primaryTileset->callback();
         }
     }
 }
@@ -532,11 +532,11 @@ static void StartTileset2Animation(void)
     gTileset2AnimFrame = 0;
     gTileset2AnimLength = 0;
     gTileset2AnimCallback = 0;
-    if (gMapHeader.mapData->secondaryTileset)
+    if (gMapHeader.mapLayout->secondaryTileset)
     {
-        if (gMapHeader.mapData->secondaryTileset->callback)
+        if (gMapHeader.mapLayout->secondaryTileset->callback)
         {
-            gMapHeader.mapData->secondaryTileset->callback();
+            gMapHeader.mapLayout->secondaryTileset->callback();
         }
     }
 }
diff --git a/src/trade.c b/src/trade.c
index 8d7f5b1fc..50de29b7f 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1208,7 +1208,7 @@ static void sub_8047EC0(void)
             sub_8048C70();
             gMain.state ++;
             nullsub_5(7, 0);
-            PlayBGM(BGM_P_SCHOOL);
+            PlayBGM(MUS_P_SCHOOL);
             break;
         case 14:
             sub_804ACF4(1);
@@ -4812,7 +4812,7 @@ static bool8 sub_804C29C(void)
             gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset;
             gUnknown_03004828->unk_00c4 ++;
             gUnknown_03004828->unk_0124 = GetCurrentMapMusic();
-            PlayBGM(BGM_SHINKA);
+            PlayBGM(MUS_SHINKA);
             break;
         case 1:
             if (gUnknown_03004828->bg2hofs > 0)
@@ -5195,7 +5195,7 @@ static bool8 sub_804C29C(void)
         case 68:
             if (++ gUnknown_03004828->unk_00c0 == 4)
             {
-                PlayFanfare(BGM_FANFA5);
+                PlayFanfare(MUS_FANFA5);
             }
             if (gUnknown_03004828->unk_00c0 == 0xf0)
             {
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index ad11bf566..133f8b3aa 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -3725,7 +3725,7 @@ static u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section)
 
     for (yCur = yMin; yCur <= yMax; yCur++)
     {
-        for (xCur = 0; xCur < gMapHeader.mapData->width; xCur++)
+        for (xCur = 0; xCur < gMapHeader.mapLayout->width; xCur++)
         {
             if (MetatileBehavior_IsFeebasEncounterable(MapGridGetMetatileBehaviorAt(xCur + 7, yCur + 7)) == TRUE)
             {